Merge branch 'main' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationPc into lijinlong

src/assets/styles/public.scss

@@ -166,27 +166,70 @@
     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;
+      height: calc(100% - 60px);
+      overflow-y: scroll;
+
+      .timeline-items {
+        display: flex;
+        align-items: center;
+        margin-bottom: 40px;
+        .left-box {
+          position: relative;
+          .main-img {
+            width: 45px;
+            margin-right: 20px;
+          }
+          .icon-jt {
+            position: absolute;
+            width: 15px;
+            height: 7px;
+            bottom: -20px;
+            left: 15px;
+          }
+        }
+
+        .right-box {
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+          .span-title {
+            font-family: Alibaba PuHuiTi;
+            font-weight: 500;
+            font-size: 14px;
+            color: #192734;
+            margin-bottom: 8px;
+          }
+          .span-time {
+            font-family: Alibaba PuHuiTiR;
+            font-weight: 400;
+            font-size: 14px;
+            color: #5C6166;
+          }
+        }
+      }
     }
   }
 }

src/views/auditPages/assetsManagement/assetsAuth.vue

@@ -1282,7 +1282,7 @@
             <el-row style="margin: 10px 0;">
               <span class="top-title-box">供应链信息</span>
             </el-row>
-            <div v-for="(domain, index) in chepingUnit" :key="domain.remark" :prop="'chepingUnit.' + index + '.value'">
+            <div v-for="(domain, index) in ruleForm.chepingUnit" :key="domain.remark" :prop="'chepingUnit.' + index + '.value'">
               <el-row style="display: flex;">
                 <el-col :span="12">
                   <el-form-item class="daoqitixingren" required :label="'测评单位名称' + (index == 0 ? '' : index)">
@@ -1302,7 +1302,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="11" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :label="'联系电话' + (index == 0 ? '' : index)"  :prop="'chepingUnit.' + index + '.lxdh'"
+                  <el-form-item class="daoqitixingren" :label="'联系电话' + (index == 0 ? '' : index)" :prop="'chepingUnit.' + index + '.lxdh'"
                     :rules="[
                       {
                         pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
@@ -1320,7 +1320,7 @@
                 </el-col>
               </el-row>
             </div>
-            <div v-for="(domain, index) in yjgysUnit" :key="domain.remark" :prop="'yjgysUnit.' + index + '.value'">
+            <div v-for="(domain, index) in ruleForm.yjgysUnit" :key="domain.remark" :prop="'yjgysUnit.' + index + '.value'">
               <el-row style="display: flex;">
                 <el-col :span="12">
                   <el-form-item class="daoqitixingren" :label="'硬件供应商单位名称' + (index == 0 ? '' : index)">
@@ -1358,7 +1358,7 @@
                 </el-col>
               </el-row>
             </div>
-            <div v-for="(domain, index) in jfywUnit" :key="domain.remark" :prop="'jfywUnit.' + index + '.value'">
+            <div v-for="(domain, index) in ruleForm.jfywUnit" :key="domain.remark" :prop="'jfywUnit.' + index + '.value'">
               <el-row style="display: flex;">
                 <el-col :span="12">
                   <el-form-item class="daoqitixingren" :label="'机房运维单位名称' + (index == 0 ? '' : index)">
@@ -1396,7 +1396,7 @@
                 </el-col>
               </el-row>
             </div>
-            <div v-for="(domain, index) in xtsjUnit" :key="domain.remark" :prop="'xtsjUnit.' + index + '.value'">
+            <div v-for="(domain, index) in ruleForm.xtsjUnit" :key="domain.remark" :prop="'xtsjUnit.' + index + '.value'">
               <el-row style="display: flex;">
                 <el-col :span="12">
                   <el-form-item class="daoqitixingren" :label="'系统设计单位名称' + (index == 0 ? '' : index)">
@@ -1434,7 +1434,7 @@
                 </el-col>
               </el-row>
             </div>
-            <div v-for="(domain, index) in xtjsUnit" :key="domain.remark" :prop="'xtjsUnit.' + index + '.value'">
+            <div v-for="(domain, index) in ruleForm.xtjsUnit" :key="domain.remark" :prop="'xtjsUnit.' + index + '.value'">
               <el-row style="display: flex;">
                 <el-col :span="12">
                   <el-form-item class="daoqitixingren" required :label="'系统建设单位名称' + (index == 0 ? '' : index)">
@@ -1491,7 +1491,7 @@
                 </el-col>
               </el-row>
             </div>
-            <div v-for="(domain, index) in xtyyUnit" :key="domain.remark" :prop="'xtyyUnit.' + index + '.value'">
+            <div v-for="(domain, index) in ruleForm.xtyyUnit" :key="domain.remark" :prop="'xtyyUnit.' + index + '.value'">
               <el-row style="display: flex;">
                 <el-col :span="12">
                   <el-form-item class="daoqitixingren" required :label="'系统运营单位名称' + (index == 0 ? '' : index)">
@@ -1548,7 +1548,7 @@
                 </el-col>
               </el-row>
             </div>
-            <div v-for="(domain, index) in aqfwUnit" :key="domain.remark" :prop="'aqfwUnit.' + index + '.value'">
+            <div v-for="(domain, index) in ruleForm.aqfwUnit" :key="domain.remark" :prop="'aqfwUnit.' + index + '.value'">
               <el-row style="display: flex;">
                 <el-col :span="12">
                   <el-form-item class="daoqitixingren" :label="'安全服务单位' + (index == 0 ? '' : index)">
@@ -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();
+  },
 }
 </script>

