| 隐患确认时间 |
@@ -635,6 +635,9 @@ export default {
} else {
this.pd.STATE = '-2'
}
+ if (this.HIDDENLEVEL == 'hiddenLevel1001') { // 忽略隐患
+ this.pd.STATE = '5'
+ }
if (this.pd.RECTIFICATIONDEPT == undefined) {
this.pd.RECTIFICATIONDEPT = ''
}
diff --git a/src/views/hiddenApi/publicMethod/list.vue b/src/views/hiddenApi/publicMethod/list.vue
index 36431e6..6d1ab62 100644
--- a/src/views/hiddenApi/publicMethod/list.vue
+++ b/src/views/hiddenApi/publicMethod/list.vue
@@ -62,16 +62,13 @@
-
+ collapse-tags
+ clearable/>
@@ -297,7 +294,7 @@ export default {
{ ID: '16', NAME: '确认打回' },
{ ID: '10', NAME: '验收打回' }
],
- defaultProps: { value: 'id', children: 'nodes', label: 'name' },
+ defaultProps: { value: 'id', children: 'nodes', label: 'name', multiple: true, emitPath: false },
pickerOptions0: { disabledDate(time) { return time.getTime() < Date.now() - 8.64e6 } },
hiddenlevelList: [], // 隐患级别
hiddenPartList: [], // 隐患部位,
diff --git a/src/views/keyprojects/hidden/components/record-list.vue b/src/views/keyprojects/hidden/components/record-list.vue
index f239c3d..3b2604e 100644
--- a/src/views/keyprojects/hidden/components/record-list.vue
+++ b/src/views/keyprojects/hidden/components/record-list.vue
@@ -15,6 +15,13 @@
+
+
+
+
+
+
+
@@ -110,6 +117,7 @@ export default {
total: 0,
KEYWORDS: '',
ISCHECK: '',
+ SOURCE: '',
varList: [],
sourceState: {
1: 'AI报警',
@@ -117,6 +125,24 @@ export default {
4: '安全环保检查(监管端)',
5: '安全环保检查(企业端)'
},
+ sourceStateList: [
+ {
+ value: '1',
+ label: 'AI报警(监管端)'
+ },
+ {
+ value: '2',
+ label: 'AI报警(企业端)'
+ },
+ {
+ value: '4',
+ label: '安全环保检查(监管端)'
+ },
+ {
+ value: '5',
+ label: '安全环保检查(企业端)'
+ }
+ ],
state: {
1: '未整改',
2: '已整改',
@@ -139,6 +165,7 @@ export default {
goKeyReset() {
this.KEYWORDS = ''
this.ISCHECK = ''
+ this.SOURCE = ''
this.getQuery()
},
// 获取列表
@@ -149,7 +176,8 @@ export default {
{
KEYWORDS: this.KEYWORDS,
OUTSOURCED_ID: this.$parent.OUTSOURCED_ID,
- ISCHECK: this.ISCHECK
+ ISCHECK: this.ISCHECK,
+ SOURCE: this.SOURCE
}
).then((data) => {
this.listLoading = false
diff --git a/src/views/keyprojects/outsourced/components/edit.vue b/src/views/keyprojects/outsourced/components/edit.vue
index aa768eb..ee84432 100644
--- a/src/views/keyprojects/outsourced/components/edit.vue
+++ b/src/views/keyprojects/outsourced/components/edit.vue
@@ -56,6 +56,7 @@
@@ -257,6 +260,7 @@ export default {
directives: { waves },
data() {
return {
+ updateValue: true,
selectUsers: [], // 防止报错，参数无用
chooseUserList: [],
punishThePerson: [],
@@ -1199,6 +1203,52 @@ export default {
// resolve()
}).catch((e) => {
})
+ },
+ // 将树节点的子节点全部添加到数组中
+ pullSelectedNodes(selectedItems) {
+ if (selectedItems.nodes && selectedItems.nodes.length > 0) {
+ for (let i = 0; i < selectedItems.nodes.length; i++) {
+ if (!this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.nodes[i].id)) {
+ this.form.INVOLVING_CORPS_DEPART_ID.push(selectedItems.nodes[i].id)
+ }
+ this.pullSelectedNodes(selectedItems.nodes[i])
+ }
+ }
+ },
+ // 选择项时触发的事件
+ handleSelect(selectedItems) {
+ // 选择父节点时同时勾选全部子节点
+ if (!this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.id)) {
+ this.form.INVOLVING_CORPS_DEPART_ID.push(selectedItems.id)
+ }
+ this.pullSelectedNodes(selectedItems)
+ this.onClick()
+ },
+ // 将选中项的子节点全部移除
+ removeSelectedNodes(selectedItems) {
+ if (selectedItems.nodes && selectedItems.nodes.length > 0) {
+ for (let i = 0; i < selectedItems.nodes.length; i++) {
+ if (this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.nodes[i].id)) {
+ this.form.INVOLVING_CORPS_DEPART_ID.splice(this.form.INVOLVING_CORPS_DEPART_ID.indexOf(selectedItems.nodes[i].id), 1)
+ }
+ this.removeSelectedNodes(selectedItems.nodes[i])
+ }
+ }
+ },
+ // 移除选中项时触发的事件
+ handleRemove(selectedItems) {
+ // 移除选中项时同时移除全部子节点
+ if (this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.id)) {
+ this.form.INVOLVING_CORPS_DEPART_ID.splice(this.form.INVOLVING_CORPS_DEPART_ID.indexOf(selectedItems.id), 1)
+ }
+ this.removeSelectedNodes(selectedItems)
+ this.onClick()
+ },
+ onClick() {
+ this.updateValue = false
+ this.$nextTick(() => {
+ this.updateValue = true
+ })
}
}
}
diff --git a/src/views/map/dialog/outSourceInfo.vue b/src/views/map/dialog/outSourceInfo.vue
index 417c973..224088b 100644
--- a/src/views/map/dialog/outSourceInfo.vue
+++ b/src/views/map/dialog/outSourceInfo.vue
@@ -76,6 +76,10 @@
结束申请中
|
+