@@ -222,6 +222,7 @@ export default {
add: false,
del: false,
edit: false,
+ timer: '',
form: {
VIDEONAME: '',
UNITS_USER_ID: '',
@@ -305,7 +306,29 @@ export default {
await this.getUnitsList()
await this.getList()
},
+ beforeDestroy() {
+ console.log('定时器关闭')
+ clearInterval(this.timer)
+ },
methods: {
+ // 五分钟关闭视频播放页面定时任务
+ start() {
+ console.log('定时器开启')
+ this.timer = setInterval(this.closeVideoStart, (5 * 60 * 1000)) // 5分钟
+ },
+ over() {
+ // 定时器手动关闭
+ console.log('定时器手动关闭')
+ this.$message.warning('单次播放时长已到5分钟自动关闭')
+ clearInterval(this.timer)
+ },
+ closeVideoStart() {
+ this.dialogVideo = false
+ this.dialogVideoHLS = false
+ this.dialogVideoBack = false
+ this.dialogVideoAll = false
+ this.over()
+ },
changeSelUid(event) {
this.unitsUserList = []
this.form.UNITS_USER_ID = ''
@@ -355,6 +378,8 @@ export default {
}
},
showVideo(row) {
+ this.$message.warning('单次播放最多五分钟')
+ this.start()
if (!row.PLATFORMVIDEOMANAGEMENT_ID) {
this.VIDEOURL = row.VIDEOURL
this.dialogVideo = true
@@ -385,6 +410,7 @@ export default {
})
})
}).catch((e) => {
+ this.over()
this.listLoading = false
})
}
diff --git a/src/views/keyprojects/videomanager/components/bobileCamer.vue b/src/views/keyprojects/videomanager/components/bobileCamer.vue
index f99055e..46f4294 100644
--- a/src/views/keyprojects/videomanager/components/bobileCamer.vue
+++ b/src/views/keyprojects/videomanager/components/bobileCamer.vue
@@ -6,24 +6,41 @@
:before-close="handleClose"
:append-to-body="true"
title="移动摄像头"
- width="60%">
+ width="85%">
-
-
-
-
-
-
-
-
- 搜索
-
-
- 重置
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+ 重置
+
+
@@ -37,6 +54,7 @@
style="width: 100%">
+
@@ -94,6 +112,12 @@ export default {
total: 0,
KEYWORDS: '',
UNITS_ID: '',
+ serachForm: {
+ KEYWORDS: '',
+ UNITS_USER_ID: '',
+ UNIT_USE: '',
+ UNITS_ID: ''
+ },
varList: [],
unitsList: [],
allCodes: []
@@ -105,7 +129,6 @@ export default {
this.visible = true
this.UNITS_ID = UNITS_ID
this.varList = []
- this.KEYWORDS = ''
await this.getUnitsList()
this.getList()
},
@@ -206,7 +229,10 @@ export default {
requestFN(
'/videoResources/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
{
- VIDEONAME: this.KEYWORDS
+ VIDEONAME: this.serachForm.KEYWORDS,
+ PERSONNELMANAGEMENT_ID: this.serachForm.UNITS_USER_ID,
+ UNIT_USE: this.serachForm.UNIT_USE,
+ UNITS_ID: this.serachForm.UNITS_ID
}
).then((data) => {
this.listLoading = false
@@ -223,7 +249,12 @@ export default {
},
goKeyReset() {
- this.KEYWORDS = ''
+ this.serachForm = {
+ KEYWORDS: '',
+ UNITS_USER_ID: '',
+ UNIT_USE: '',
+ UNITS_ID: ''
+ }
this.getList()
},
diff --git a/src/views/keyprojects/videomanager/components/list.vue b/src/views/keyprojects/videomanager/components/list.vue
index 7b1d828..4d5a01d 100644
--- a/src/views/keyprojects/videomanager/components/list.vue
+++ b/src/views/keyprojects/videomanager/components/list.vue
@@ -59,9 +59,15 @@
+
+
+ 进行中
+ 已结束
+
+
- 查看
+ 查看
@@ -122,9 +128,10 @@ export default {
})
},
// 查看
- goDetail(ID, UNITS_ID) {
- this.$parent.OUTSOURCED_ID = ID
- this.$parent.UNITS_ID = UNITS_ID
+ goDetail(row) {
+ this.$parent.OUTSOURCED_ID = row.OUTSOURCED_ID
+ this.$parent.UNITS_ID = row.UNITS_ID
+ this.$parent.STATE = row.STATE
this.$parent.activeName = 'videoList'
}
}
diff --git a/src/views/keyprojects/videomanager/components/video-list.vue b/src/views/keyprojects/videomanager/components/video-list.vue
index e18bd66..a709776 100644
--- a/src/views/keyprojects/videomanager/components/video-list.vue
+++ b/src/views/keyprojects/videomanager/components/video-list.vue
@@ -52,19 +52,19 @@
- 播放
+ 播放
定位
- 回放
- 获取rtsp地址
- 编辑
- 删除
+ 回放
+ 获取rtsp地址
+ 编辑
+ 删除
@@ -175,8 +175,10 @@ export default {
data() {
return {
map: null,
+ timer: '',
marker: null,
BMap: '',
+ STATE: this.$parent.STATE,
clientHeight: 500,
inputLocation: '',
msg: 'add',
@@ -236,8 +238,27 @@ export default {
},
beforeDestroy() {
this.map && this.map.removeEventListener('click', this.MapClick)
+ console.log('定时器关闭')
+ clearInterval(this.timer)
},
methods: {
+ // 五分钟关闭视频播放页面定时任务
+ start() {
+ console.log('定时器开启')
+ this.timer = setInterval(this.closeVideoStart, (5 * 60 * 1000)) // 5分钟;
+ },
+ over() {
+ // 定时器手动关闭
+ console.log('定时器手动关闭')
+ clearInterval(this.timer)
+ },
+ closeVideoStart() {
+ this.dialogVideo = false
+ this.dialogVideoHLS = false
+ this.dialogVideoBack = false
+ this.dialogVideoAll = false
+ this.over()
+ },
getVideoResourcesSelect() {
requestFN(
'/videoResources/listAll', {
@@ -331,6 +352,8 @@ export default {
},
// 播放
showVideo(row) {
+ this.$message.warning('单次播放最多五分钟')
+ this.start()
if (!row.PLATFORMVIDEOMANAGEMENT_ID) {
this.VIDEOURL = row.VIDEOURL
this.dialogVideo = true
@@ -362,6 +385,7 @@ export default {
})
}).catch((e) => {
this.listLoading = false
+ this.over()
})
}
},
diff --git a/src/views/relativeUnitPerson/personBaseInfo/components/corpUserList.vue b/src/views/relativeUnitPerson/personBaseInfo/components/corpUserList.vue
index 7a73843..80bfabe 100644
--- a/src/views/relativeUnitPerson/personBaseInfo/components/corpUserList.vue
+++ b/src/views/relativeUnitPerson/personBaseInfo/components/corpUserList.vue
@@ -22,17 +22,17 @@
返回
-->
-
+
-
+
-
+
@@ -41,74 +41,28 @@
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -116,7 +70,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
@@ -151,7 +118,7 @@
-
+
@@ -184,7 +151,7 @@
- 查看
+ 查看
@@ -207,6 +174,7 @@
返回
+
@@ -215,12 +183,15 @@ import SelectTree from '@/components/SelectTree'
import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
import { requestFN } from '@/utils/request'
import waves from '@/directive/waves' // waves directive
+import UserBaseInfoView from '@/components/UserBaseInfo/UserBaseInfoView'
+
export default {
- components: { Pagination, SelectTree },
+ components: { Pagination, SelectTree, UserBaseInfoView },
directives: { waves },
data() {
return {
userId: this.$parent.USER_ID_T,
+ baseInfourl: '/unitPersonManagement/getCorpUserDetail',
treeLoading: false,
listLoading: false,
add: true,
@@ -424,9 +395,10 @@ export default {
this.VILLAGE = village
},
// 查看
- toUserDetail(ID) {
- this.$parent.USER_ID = ID
- this.$parent.activeName = 'CorpUserDetail'
+ toUserDetail(ROW) {
+ // this.$parent.USER_ID = ROW.USER_ID
+ this.$refs.userbaseinfoview.openWindow(ROW.USER_ID, ROW.CORPINFO_ID)
+ // this.$parent.activeName = 'CorpUserDetail'
},
userEdit() {
this.$refs.form.validate(valid => {
diff --git a/src/views/risk/corpinfo/components/corpInfo.vue b/src/views/risk/corpinfo/components/corpInfo.vue
index 6a6b50f..bb8942d 100644
--- a/src/views/risk/corpinfo/components/corpInfo.vue
+++ b/src/views/risk/corpinfo/components/corpInfo.vue
@@ -120,6 +120,7 @@ export default {
countryList: [],
industryList: [],
COUNTRY: '',
+ panelData: '',
villageList: [],
VILLAGE: '',
varList: [],
diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue
index b1d3414..ba4f78f 100644
--- a/src/views/xgf/flow_audit/users.vue
+++ b/src/views/xgf/flow_audit/users.vue
@@ -113,13 +113,13 @@
| 照片 |
-
-
-
- ![]()
-
-
+
+ ![]()
+
+ |
姓名 |
@@ -141,78 +141,50 @@
身份证照片 |
-
-
-
- ![]()
-
- |
-
-
-
- | 民族 |
- {{ userDetailForm.minzuName }} |
- 婚姻状况 |
- {{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }} |
- 政治面貌 |
- {{ userDetailForm.zzName }} {{
- userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
- }}
- |
-
-
-
- | 户口所在地 |
- {{ userDetailForm.HKLOCAL }} |
- 现住址 |
- {{ userDetailForm.ADDRESS }} |
- 联系电话 |
- {{ userDetailForm.PHONE }} |
-
-
- | 文化程度 |
- {{ userDetailForm.DEGREE_OF_EDUCATION_NAME }} |
- 本企业从业开始日期 |
- {{ userDetailForm.CORP_START_DATE }} |
- 岗位名称 |
- {{ userDetailForm.POST_ID }} |
-
-
- | 本岗位从业开始日期 |
- {{ userDetailForm.ENTRY_DATE }} |
-
-
-
-
-
-
- | 是否签订劳动合同 |
-
- {{ formatLabel(userDetailForm.IS_SIGN_LABOR) }}
- |
- 劳动合同附件 |
-
-
+
+
![]()
-
+
+
|
+
+
+ | 民族 |
+ {{ userDetailForm.minzuName? userDetailForm.minzuName:'暂无信息' }} |
+ 婚姻状况 |
+ {{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }} |
+ 政治面貌 |
+ {{ userDetailForm.zzName }} {{
+ userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
+ }}
+ |
+
+
+
+ | 户口所在地 |
+ {{ userDetailForm.HKLOCAL? userDetailForm.HKLOCAL:'暂无信息' }} |
+ 现住址 |
+ {{ userDetailForm.ADDRESS? userDetailForm.ADDRESS:'暂无信息' }} |
+ 联系电话 |
+ {{ userDetailForm.PHONE }} |
+
+
+ | 文化程度 |
+ {{ userDetailForm.DEGREE_OF_EDUCATION_NAME }} |
+
+
+ 岗位名称(工种) |
+ {{ userDetailForm.POST_ID }} |
+
| 是否缴纳社保 |
{{ formatLabel(userDetailForm.IS_SOCIAL) }} |
@@ -220,94 +192,48 @@
{{ userDetailForm.SOCIAL_NUMBER }} |
社保卡照片 |
-
-
-
- ![]()
-
-
+
+ ![]()
+
+ |
| 是否参加三级安全培训 |
- {{ formatLabel(userDetailForm.IS_LEVEL_THREE) }} |
-
-
- | 是否按期缴纳工伤保险 |
- {{ formatLabel(userDetailForm.IS_INJURIES_PAY) }} |
- 工伤保险有效期 |
- {{ userDetailForm.IS_INJURIES_PAY_TIME }} |
- 工伤保险凭证 |
-
-
+ | {{ formatLabel(userDetailForm.IS_LEVEL_THREE) }} |
+ 三级安全培训照片 |
+
+
+
![]()
-
+
+
|
- | 是否缴纳商业保险 |
-
- {{ formatLabel(userDetailForm.ISPAY) }}
- |
- 商业保险附件 |
-
-
-
- ![]()
-
-
- |
- 商业保险单号 |
- {{ userDetailForm.ISPAY_NUMBER }} |
-
-
-
-
-
-
+ | 是否缴纳保险 |
+ {{ formatLabelBf(userDetailForm.IS_BF) }} |
是否特殊工种 |
- {{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }} |
-
-
-
-
+ | {{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }} |
是否流动人员 |
- {{ formatLabel(userDetailForm.ISFLOW) }} |
- 身体状况是否适应本岗位工作 |
- {{ formatLabel(userDetailForm.IS_BODY_ADAPT) }} |
-
-
-
-
-
-
-
-
- | 打回人 |
- {{ operator }} |
- 打回原因 |
- {{ message }} |
+ {{ formatLabel(userDetailForm.ISFLOW) }} |
@@ -433,6 +359,25 @@ export default {
}).catch((e) => {
})
},
+ formatLabelBf(value) {
+ if (value) {
+ var valList = value.split(',')
+ var label = []
+ for (let i = 0; i < valList.length; i++) {
+ if (valList[i] == 0) {
+ label.push('无')
+ break
+ }
+ if (valList[i] == 1) {
+ label.push('商业保险')
+ }
+ if (valList[i] == 2) {
+ label.push('工伤保险')
+ }
+ }
+ return label.join(',')
+ }
+ },
// 转换是否
formatLabel(value) {
if (value == '1') {
@@ -465,7 +410,7 @@ export default {
this.message = row.TERRITORIALITY_OPINION
this.operator = row.TERRITORIALITY_USER_NAME
}
- }else {
+ } else {
this.message = ''
this.operator = ''
}
@@ -483,8 +428,8 @@ export default {
this.$message.error('请先择')
return
}
- if(this.form.IS_STATE===0){
- if(!this.form.OPINION){
+ if (this.form.IS_STATE === 0) {
+ if (!this.form.OPINION) {
this.$message.error('这里输入审批意见')
return
}
@@ -520,7 +465,7 @@ export default {
this.userDetailForm = Object.assign(this.userDetailForm, data.userDetail)
console.log(this.userDetailForm)
this.listLoading = false
- // this.dataForm = Object.assign(this.dataForm, data.pd)
+ // this.userDetailForm = Object.assign(this.userDetailForm, data.pd)
this.userPhotoFile = data.userPhotoFile
if (this.userPhotoFile.length > 0) {
this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH