diff --git a/src/assets/images/icon-jt@2x.png b/src/assets/images/icon-jt@2x.png new file mode 100644 index 0000000..fff5448 Binary files /dev/null and b/src/assets/images/icon-jt@2x.png differ diff --git a/src/assets/images/icon-rwxf@2x.png b/src/assets/images/icon-rwxf@2x.png new file mode 100644 index 0000000..4b4ad6f Binary files /dev/null and b/src/assets/images/icon-rwxf@2x.png differ diff --git a/src/assets/images/icon-shbh@2x.png b/src/assets/images/icon-shbh@2x.png new file mode 100644 index 0000000..100a1a9 Binary files /dev/null and b/src/assets/images/icon-shbh@2x.png differ diff --git a/src/assets/images/icon-shtg@2x.png b/src/assets/images/icon-shtg@2x.png new file mode 100644 index 0000000..7e9987c Binary files /dev/null and b/src/assets/images/icon-shtg@2x.png differ diff --git a/src/assets/images/icon-wctj@2x.png b/src/assets/images/icon-wctj@2x.png new file mode 100644 index 0000000..ddf4951 Binary files /dev/null and b/src/assets/images/icon-wctj@2x.png differ diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 3195cfe..2490b65 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -166,27 +166,29 @@ margin-left: 10px; .info-title { - margin-top: 15px; - - font-weight: 700; + font-family: Alibaba PuHuiTi; + font-weight: bold; font-size: 16px; - color: #3D3D3D; - padding-left: 10px; + color: #192734; + position: relative; + padding: 15px 0 15px 20px; + border-bottom: 1px solid #F2F4F6; &::before { content: ""; display: block; - width: 72px; - height: 3px; - position: relative; - top: 30px; - background-color: #2F8AE5; + width: 4px; + height: 20px; border-radius: 5px; + position: absolute; + top: 15px; + left: 0px; + background-color: #2F8AE5; } } .timeline { - padding: 20px; + padding: 20px 10px; } } } diff --git a/src/views/auditPages/assetsManagement/assetsAuth.vue b/src/views/auditPages/assetsManagement/assetsAuth.vue index a83283d..52a8114 100644 --- a/src/views/auditPages/assetsManagement/assetsAuth.vue +++ b/src/views/auditPages/assetsManagement/assetsAuth.vue @@ -1282,7 +1282,7 @@ 供应链信息 -
+
@@ -1302,7 +1302,7 @@ - +
@@ -1358,7 +1358,7 @@
-
+
@@ -1396,7 +1396,7 @@
-
+
@@ -1434,7 +1434,7 @@
-
+
@@ -1491,7 +1491,7 @@
-
+
@@ -1548,7 +1548,7 @@
-
+
@@ -2727,7 +2727,77 @@ export default { // 其他联系人 otherConcat:[], - type:[] + type:[], + // 测评单位 + chepingUnit:[ + { + name:"", + tyshxydm:"", + lxr:"", + lxdh:"", + type:1 + } + ], + // 硬件供应商单位 + yjgysUnit:[ + { + name:"", + tyshxydm:"", + lxr:"", + lxdh:"", + type:2 + } + ], + // 机房运维单位 + jfywUnit:[ + { + name:"", + tyshxydm:"", + lxr:"", + lxdh:"", + type:3 + } + ], + // 系统设计单位 + xtsjUnit:[ + { + name:"", + tyshxydm:"", + lxr:"", + lxdh:"", + type:4 + } + ], + // 系统建设单位 + xtjsUnit:[ + { + name:"", + tyshxydm:"", + lxr:"", + lxdh:"", + type:5 + } + ], + // 系统运营单位 + xtyyUnit:[ + { + name:"", + tyshxydm:"", + lxr:"", + lxdh:"", + type:7 + } + ], + // 安全服务单位 + aqfwUnit:[ + { + name:"", + tyshxydm:"", + lxr:"", + lxdh:"", + type:6 + } + ], }, // 地理位置 dlwz:[], @@ -2741,76 +2811,6 @@ export default { xtfhqkFzd:[], // 防勒索 xtfhqkFls:[], - // 测评单位 - chepingUnit:[ - { - name:"", - tyshxydm:"", - lxr:"", - lxdh:"", - type:1 - } - ], - // 硬件供应商单位 - yjgysUnit:[ - { - name:"", - tyshxydm:"", - lxr:"", - lxdh:"", - type:2 - } - ], - // 机房运维单位 - jfywUnit:[ - { - name:"", - tyshxydm:"", - lxr:"", - lxdh:"", - type:3 - } - ], - // 系统设计单位 - xtsjUnit:[ - { - name:"", - tyshxydm:"", - lxr:"", - lxdh:"", - type:4 - } - ], - // 系统建设单位 - xtjsUnit:[ - { - name:"", - tyshxydm:"", - lxr:"", - lxdh:"", - type:5 - } - ], - // 系统运营单位 - xtyyUnit:[ - { - name:"", - tyshxydm:"", - lxr:"", - lxdh:"", - type:7 - } - ], - // 安全服务单位 - aqfwUnit:[ - { - name:"", - tyshxydm:"", - lxr:"", - lxdh:"", - type:6 - } - ], // 服务器 fwqxx:[ { @@ -2888,22 +2888,29 @@ export default { this.$set(this.ruleForm.xjgywxt, 'remark', "") } this.ruleForm.xttz ? this.xttz = this.ruleForm.xttz.split(',') : []; - this.chepingUnit = (this.ruleForm.gylxxList.filter((item) => item.type == 1) == [] ? this.ruleForm.gylxxList.filter((item) => item.type == 1) : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:1}]) - this.yjgysUnit = (this.ruleForm.gylxxList.filter((item) => item.type == 2) == [] ? this.ruleForm.gylxxList.filter((item) => item.type == 2) : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:2}]) - this.jfywUnit = (this.ruleForm.gylxxList.filter((item) => item.type == 3) == [] ? this.ruleForm.gylxxList.filter((item) => item.type == 3) : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:3}]) - this.xtsjUnit = (this.ruleForm.gylxxList.filter((item) => item.type == 4) == [] ? this.ruleForm.gylxxList.filter((item) => item.type == 4) : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:4}]) - this.xtjsUnit = (this.ruleForm.gylxxList.filter((item) => item.type == 5) == [] ? this.ruleForm.gylxxList.filter((item) => item.type == 5) : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:5}]) - this.xtyyUnit = (this.ruleForm.gylxxList.filter((item) => item.type == 7) == [] ? this.ruleForm.gylxxList.filter((item) => item.type == 7) : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:7}]) - this.aqfwUnit = (this.ruleForm.gylxxList.filter((item) => item.type == 6) == [] ? this.ruleForm.gylxxList.filter((item) => item.type == 6) : [{name:"",tyshxydm:"",lxr:"",lxdh:"",type:6}]) + 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) + let xtsjUnit = this.ruleForm.gylxxList.filter((item) => item.type == 4) + 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.xtfhqkFcg = this.ruleForm.xtfhqkFcg.split(',') - this.xtfhqkFxl = this.ruleForm.xtfhqkFxl.split(',') - this.xtfhqkFzd = this.ruleForm.xtfhqkFzd.split(',') - this.xtfhqkFls = this.ruleForm.xtfhqkFls.split(',') + this.ruleForm.xtfhqkFcg ? this.xtfhqkFcg = this.ruleForm.xtfhqkFcg.split(',') : []; + this.ruleForm.xtfhqkFcg ? this.xtfhqkFxl = this.ruleForm.xtfhqkFxl.split(',') : []; + this.ruleForm.xtfhqkFcg ? this.xtfhqkFzd = this.ruleForm.xtfhqkFzd.split(',') : []; + this.ruleForm.xtfhqkFcg ? this.xtfhqkFls = this.ruleForm.xtfhqkFls.split(',') : []; if(this.ruleForm.sheng && this.ruleForm.shi && this.ruleForm.qu) { @@ -2922,7 +2929,7 @@ export default { }, // 供应链Form新增 addGongyinglian(type,id){ - this[type].push({ + this.ruleForm[type].push({ name:"", tyshxydm:"", lxr:"", @@ -3040,7 +3047,7 @@ export default { this.ruleForm.xtfhqkFxl = this.xtfhqkFxl.join(','); this.ruleForm.xtfhqkFzd = this.xtfhqkFzd.join(','); this.ruleForm.xtfhqkFls = this.xtfhqkFls.join(','); - this.ruleForm.gylxxList = [...this.chepingUnit,...this.yjgysUnit,...this.jfywUnit,...this.xtsjUnit,...this.xtjsUnit,...this.xtyyUnit,...this.aqfwUnit] + this.ruleForm.gylxxList = [...this.ruleForm.chepingUnit,...this.ruleForm.yjgysUnit,...this.ruleForm.jfywUnit,...this.ruleForm.xtsjUnit,...this.ruleForm.xtjsUnit,...this.ruleForm.xtyyUnit,...this.ruleForm.aqfwUnit] this.ruleForm.jcwlList = [...this.fwqxx,...this.wlsb,...this.aqsb] if(this.dlwz.length > 0) { this.ruleForm.sheng = this.dlwz[0] @@ -3065,5 +3072,15 @@ export default { } }, }, + beforeRouteEnter(to,from,next){ + if(to.query.pageType == 'add') { + to.meta.title = '新增资产' + } else if(to.query.pageType == 'change') { + to.meta.title = '修改资产' + } else if(to.query.pageType == 'look') { + to.meta.title = '资产详情' + } + next(); + }, } diff --git a/src/views/auditPages/taskManagement/info.vue b/src/views/auditPages/taskManagement/info.vue index ff9fd4f..bfc4897 100644 --- a/src/views/auditPages/taskManagement/info.vue +++ b/src/views/auditPages/taskManagement/info.vue @@ -160,11 +160,13 @@
任务流程节点
- - - {{ activity.content }} - - +
+ +
+ 管理员任务下发 + 2024-11-11 17:00:30 +
+
@@ -347,7 +349,7 @@ export default { const headerHeight = header.offsetHeight; const paginationtHeight = pagination.offsetHeight; const tabHeight = tab.offsetHeight; - this.tabHeader = elementHeight - headerHeight - paginationtHeight - tabHeight - 140; + this.tabHeader = elementHeight - headerHeight - paginationtHeight - tabHeight - 120; } }, }