Compare commits
No commits in common. "e907a1c07adec0f1b3e2b85e7e20f3d2f33afd42" and "63ad74c77f742b0e4ba2ca69c79da42a04284539" have entirely different histories.
e907a1c07a
...
63ad74c77f
|
@ -29,7 +29,6 @@
|
|||
"@vue-office/excel": "^1.7.11",
|
||||
"@vue-office/pdf": "^2.0.2",
|
||||
"@vueuse/core": "^10.11.0",
|
||||
"circular-json": "^0.5.9",
|
||||
"cropperjs": "^1.6.2",
|
||||
"crypto-js": "^4.2.0",
|
||||
"echarts": "^5.5.1",
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
const isNode = typeof require !== 'undefined' // 是否支持node函数
|
||||
const { ipcRenderer } = isNode?require('electron'):{} // app使用
|
||||
import { sessionStore } from '@/utils/store'
|
||||
import CircularJSON from 'circular-json'
|
||||
// import { diff } from 'jsondiffpatch'
|
||||
// const Remote = isNode?require('@electron/remote'):{} // 远程模块
|
||||
|
||||
|
@ -174,7 +173,6 @@ const findDifferences = (obj1, obj2) => {
|
|||
for (const key in o1) {
|
||||
if (o1.hasOwnProperty(key)) {
|
||||
const newPath = path ? `${path}.${key}` : key;
|
||||
if(!o2) return
|
||||
if (o2.hasOwnProperty(key)) {
|
||||
const v1 = toJsonStr(o1[key])
|
||||
const v2 = toJsonStr(o2[key])
|
||||
|
@ -204,6 +202,6 @@ const findDifferences = (obj1, obj2) => {
|
|||
return differences;
|
||||
}
|
||||
// 对象克隆
|
||||
const objClone = (obj) => JSON.parse(CircularJSON.stringify(obj))
|
||||
const objClone = (obj) => JSON.parse(JSON.stringify(obj))
|
||||
// 转换为json
|
||||
const toJsonStr = (obj) => CircularJSON.stringify(obj)
|
||||
const toJsonStr = (obj) => JSON.stringify(obj)
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
<span>工作动态</span>
|
||||
<el-radio-group v-model="type" @change="changeTab">
|
||||
<el-radio-button label="全部" :value="-1" />
|
||||
<el-radio-button label="备课" :value="1" disabled />
|
||||
<el-radio-button label="上课" :value="2" disabled />
|
||||
<el-radio-button label="备课" :value="1" />
|
||||
<el-radio-button label="上课" :value="2" />
|
||||
<el-radio-button label="作业" :value="3" />
|
||||
</el-radio-group>
|
||||
</div>
|
||||
|
@ -99,9 +99,11 @@ const tagType = (time) => {
|
|||
}
|
||||
// 切换
|
||||
const changeTab = (val) =>{
|
||||
|
||||
console.log(type.value)
|
||||
switch(val){
|
||||
case -1:
|
||||
// getClass()
|
||||
getClass()
|
||||
getHomework()
|
||||
break;
|
||||
case 1:
|
||||
|
@ -115,7 +117,7 @@ const changeTab = (val) =>{
|
|||
}
|
||||
|
||||
onMounted(() => {
|
||||
// getClass()
|
||||
getClass()
|
||||
getHomework()
|
||||
})
|
||||
</script>
|
||||
|
|
Loading…
Reference in New Issue