From bb2c043f43a3589a14485b79a82488a1e42e460d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com> Date: Fri, 22 Nov 2024 21:16:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/public.scss | 2 +- src/views/auditPages/taskManagement/audit.vue | 116 +++++++++++------- src/views/system/user/danweiList.vue | 2 +- src/views/unitPages/myTask/audit.vue | 6 +- src/views/unitPages/myTask/info.vue | 6 +- 5 files changed, 77 insertions(+), 55 deletions(-) diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 4a13dee..44d661e 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -309,7 +309,7 @@ div { padding: 10px; - padding: 10px 20px; + padding: 5px 15px; border: 1px solid #F5F5F5; font-weight: 400; font-family: Alibaba PuHuiTiR; diff --git a/src/views/auditPages/taskManagement/audit.vue b/src/views/auditPages/taskManagement/audit.vue index 874b565..4251c89 100644 --- a/src/views/auditPages/taskManagement/audit.vue +++ b/src/views/auditPages/taskManagement/audit.vue @@ -1357,7 +1357,7 @@ - + @@ -1395,7 +1395,7 @@ - + @@ -1433,7 +1433,7 @@ - + @@ -1471,7 +1471,7 @@ - + @@ -1528,7 +1528,7 @@ - + @@ -1585,7 +1585,7 @@ - + @@ -1623,7 +1623,7 @@ - + @@ -1637,7 +1637,7 @@ 服务器信息 -
+
@@ -1730,7 +1730,7 @@ 网络设备 -
+
@@ -1804,7 +1804,7 @@ 安全设备 -
+
@@ -2718,12 +2718,13 @@                
{{ruleForm.bfyy}}
             
           
- + +
+ + 不通过 通过 -
-
@@ -2748,6 +2749,7 @@ export default { }, data() { return { + shaojunbuyao:false, accept:['xls','xlsx','doc','docx','pdf','rar','zip','pcap','txt'], acceptTwo:['jpg','jpeg','png'], isMore:false, @@ -2851,20 +2853,7 @@ export default { type:6 } ], - }, - // 地理位置 - dlwz:[], - // 系统特征 - xttz:[], - // 防篡改 - xtfhqkFcg:[], - // 防泄漏 - xtfhqkFxl:[], - // 防中断 - xtfhqkFzd:[], - // 防勒索 - xtfhqkFls:[], - // 服务器 + // 服务器 fwqxx:[ { sblx:"", @@ -2915,6 +2904,20 @@ export default { type: 3, } ], + }, + // 地理位置 + dlwz:[], + // 系统特征 + xttz:[], + // 防篡改 + xtfhqkFcg:[], + // 防泄漏 + xtfhqkFxl:[], + // 防中断 + xtfhqkFzd:[], + // 防勒索 + xtfhqkFls:[], + rules:{}, disabled:false, loading:false, @@ -2942,8 +2945,8 @@ export default { }); }) } else if (this.$route.query.pageType == 'change') { + this.disabled = true; this.getInfo(obj) - this.disabled = false; this.isMore = true; } }, @@ -2952,13 +2955,19 @@ export default { getInfo(obj){ this.loading = true; - assetTasktaskSh(obj).then(res=>{ + assetTasktaskSh(obj).then(res => { this.ruleForm = res.data; - if(!this.ruleForm.xjgywxt) { + if (!this.ruleForm.xjgywxt) { this.ruleForm.xjgywxt = {} this.$set(this.ruleForm.xjgywxt, 'remark', "") } + if(this.ruleForm.fwwz) { + let arr = this.ruleForm.fwwz.split("-") + this.select = arr[0] + this.ruleForm.fwwz = arr[1] + } this.ruleForm.xttz ? this.xttz = this.ruleForm.xttz.split(',') : []; + let chepingUnit = this.ruleForm.gylxxList.filter((item) => item.type == 1) let yjgysUnit = this.ruleForm.gylxxList.filter((item) => item.type == 2) let jfywUnit = this.ruleForm.gylxxList.filter((item) => item.type == 3) @@ -2966,17 +2975,31 @@ export default { let xtjsUnit = this.ruleForm.gylxxList.filter((item) => item.type == 5) let xtyyUnit = this.ruleForm.gylxxList.filter((item) => item.type == 7) let aqfwUnit = this.ruleForm.gylxxList.filter((item) => item.type == 6) - this.$set(this.ruleForm,'chepingUnit',chepingUnit.length > 0 ? chepingUnit : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:1}]) - this.$set(this.ruleForm,'yjgysUnit',yjgysUnit.length > 0 ? yjgysUnit : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:2}]) - this.$set(this.ruleForm,'jfywUnit',jfywUnit.length > 0 ? jfywUnit : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:3}]) - this.$set(this.ruleForm,'xtsjUnit',xtsjUnit.length > 0 ? xtsjUnit : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:4}]) - this.$set(this.ruleForm,'xtjsUnit',xtjsUnit.length > 0 ? xtjsUnit : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:5}]) - this.$set(this.ruleForm,'xtyyUnit',xtyyUnit.length > 0 ? xtyyUnit : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:7}]) - this.$set(this.ruleForm,'aqfwUnit',aqfwUnit.length > 0 ? aqfwUnit : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:6}]) - this.fwqxx = (this.ruleForm.jcwlList.filter((item) => item.type == 1) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 1) : [{sblx:"",pp:"",ipType:"",sbIP:"",czxx:"",czxxbb:"",yjxh:"",yjxlh:"",yjbbxx:"",yjyt:"",yjbswz:"",type: 1}]) - this.wlsb = (this.ruleForm.jcwlList.filter((item) => item.type == 2) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 2) : [{sblx:"",pp:"",ipType:"",sbIP:"",czxx:"",czxxbb:"",yjxh:"",yjxlh:"",yjbbxx:"",yjyt:"",yjbswz:"",type: 2}]) - this.aqsb = (this.ruleForm.jcwlList.filter((item) => item.type == 3) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 3) : [{sblx:"",pp:"",ipType:"",sbIP:"",czxx:"",czxxbb:"",yjxh:"",yjxlh:"",yjbbxx:"",yjyt:"",yjbswz:"",type: 3}]) + this.$set(this.ruleForm, 'chepingUnit', chepingUnit.length > 0 ? chepingUnit : [{ name: "", tyshxydm: "", lxr: "", lxdh: "", type: 1 }]) + this.$set(this.ruleForm, 'yjgysUnit', yjgysUnit.length > 0 ? yjgysUnit : [{ name: "", tyshxydm: "", lxr: "", lxdh: "", type: 2 }]) + this.$set(this.ruleForm, 'jfywUnit', jfywUnit.length > 0 ? jfywUnit : [{ name: "", tyshxydm: "", lxr: "", lxdh: "", type: 3 }]) + this.$set(this.ruleForm, 'xtsjUnit', xtsjUnit.length > 0 ? xtsjUnit : [{ name: "", tyshxydm: "", lxr: "", lxdh: "", type: 4 }]) + this.$set(this.ruleForm, 'xtjsUnit', xtjsUnit.length > 0 ? xtjsUnit : [{ name: "", tyshxydm: "", lxr: "", lxdh: "", type: 5 }]) + this.$set(this.ruleForm, 'xtyyUnit', xtyyUnit.length > 0 ? xtyyUnit : [{ name: "", tyshxydm: "", lxr: "", lxdh: "", type: 7 }]) + this.$set(this.ruleForm, 'aqfwUnit', aqfwUnit.length > 0 ? aqfwUnit : [{ name: "", tyshxydm: "", lxr: "", lxdh: "", type: 6 }]) + + let fwqxx = this.ruleForm.jcwlList.filter((item) => item.type == 1) + let wlsb = this.ruleForm.jcwlList.filter((item) => item.type == 2) + let aqsb = this.ruleForm.jcwlList.filter((item) => item.type == 3) + + + // this.ruleForm.fwqxx = (this.ruleForm.jcwlList.filter((item) => item.type == 1) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 1) : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 1 }]) + + this.$set(this.ruleForm, 'fwqxx', fwqxx.length > 0 ? fwqxx : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 1 }]) + + this.$set(this.ruleForm, 'wlsb', wlsb.length > 0 ? wlsb : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 2 }]) + + this.$set(this.ruleForm, 'aqsb', aqsb.length > 0 ? aqsb : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 3 }]) + + // this.ruleForm.wlsb = (this.ruleForm.jcwlList.filter((item) => item.type == 2) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 2) : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 2 }]) + + // this.ruleForm.aqsb = (this.ruleForm.jcwlList.filter((item) => item.type == 3) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 3) : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 3 }]) this.ruleForm.xtfhqkFcg ? this.xtfhqkFcg = this.ruleForm.xtfhqkFcg.split(',') : []; this.ruleForm.xtfhqkFcg ? this.xtfhqkFxl = this.ruleForm.xtfhqkFxl.split(',') : []; @@ -2984,15 +3007,16 @@ export default { this.ruleForm.xtfhqkFcg ? this.xtfhqkFls = this.ruleForm.xtfhqkFls.split(',') : []; - if(this.ruleForm.sheng && this.ruleForm.shi && this.ruleForm.qu) { - this.dlwz = [this.ruleForm.sheng,this.ruleForm.shi,this.ruleForm.qu] - } else if(this.ruleForm.sheng && this.ruleForm.shi) { - this.dlwz = [this.ruleForm.sheng,this.ruleForm.shi] - } else if(this.ruleForm.sheng) { + if (this.ruleForm.sheng && this.ruleForm.shi && this.ruleForm.qu) { + this.dlwz = [this.ruleForm.sheng, this.ruleForm.shi, this.ruleForm.qu] + } else if (this.ruleForm.sheng && this.ruleForm.shi) { + this.dlwz = [this.ruleForm.sheng, this.ruleForm.shi] + } else if (this.ruleForm.sheng) { this.dlwz = [this.ruleForm.sheng] } + this.loading = false + }) - this.loading = false; }, changeRadio(id){ diff --git a/src/views/system/user/danweiList.vue b/src/views/system/user/danweiList.vue index 47635a4..932b111 100644 --- a/src/views/system/user/danweiList.vue +++ b/src/views/system/user/danweiList.vue @@ -14,7 +14,7 @@ - + diff --git a/src/views/unitPages/myTask/audit.vue b/src/views/unitPages/myTask/audit.vue index 6b19fcf..cfcaf52 100644 --- a/src/views/unitPages/myTask/audit.vue +++ b/src/views/unitPages/myTask/audit.vue @@ -2690,7 +2690,7 @@                
{{ruleForm.bfyy}}
                          - + 报废 取消 暂存 @@ -2699,11 +2699,11 @@
- + - + diff --git a/src/views/unitPages/myTask/info.vue b/src/views/unitPages/myTask/info.vue index 08250c6..a0b45a7 100644 --- a/src/views/unitPages/myTask/info.vue +++ b/src/views/unitPages/myTask/info.vue @@ -9,7 +9,7 @@
- + 任务下发时间:{{ titleInfoObj.taskTime }} 任务名称:{{ titleInfoObj.taskName }} @@ -22,9 +22,7 @@ 任务期限:{{ titleInfoObj.taskDeadline }} - - 任务下发时间:{{ titleInfoObj.taskTime }} - +