src/views/auditPages/taskManagement/info.vue

@@ -160,11 +160,22 @@
     <div class="info-right" v-if="$route.query.pageType == 'look'">
       <div class="info-title">任务流程节点</div>
       <div class="timeline">
-        <el-timeline>
-          <el-timeline-item v-for="(activity, index) in activities" :key="index" :timestamp="activity.timestamp">
-            {{ activity.content }}
-          </el-timeline-item>
-        </el-timeline>
+        <div class="timeline-items" v-for="(item,index) in timeLineData">
+          <div class="left-box">
+            <img class="main-img" v-if="item.status == 1" src="@/assets/images/rwxf.png" alt="">
+            <img class="main-img" v-if="item.status == 2" src="@/assets/images/wctj.png" alt="">
+            <img class="main-img" v-if="item.status == 3" src="@/assets/images/shbh.png" alt="">
+            <img class="main-img" v-if="item.status == 4" src="@/assets/images/shtg.png" alt="">
+            <img class="icon-jt" v-if="(index + 1) != timeLineData.length" src="@/assets/images/icon-jt@2x.png" alt="">
+          </div>
+          <div class="right-box">
+            <span class="span-title" v-if="item.status == 1">管理员任务下发:</span>
+            <span class="span-title" v-if="item.status == 2">单位核查完成提交:</span>
+            <span class="span-title" v-if="item.status == 3">管理员审核驳回:</span>
+            <span class="span-title" v-if="item.status == 4">管理员审核通过:</span>
+            <span class="span-time">{{ item.timestamp }}</span>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -198,20 +209,38 @@ export default {
       ],
       loading: false,
       tabHeader: undefined,
-      activities: [{
-        content: '管理员任务下发',
+      timeLineData: [{
+        status: 1,
+        timestamp: '2024-11-11 17:00:00'
+      }, {
+        status: 2,
+        timestamp: '2024-11-11 17:00:00'
+      }, {
+        status: 3,
+        timestamp: '2024-11-11 17:00:00'
+      }, {
+        status: 2,
+        timestamp: '2024-11-11 17:00:00'
+      }, {
+        status: 4,
+        timestamp: '2024-11-11 17:00:00'
+      }, {
+        status: 2,
+        timestamp: '2024-11-11 17:00:00'
+      }, {
+        status: 4,
         timestamp: '2024-11-11 17:00:00'
       }, {
-        content: '单位核查完成提交',
+        status: 2,
         timestamp: '2024-11-11 17:00:00'
       }, {
-        content: '管理员审核驳回',
+        status: 4,
         timestamp: '2024-11-11 17:00:00'
       }, {
-        content: '单位重新审核提交',
+        status: 2,
         timestamp: '2024-11-11 17:00:00'
       }, {
-        content: '管理员审核通过',
+        status: 4,
         timestamp: '2024-11-11 17:00:00'
       }],
       titleInfoObj: {}
@@ -356,7 +385,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;
     }
   },
 }