+
@@ -12,17 +13,19 @@ import List from './components/list'
import Info from './components/info'
import List2 from './components/list2'
import HiddenInfo from './components/hiddenInfo.vue'
+import OutSourced from '@/components/OutSourced/index'
export default {
components: {
HiddenInfo: HiddenInfo,
+ OutSourced: OutSourced,
List: List,
Info: Info,
List2: List2
},
data() {
return {
- activeName: 'List',
+ activeName: 'OutSourced',
KEYPROJECTPUNISH_ID: '',
HIDDEN_ID: ''
}
diff --git a/src/views/keyprojects/units/components/list.vue b/src/views/keyprojects/units/components/list.vue
index e51ce26..b72577f 100644
--- a/src/views/keyprojects/units/components/list.vue
+++ b/src/views/keyprojects/units/components/list.vue
@@ -48,7 +48,7 @@
align="center"/>
-
+
diff --git a/src/views/keyprojects/videoinfomanager/components/list.vue b/src/views/keyprojects/videoinfomanager/components/list.vue
index f2abc65..ce7ad03 100644
--- a/src/views/keyprojects/videoinfomanager/components/list.vue
+++ b/src/views/keyprojects/videoinfomanager/components/list.vue
@@ -318,7 +318,7 @@ export default {
},
over() {
// 定时器手动关闭
- console.log('定时器手动关闭')
+ console.log('定时器自动关闭')
this.$message.warning('单次播放时长已到5分钟自动关闭')
clearInterval(this.timer)
},
@@ -363,6 +363,8 @@ export default {
}
},
back() {
+ console.log('手动关闭定时器')
+ clearInterval(this.timer)
if (this.dialogVideo) this.dialogVideo = false
if (this.dialogVideoBack) this.dialogVideoBack = false
if (this.dialogVideoAll) {
diff --git a/src/views/keyprojects/videomanager/components/bobileCamer.vue b/src/views/keyprojects/videomanager/components/bobileCamer.vue
index 46f4294..bbf11c6 100644
--- a/src/views/keyprojects/videomanager/components/bobileCamer.vue
+++ b/src/views/keyprojects/videomanager/components/bobileCamer.vue
@@ -100,6 +100,7 @@ export default {
dialogVideoBack: false,
dialogVideoAll: false,
VIDEOURL: '',
+ timer: '',
player: {},
//
config: config,
@@ -125,6 +126,18 @@ export default {
},
methods: {
+ // 五分钟关闭视频播放页面定时任务
+ start() {
+ console.log('定时器开启')
+ this.timer = setInterval(this.over, (5 * 60 * 1000)) // 5分钟;
+ },
+ over() {
+ // 定时器手动关闭
+ console.log('定时器自动关闭')
+ this.$message.warning('单次播放时长已到5分钟自动关闭')
+ this.back()
+ clearInterval(this.timer)
+ },
async init(UNITS_ID) {
this.visible = true
this.UNITS_ID = UNITS_ID
@@ -172,6 +185,8 @@ export default {
}
},
back() {
+ console.log('定时器手动关闭')
+ clearInterval(this.timer)
if (this.dialogVideo) this.dialogVideo = false
if (this.dialogVideoBack) this.dialogVideoBack = false
if (this.dialogVideoAll) {
@@ -187,6 +202,8 @@ export default {
}
},
showVideo(row) {
+ this.$message.warning('单次播放最多五分钟')
+ this.start()
if (!row.PLATFORMVIDEOMANAGEMENT_ID) {
this.VIDEOURL = row.VIDEOURL
this.dialogVideo = true
@@ -217,6 +234,7 @@ export default {
})
})
}).catch((e) => {
+ this.over()
this.listLoading = false
})
}
@@ -264,8 +282,11 @@ export default {
closeWindow() {
this.handleClose()
}
- }
-
+ },
+ beforeDestroy() {
+ console.log('页面定时器关闭')
+ clearInterval(this.timer)
+ },
}
diff --git a/src/views/keyprojects/videomanager/components/video-list.vue b/src/views/keyprojects/videomanager/components/video-list.vue
index a709776..67f9176 100644
--- a/src/views/keyprojects/videomanager/components/video-list.vue
+++ b/src/views/keyprojects/videomanager/components/video-list.vue
@@ -249,7 +249,7 @@ export default {
},
over() {
// 定时器手动关闭
- console.log('定时器手动关闭')
+ console.log('定时器自动关闭')
clearInterval(this.timer)
},
closeVideoStart() {
@@ -702,6 +702,8 @@ export default {
})
},
back() {
+ console.log('手动关闭定时器')
+ clearInterval(this.timer)
if (this.dialogVideo) this.dialogVideo = false
if (this.dialogVideoBack) this.dialogVideoBack = false
if (this.dialogVideoAll) {
diff --git a/src/views/relevantunits/audit/components/corpInfoEdit.vue b/src/views/relevantunits/audit/components/corpInfoEdit.vue
index 274b963..9a3829a 100644
--- a/src/views/relevantunits/audit/components/corpInfoEdit.vue
+++ b/src/views/relevantunits/audit/components/corpInfoEdit.vue
@@ -29,6 +29,9 @@
+
+
+
diff --git a/src/views/relevantunits/audit/components/edit.vue b/src/views/relevantunits/audit/components/edit.vue
index 33c727f..96ea974 100644
--- a/src/views/relevantunits/audit/components/edit.vue
+++ b/src/views/relevantunits/audit/components/edit.vue
@@ -47,6 +47,11 @@
+
+
+
+
+
diff --git a/src/views/system/group/user/index.vue b/src/views/system/group/user/index.vue
index f70fd06..db9fd7b 100644
--- a/src/views/system/group/user/index.vue
+++ b/src/views/system/group/user/index.vue
@@ -100,7 +100,7 @@
-
+
@@ -246,6 +246,7 @@ export default {
keyDepeName: '',
keyJobLeven: '',
dialogFormEdit: false,
+ editloading: false,
dialogType: 'add',
rules: {
EMAIL: [
@@ -357,6 +358,7 @@ export default {
}))
resolve(nodes) // 通过调用resolve将子节点数据返回，通知组件数据加载完成
}).catch((e) => {
+ this.editloading = false
this.listLoading = false
})
}, 500)
@@ -588,8 +590,6 @@ export default {
console.log(row)
this.dialogType = 'editUser'
this.pd = JSON.parse(JSON.stringify(row))
- this.dialogFormEdit = true
- await this.$nextTick()
const areaRefID = []
if (this.pd.PROVINCE) {
areaRefID.push(this.pd.PROVINCE)
@@ -609,14 +609,6 @@ export default {
refDeptLevelVal.id = this.pd.deptLevenlID
const deptRefsValue = {}
deptRefsValue.id = this.pd.DEPARTMENT_ID
- // this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
- // if (this.$refs.refFromDeptTypeID) {
- // this.$refs.refFromDeptTypeID.handleNodeClick(refDeptLevelVal)
- // }
- // if (this.$refs.deptTree) {
- // this.$refs.deptTree.handleNodeClick(deptRefsValue)
- // }
- // }
var arrString = []
if (this.pd.ROLE_ID != null && this.pd.ROLE_ID != '') {
arrString.push(this.pd.ROLE_ID)
@@ -631,17 +623,9 @@ export default {
}
}
this.pd.ROLE_ID = arrString
- // var roleIds = []
- // if (this.pd.ROLE_ID) {
- // roleIds.push(this.pd.ROLE_ID)
- // if (this.pd.ROLE_IDS) {
- // var roleIDS = this.pd.ROLE_IDS.split(',')
- // roleIDS.forEach((item) => {
- // roleIds.push(item)
- // })
- // }
- // }
- // this.pd.ROLE_ID = roleIds
+ this.dialogFormEdit = true
+ await this.$nextTick()
+
},
handleEditStatus(row, type) {
const typeName = type == '1' ? '禁用' : '启用'