From 7bdff21f0e72e1f6f2a7f198b24f26e1311afa12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Tue, 10 Dec 2024 13:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=80=E6=96=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 src/api/renwuApi/index.js                     |  17 +
 src/assets/styles/public.scss                 |  23 +-
 src/layout/components/AppMain.vue             |   4 +-
 .../auditPages/taskManagement/auditList.vue   |   2 +-
 src/views/auditPages/taskManagement/index.vue | 152 ++++--
 src/views/auditPages/taskManagement/info.vue  | 239 ++++++--
 src/views/components/renwuType/butongguo.vue  |   1 +
 src/views/components/renwuType/webType1.vue   |   1 +
 src/views/components/renwuType/webType2DW.vue | 508 +++++++++---------
 src/views/unitPages/myTask/index.vue          |   7 +-
 src/views/unitPages/myTask/info.vue           |   4 +-
 12 files changed, 610 insertions(+), 350 deletions(-)

diff --git a/package.json b/package.json
index 81a3ed7..4792d90 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "axios": "0.28.1",
     "clipboard": "2.0.8",
     "core-js": "3.37.1",
-    "echarts": "5.4.0",
+    "echarts": "^5.4.0",
     "element-ui": "2.15.14",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
diff --git a/src/api/renwuApi/index.js b/src/api/renwuApi/index.js
index 20c41dc..16e644d 100644
--- a/src/api/renwuApi/index.js
+++ b/src/api/renwuApi/index.js
@@ -179,4 +179,21 @@ export function assetTaskgzhjyTj(data) {
     method: "post",
     data,
   })
+}
+//关闭任务
+export function assetTaskclose(params) {
+  return request({
+    url: `/unit/assetTask/close`,
+    method: "get",
+    params,
+  })
+}
+
+//管理端-单位核查比例图
+export function assetTaskdwHcBl(data) {
+  return request({
+    url: `/unit/assetTask/dwHcBl`,
+    method: "post",
+    data,
+  })
 }
\ No newline at end of file
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 8f2c2ed..ae08178 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -155,13 +155,17 @@
     height: 100%;
     background-color: #fff;
     border-radius: 5px;
+    overflow: hidden;
   }
-  .info-left{
+
+  .info-left {
     flex: 5;
   }
-  .info-right{
+
+  .info-right {
     flex: 1;
   }
+
   .info-right {
     margin-left: 10px;
 
@@ -196,12 +200,15 @@
         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;
@@ -215,6 +222,7 @@
           display: flex;
           flex-direction: column;
           justify-content: space-between;
+
           .span-title {
             font-family: Alibaba PuHuiTi;
             font-weight: 500;
@@ -222,6 +230,7 @@
             color: #192734;
             margin-bottom: 8px;
           }
+
           .span-time {
             font-family: Alibaba PuHuiTiR;
             font-weight: 400;
@@ -310,13 +319,13 @@
     div {
       padding: 10px;
       padding: 5px 15px;
-      border: 1px solid #F5F5F5;
+      border: 1px solid #e0dddd;
       font-weight: 400;
       font-family: Alibaba PuHuiTiR;
       font-size: 14px;
-      color: #192733;
+      color: #000000;
       border-bottom: none;
-      background-color: #F5F5F5;
+      background-color: #e0dddd;
       cursor: pointer;
       margin-right: 10px;
     }
@@ -512,7 +521,7 @@ input[aria-hidden="true"] {
   box-shadow: none;
 }
 
-.bottomclass{
+.bottomclass {
   text-align: center;
   background-color: #fff;
-}
+}
\ No newline at end of file
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 881f8b4..e98fc2b 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -63,8 +63,8 @@ export default {
 }
 
 ::-webkit-scrollbar {
-  width: 4px;
-  height: 4px;
+  width: 6px;
+  height: 8px;
 }
 
 ::-webkit-scrollbar-track {
diff --git a/src/views/auditPages/taskManagement/auditList.vue b/src/views/auditPages/taskManagement/auditList.vue
index 0535e46..c86fc11 100644
--- a/src/views/auditPages/taskManagement/auditList.vue
+++ b/src/views/auditPages/taskManagement/auditList.vue
@@ -27,7 +27,7 @@
     </div>
     <div class="info-cut-off-rule" id="L-tab">
       <div class="left-tab" :class="index == 1 ? 'active-tab':''" @click="activeTab(1)">资产核查信息</div>
-      <div :class="index == 2 ? 'active-tab':''" @click="activeTab(2)">核查单位信息</div>
+      <div :class="index == 2 ? 'active-tab':''" @click="activeTab(2)">单位完成情况</div>
     </div>
     <div class="info-bottom-box">
       <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" v-if="index == 1">
diff --git a/src/views/auditPages/taskManagement/index.vue b/src/views/auditPages/taskManagement/index.vue
index 434a9e5..5e9a4ae 100644
--- a/src/views/auditPages/taskManagement/index.vue
+++ b/src/views/auditPages/taskManagement/index.vue
@@ -10,10 +10,12 @@
               <el-input v-model="formInline.taskName" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-        
+
           <el-col :span="7">
             <el-form-item label="任务状态：">
               <el-select v-model="formInline.taskStatus" placeholder="请选择">
+                <el-option label="关闭" value="0">
+                </el-option>
                 <el-option label="进行中" value="1">
                 </el-option>
                 <el-option label="正常完成" value="2">
@@ -36,7 +38,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item >
+            <el-form-item>
               <!-- <el-date-picker v-model="formInline.time" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
                 type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="请选择">
               </el-date-picker> -->
@@ -79,6 +81,9 @@
           <el-table-column label="任务状态" key="taskStatus" width="200px" prop="taskStatus" class-name="table-status"
             align="center">
             <template slot-scope="scope">
+              <span v-if="scope.row.taskStatus == 0" style="color: #F56C6C;">
+                已关闭
+              </span>
               <span v-if="scope.row.taskStatus == 1" style="color: #E6A23C;">
                 进行中
               </span>
@@ -87,7 +92,7 @@
               </span>
               <span v-if="scope.row.taskStatus == 3" style="color:#67C23A;">
                 超期完成
-              </span> 
+              </span>
               <span v-if="scope.row.taskStatus == 4" style="color: #F56C6C;">
                 审核不通过
               </span>
@@ -101,14 +106,20 @@
               <div style="display: flex;align-items: center;justify-content: center;">
                 <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row)">
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info"
-                    style="color: #1485EF;">查看</span>
+                  <span class="look-info" style="color: #1485EF;">查看</span>
                 </div>
                 <!--  -->
-                <div  style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="delInfo(scope.row)" v-if="scope.row.taskStatus == 1">
+                <div style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
+                  @click="delInfo(scope.row)" v-if="scope.row.taskStatus == 1 && scope.row.taskStatus != 0">
                   <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="del-info"
-                    style="color: #1485EF;">审核</span>
+                  <span class="del-info" style="color: #1485EF;">审核</span>
+                </div>
+                <div style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
+                  @click="guanbijiekou(scope.row)" v-if="scope.row.taskStatus == 1 && scope.row.taskStatus != 0">
+                  <!--  -->
+                  <!-- <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;"> -->
+                  <i class="el-icon-delete"></i>
+                  <span class="del-info" style="color: #1485EF;">关闭</span>
                 </div>
               </div>
             </template>
@@ -130,12 +141,12 @@
                 <el-checkbox label="0">web资产</el-checkbox>
                 <el-checkbox label="1">小程序资产</el-checkbox>
                 <el-checkbox label="2">公众号资产</el-checkbox>
-                <el-checkbox label="3" >电子邮件资产</el-checkbox>
-                <el-checkbox label="4" >移动应用程序资产</el-checkbox>
+                <el-checkbox label="3">电子邮件资产</el-checkbox>
+                <el-checkbox label="4">移动应用程序资产</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
             <el-form-item label="核查单位" prop="dwmc" class="select-box">
-              <el-col >
+              <el-col>
                 <el-select v-model="ruleForm.dwmc" placeholder="请选择核查单位" multiple collapse-tags>
                 </el-select>
               </el-col>
@@ -144,8 +155,8 @@
               </el-col>
             </el-form-item>
             <el-form-item label="任务期限" prop="taskDeadline">
-              <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.taskDeadline" style="width: 100%;"
-                value-format="yyyy-MM-dd"></el-date-picker>
+              <el-date-picker type="datetime" placeholder="选择日期" v-model="ruleForm.taskDeadline" style="width: 100%;"
+                value-format="yyyy-MM-dd HH:mm:ss" default-time="23:59:59"></el-date-picker>
             </el-form-item>
             <el-form-item class="newTask-form-item">
               <el-button @click="resetForm('ruleForm')">取消</el-button>
@@ -169,14 +180,14 @@
 import myPagination from "@/views/components/Pagination/index.vue"
 import myDialog from "@/views/components/myDialog/index.vue"
 import danweiList from "@/views/system/user/danweiList.vue"
-import { addassetTaskadd, getassetTask, getassetTaskid } from "@/api/renwuApi/index.js"
+import { addassetTaskadd, getassetTask, getassetTaskid, assetTaskclose } from "@/api/renwuApi/index.js"
 
 export default {
   // dicts: ['jjh_project_type', 'bms_approval_status', "project_middle_type", "project_small_type", "project_categories"],
   components: { myPagination, myDialog, danweiList },
   data() {
     return {
-      btnloading:false,
+      btnloading: false,
       formInline: {
         name: "",
         type: "",
@@ -198,7 +209,7 @@ export default {
         taskName: "",
         dwmc: [],
         taskDeadline: "",
-        type:[]
+        type: []
       },
       rules: {
         taskName: [
@@ -210,32 +221,32 @@ export default {
         taskDeadline: [
           { required: true, message: '请选择日期', trigger: 'change' }
         ],
-        type:[
-        { required: true, message: '请选择', trigger: 'change' }
+        type: [
+          { required: true, message: '请选择', trigger: 'change' }
         ]
       },
       tabclicklist: [],
-   
-      chanckList:[
+
+      chanckList: [
         {
-          lable:"0",
-          conent:"web资产"
+          lable: "0",
+          conent: "web资产"
         },
         {
-          lable:"1",
-          conent:"小程序资产"
+          lable: "1",
+          conent: "小程序资产"
         },
         {
-          lable:"2",
-          conent:"公众号资产"
+          lable: "2",
+          conent: "公众号资产"
         },
         {
-          lable:"3",
-          conent:"电子邮件资产"
+          lable: "3",
+          conent: "电子邮件资产"
         },
         {
-          lable:"4",
-          conent:"移动应用程序资产"
+          lable: "4",
+          conent: "移动应用程序资产"
         },
       ]
     }
@@ -256,7 +267,7 @@ export default {
         dwmc: [],
         taskName: "",
         taskDeadline: "",
-        type:[]
+        type: []
 
       }
       this.$refs.taskDialog.close()
@@ -264,7 +275,7 @@ export default {
     },
     submitForm(formName) {
       console.log(this.ruleForm);
-      
+
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.btnloading = true
@@ -274,14 +285,14 @@ export default {
             this.resetForm()
             this.getInfo();
             this.$modal.msgSuccess("新增成功");
-          this.btnloading = false
+            this.btnloading = false
 
 
 
           })
           setTimeout(() => {
             this.ruleForm.dwmc = this.ruleForm.dwmc.split(",")
-          this.ruleForm.type = this.ruleForm.type.split(",")
+            this.ruleForm.type = this.ruleForm.type.split(",")
 
           }, 0);
         } else {
@@ -330,24 +341,24 @@ export default {
     //打开列表
     addliebiao() {
       console.log(this.ruleForm.type);
-      
-      if(this.ruleForm.type.length >0){
-        this.$refs.liebiaoDialog.open()
-      setTimeout(() => {
-      this.$refs.danweiList.getType(this.ruleForm.type)
 
-      this.$refs.danweiList.getList()
-        
-      }, 100);
-      if (this.tabclicklist) {
+      if (this.ruleForm.type.length > 0) {
+        this.$refs.liebiaoDialog.open()
         setTimeout(() => {
-          this.$refs.danweiList.dakai(this.tabclicklist)
+          this.$refs.danweiList.getType(this.ruleForm.type)
+
+          this.$refs.danweiList.getList()
+
         }, 100);
-      }
-      }else{
+        if (this.tabclicklist) {
+          setTimeout(() => {
+            this.$refs.danweiList.dakai(this.tabclicklist)
+          }, 100);
+        }
+      } else {
         this.$message('请先选择核查资产类型');
       }
-     
+
 
     },
     liebiaoClose() {
@@ -358,7 +369,7 @@ export default {
         nickName: undefined,
         dwlx: undefined,
       },
-      this.$refs.liebiaoDialog.close()
+        this.$refs.liebiaoDialog.close()
 
     },
     // 查询
@@ -389,8 +400,8 @@ export default {
       this.$refs.taskDialog.open()
       setTimeout(() => {
         this.$refs.ruleForm.clearValidate()
-          
-        }, 100);
+
+      }, 100);
     },
     // 关闭弹框
     importClose() {
@@ -402,7 +413,7 @@ export default {
       this.$router.push({
         name: 'TaskInfo', query: {
           pageType: "look",
-          id:row.id
+          id: row.id
         }
       })
     },
@@ -411,15 +422,43 @@ export default {
       this.$router.push({
         name: 'TaskInfo', query: {
           pageType: "info",
-          id:row.id
+          id: row.id
         }
       })
     },
+    // 关闭
+    guanbijiekou(row) {
+      console.log(row);
+
+      this.$confirm('此操作将关闭改任务, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+
+        assetTaskclose({ taskId: row.id }).then(res => {
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '关闭成功!'
+            });
+            this.getInfo();
+
+          }
+        })
+
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消关闭'
+        });
+      });
+    },
     // 编辑
     edit() {
     },
     // 审核
-   
+
     // 修改table背景色
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 !== 0) {
@@ -445,7 +484,14 @@ export default {
 .el-icon-s-unfold {
   font-size: 16px;
 }
+
 // ::v-deep .el-dialog__body{
 //   padding-left: 80px;
 // }
+.el-icon-delete {
+  color: #409EFF;
+  font-size: 16px;
+  font-weight: 600;
+  margin-right: 5px;
+}
 </style>
diff --git a/src/views/auditPages/taskManagement/info.vue b/src/views/auditPages/taskManagement/info.vue
index 73af3b2..b38ef37 100644
--- a/src/views/auditPages/taskManagement/info.vue
+++ b/src/views/auditPages/taskManagement/info.vue
@@ -32,12 +32,12 @@
       </div>
       <div class="info-cut-off-rule" id="L-tab">
         <div class="left-tab" :class="index == 1 ? 'active-tab' : ''" @click="activeTab(1)">资产核查信息</div>
-        <div :class="index == 2 ? 'active-tab' : ''" @click="activeTab(2)">核查单位信息</div>
+        <div :class="index == 2 ? 'active-tab' : ''" @click="activeTab(2)">单位完成情况</div>
       </div>
       <div class="info-bottom-box">
         <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" v-if="index == 1">
           <el-row>
-            <el-col :span="8">
+            <el-col :span="7">
               <el-form-item label="核查单位:">
                 <el-input v-model="formInline.dwmc" placeholder="请输入"></el-input>
               </el-form-item>
@@ -51,7 +51,7 @@
                 </el-select>
               </el-form-item>
             </el-col> -->
-            <el-col :span="9">
+            <el-col :span="7">
               <el-form-item label="审核状态:">
                 <el-select v-model="formInline.status" placeholder="请选择">
                   <el-option label="待核查" value="0">
@@ -90,6 +90,19 @@
                 <!-- </el-select> -->
               </el-form-item>
             </el-col>
+            <el-col :span="7">
+              <el-form-item label="完成状态：">
+                <el-select v-model="formInlineTwo.taskStatus" placeholder="请选择">
+
+                  <el-option label="进行中" value="1">
+                  </el-option>
+                  <el-option label="正常完成" value="2">
+                  </el-option>
+                  <el-option label="超期完成" value="3">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item>
                 <el-button size="mini" type="primary" @click="handleQuery()">查询</el-button>
@@ -120,7 +133,7 @@
             <el-table-column label="审核状态" key="status" width="200px" prop="status" class-name="table-status"
               align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.status == 0" style="color: #303133;">
+                <span v-if="scope.row.status == 0" style="color: #e6a230;">
                   待核查
                 </span>
                 <span v-if="scope.row.status == 1" style="color: #E6A23C;">
@@ -162,24 +175,56 @@
             </el-table-column>
           </el-table>
         </section>
-        <section v-if="index == 2">
-          <el-table v-loading="loading" :data="tableDataTwo" :height="tabHeader" :max-height="tabHeader"
-            :row-class-name="tableRowClassName">
-            <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column label="单位名称" key="dwmc" width="200px" prop="dwmc" align="center" />
-            <el-table-column label="核查资产数量" key="total" prop="total" align="center" />
-            <el-table-column label="完成数量" key="checked" prop="checked" align="center">
-              <!-- <template slot-scope="scope">
+        <section v-if="index == 2" class="shuangchongbox">
+          <div class="shuangchongboxleftbox" :class="isshow ? '' : 'shuangchongboxleftboxShow'">
+            <div style="margin-bottom: 10px;">
+              <el-button size="mini" type="primary" @click="daochu()">导出</el-button>
+            </div>
+            <el-table v-loading="loading" :data="tableDataTwo" :height="tabHeader" :max-height="tabHeader"
+              :row-class-name="tableRowClassName" style="width: 100%">
+              <el-table-column type="index" width="50" label="序号" align="center" />
+              <el-table-column label="单位名称" key="dwmc" width="150px" prop="dwmc" align="center" />
+              <el-table-column label="完成状态" key="taskStatus" prop="taskStatus" class-name="table-status" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.taskStatus == 0" style="color: #F56C6C;">
+                    已关闭
+                  </span>
+                  <span v-if="scope.row.taskStatus == 1" style="color: #E6A23C;">
+                    进行中
+                  </span>
+                  <span v-if="scope.row.taskStatus == 2" style="color: #67C23A;">
+                    正常完成
+                  </span>
+                  <span v-if="scope.row.taskStatus == 3" style="color:#67C23A;">
+                    超期完成
+                  </span>
+                  <span v-if="scope.row.taskStatus == 4" style="color: #F56C6C;">
+                    审核不通过
+                  </span>
+                  <span v-if="scope.row.taskStatus == 5" style="color: #F56C6C;">
+                    审核驳回
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column label="核查资产数量" key="total" width="180px" prop="total" align="center" />
+              <el-table-column label="完成数量" key="checked" prop="checked" align="center">
+                <!-- <template slot-scope="scope">
                     <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
                   </template> -->
-            </el-table-column>
-            <el-table-column label="未完成数量" key="wwcsl" prop="notChecked" align="center" />
-            <el-table-column label="未完成比例" key="checkedRatio" width="200px" prop="checkedRatio" align="center">
-              <template slot-scope="scope">
-                <span style="color: #192A92;">{{ scope.row.checkedRatio }}%</span>
-              </template>
-            </el-table-column>
-          </el-table>
+              </el-table-column>
+              <!-- <el-table-column label="未完成数量" key="wwcsl" prop="notChecked" align="center" /> -->
+              <el-table-column label="审核退回次数" key="wwcsl" width="180px" prop="shthcs" align="center" />
+              <el-table-column label="完成比例" key="checkedRatio" prop="checkedRatio" align="center">
+                <template slot-scope="scope">
+                  <span style="color: #192A92;">{{ scope.row.checkedRatio }}%</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="shouqiwenzi" @click="shouqiisis">{{ isshow ? "收起" : '展开' }}>></div>
+          <div v-show="isshow" class="myEcharts" id="myEcharts" ref="myEcharts" :style="{ height: tabHeader }">
+            <!-- 123 -->
+          </div>
         </section>
         <my-pagination id="L-pagination" :total="total" :page="pagination.current" :limit="pagination.size"
           @pagination="getPagination" :current-page.sync="pagination.current"></my-pagination>
@@ -197,7 +242,6 @@
             <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">{{ item.assetName }}:</span>
             <span class="span-time">{{ item.xfTime }}</span>
           </div>
@@ -216,9 +260,9 @@
 </template>
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
-import { getassetTaskid, geassetTaskcHc, assetTaskdwHc, assetLcpage, assetLcpageList } from "@/api/renwuApi/index.js"
+import { getassetTaskid, geassetTaskcHc, assetTaskdwHc, assetLcpage, assetTaskdwHcBl } from "@/api/renwuApi/index.js"
 import myDialog from "@/views/components/myDialog/index.vue"
-
+import * as echarts from 'echarts';
 
 export default {
   dicts: ['zc_xtlx'],
@@ -228,10 +272,10 @@ export default {
       index: 1,
       formInline: {
         xtlx: "",
-
       },
       formInlineTwo: {
         dwmc: "",
+        taskStatus: ""
       },
       total: 0,
       pagination: {
@@ -280,29 +324,54 @@ export default {
       ],
       chanckListTow: [],
       listTow: [],
+      option: null,
+      myChart: null,
+      isshow: true,
+      echartsdata: [
+        { value: 0, name: '进行中', taskStatus: "1" },
+        { value: 0, name: '正常完成', taskStatus: "2" },
+        { value: 0, name: '超期完成', taskStatus: "3" },
+      ]
     }
   },
   mounted() {
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
+    // 获取详情
     this.titleInfo()
+    //获取流程节点数据
     this.assetLcpageList()
+    //获取饼状图数据
+    this.getEchartsdata()
 
   },
   destroyed() {
     window.removeEventListener('resize', this.cancalDebounce);
   },
 
-  methods: {  
+  methods: {
+    shouqiisis() {
+      console.log(123);
+      this.isshow = !this.isshow
+      // this.myEchartsis()
+    },
+    // 导出按钮
+    daochu() {
+      this.formInlineTwo.taskId = this.$route.query.id
+      this.download('/unit/assetTask/export', {
+        ...this.formInlineTwo
+      }, `单位完成情况${new Date().getTime()}.xlsx`)
+    },
+    //切换资产核查tab
     handleClick(tab, event) {
       this.formInline = {
         xtlx: "",
       }
       this.activeName = tab.name
       this.xtmcName = tab.$attrs.xtmcName,
-      localStorage.setItem("activeName",this.activeName)
+        localStorage.setItem("activeName", this.activeName)
 
-        this.handleQuery()
+      this.handleQuery()
     },
     //返回图片
     returnidimg(iswenzi) {
@@ -371,7 +440,7 @@ export default {
             taskId: row.taskId,
             assetId: row.id,
             type: this.activeName,
-
+            zcdwmc: row.zcdwmc
           }
         })
       }
@@ -411,13 +480,13 @@ export default {
       this.activeName = this.chanckListTow[0].lable
       // this.xtmcName = tab.$attrs.xtmcName
 
-      if(localStorage.getItem("activeName")){
+      if (localStorage.getItem("activeName")) {
         this.activeName = localStorage.getItem("activeName")
-        localStorage.setItem("activeName",this.activeName)
+        localStorage.setItem("activeName", this.activeName)
       }
-      let listname = this.chanckListTow.filter(item=> item.lable == this.activeName)
-      if(listname){
-      this.xtmcName = listname[0].xtmcName
+      let listname = this.chanckListTow.filter(item => item.lable == this.activeName)
+      if (listname) {
+        this.xtmcName = listname[0].xtmcName
 
       }
       this.handleQuery();
@@ -453,6 +522,7 @@ export default {
       } else if (this.index == 2) {
         this.formInlineTwo = {
           dwmc: "",
+          taskStatus: ""
         }
         this.getListTwo();
       }
@@ -491,7 +561,13 @@ export default {
       console.log(id);
 
       this.resetQuery()
+      if (id == 2) {
+        setTimeout(() => {
+          this.myEchartsis()
+
+        }, 100);
 
+      }
     },
     getList() {
       this.loading = true
@@ -512,6 +588,70 @@ export default {
         this.loading = false
       })
     },
+    //获取Echarts数据
+    getEchartsdata() {
+      assetTaskdwHcBl({ taskId: this.$route.query.id }).then(res => {
+        if (res.code == 200) {
+          let datalsit = res.data
+          this.echartsdata.forEach(res => {
+            datalsit.forEach(datares=>{
+              if(res.taskStatus == datares.taskStatus){
+                res.value = datares.count
+              }
+
+            })
+          })  
+          // this.echartsdata = this.echartsdata.filter(item => item.value != "");
+        }
+
+      })
+    },
+    myEchartsis() {
+      // var chartDom = document.querySelector('.myEcharts');
+      console.log(this.$refs.myEcharts);
+
+      this.myChart = echarts.init(this.$refs.myEcharts);
+      this.option = {
+
+        legend: {
+          top: 'bottom'
+        },
+        toolbox: {
+          show: true,
+
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: '{b}：{c}条({d}%)'
+        },
+        series: [
+          {
+            name: 'Access From',
+            type: 'pie',
+            radius: '50%',
+            data: this.echartsdata,
+
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
+          }
+        ]
+      };
+
+      this.option && this.myChart.setOption(this.option);
+      this.myChart.on('click', (params) => {
+        // params 包含了事件的数据和图表的信息
+        console.log(params.data.taskStatus);
+        this.formInlineTwo.taskStatus = params.data.taskStatus
+        this.handleQuery()
+        // 可以在这里添加你的逻辑，比如弹窗显示详细信息等
+      });
+
+    },
     // 修改table背景色
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 !== 0) {
@@ -562,4 +702,37 @@ export default {
 ::v-deep .el-dialog {
   margin-top: 20vh !important;
 }
+
+.shuangchongbox {
+  width: 100%;
+  display: flex;
+  position: relative;
+
+  .shuangchongboxleftbox {
+    width: 70%;
+  }
+
+  .shuangchongboxleftboxShow {
+    width: 100%;
+  }
+
+  .myEcharts {
+    width: 30%;
+    // height: 100%;
+
+  }
+}
+
+.shouqiwenzi {
+  position: absolute;
+  top: 10px;
+  right: -30px;
+  width: 100px;
+  font-size: 14px;
+  font-weight: bold;
+  color: #409EFF;
+  cursor: pointer;
+  z-index: 999;
+
+}
 </style>
diff --git a/src/views/components/renwuType/butongguo.vue b/src/views/components/renwuType/butongguo.vue
index 4186e1a..ad55fa2 100644
--- a/src/views/components/renwuType/butongguo.vue
+++ b/src/views/components/renwuType/butongguo.vue
@@ -66,6 +66,7 @@ export default {
           assetId: this.$route.query.assetId,
           xtmc:this.chuandemingcheng,
           btgyy:this.dialogruleForm.btgyy,
+          dwmc:this.$route.query.zcdwmc,
           status: 4,
           type:this.$route.query.type
         }
diff --git a/src/views/components/renwuType/webType1.vue b/src/views/components/renwuType/webType1.vue
index 24e345f..8069fda 100644
--- a/src/views/components/renwuType/webType1.vue
+++ b/src/views/components/renwuType/webType1.vue
@@ -3214,6 +3214,7 @@ export default {
           taskId: this.$route.query.taskId,
           assetId: this.$route.query.assetId,
           xtmc:this.ruleForm.xtmc,
+          dwmc:this.$route.query.zcdwmc,
           status: 3,
           type:this.$route.query.type
         }
diff --git a/src/views/components/renwuType/webType2DW.vue b/src/views/components/renwuType/webType2DW.vue
index 8bfbe23..77891ec 100644
--- a/src/views/components/renwuType/webType2DW.vue
+++ b/src/views/components/renwuType/webType2DW.vue
@@ -6,9 +6,9 @@
       <el-row style="margin: 10px 0;">
         <span class="top-title-box">基本信息</span>
       </el-row>
-      <div class="assets-info-box"   v-loading="loading">
-        <el-form :model="ruleForm" v-if="!loading" :rules="rules" ref="ruleForm" label-width="170px" class="demo-ruleForm"
-          label-position="right" :disabled="disabled">
+      <div class="assets-info-box" v-loading="loading">
+        <el-form :model="ruleForm" v-if="!loading" :rules="rules" ref="ruleForm" label-width="170px"
+          class="demo-ruleForm" label-position="right" :disabled="disabled">
           <el-row>
             <el-col :span="12">
               <el-form-item label="系统名称" required :rules="{
@@ -599,15 +599,15 @@
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
                         <el-form-item prop="fgfzrlxfs" :rules="[
-                            {
+                          {
                             required: true, message: '请输入', trigger: 'blur'
                           },
-                            {
-                              pattern:/^1[3-9]\d{9}$|^0\d{2,3}-\d{7,8}$/,
-                              message: '请输入正确的手机号码',
-                              trigger: 'blur'
-                            }
-                          ]">
+                          {
+                            pattern: /^1[3-9]\d{9}$|^0\d{2,3}-\d{7,8}$/,
+                            message: '请输入正确的手机号码',
+                            trigger: 'blur'
+                          }
+                        ]">
                           <el-input v-model="ruleForm.fgfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -639,17 +639,16 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
-                        <el-form-item prop="bmfzrlxfs"
-                          :rules="[
-                            {
+                        <el-form-item prop="bmfzrlxfs" :rules="[
+                          {
                             required: true, message: '请输入', trigger: 'blur'
                           },
-                            {
-                              pattern: /^1[3-9]\d{9}$|^0\d{2,3}-\d{7,8}$/,
-                              message: '请输入正确的手机号码',
-                              trigger: 'blur'
-                            }
-                          ]">
+                          {
+                            pattern: /^1[3-9]\d{9}$|^0\d{2,3}-\d{7,8}$/,
+                            message: '请输入正确的手机号码',
+                            trigger: 'blur'
+                          }
+                        ]">
                           <el-input v-model="ruleForm.bmfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -680,18 +679,16 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
-                        <el-form-item prop="dylxrlxfs"
-                          :rules="[
-                            {
+                        <el-form-item prop="dylxrlxfs" :rules="[
+                          {
                             required: true, message: '请输入', trigger: 'blur'
                           },
-                            {
-                              pattern: /^1[3-9]\d{9}$|^0\d{2,3}-\d{7,8}$/,
-                              message: '请输入正确的手机号码',
-                              trigger: 'blur'
-                            }
-                          ]"
-                        >
+                          {
+                            pattern: /^1[3-9]\d{9}$|^0\d{2,3}-\d{7,8}$/,
+                            message: '请输入正确的手机号码',
+                            trigger: 'blur'
+                          }
+                        ]">
                           <el-input v-model="ruleForm.dylxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -722,18 +719,16 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
-                        <el-form-item  :prop="'otherConcat.' + index + '.qtlxrlxfs'"
-                          :rules="[
-                            {
+                        <el-form-item :prop="'otherConcat.' + index + '.qtlxrlxfs'" :rules="[
+                          {
                             required: true, message: '请输入', trigger: 'blur'
                           },
-                            {
-                              pattern: /^1[3-9]\d{9}$|^0\d{2,3}-\d{7,8}$/,
-                              message: '请输入正确的手机号码',
-                              trigger: 'blur'
-                            }
-                          ]"
-                        >
+                          {
+                            pattern: /^1[3-9]\d{9}$|^0\d{2,3}-\d{7,8}$/,
+                            message: '请输入正确的手机号码',
+                            trigger: 'blur'
+                          }
+                        ]">
                           <el-input v-model="domain.qtlxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -1229,12 +1224,12 @@
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
                   <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)" :rules="[
-                      {
-                        pattern: /^[a-zA-Z0-9]{18}$/,
-                        message: '请输入正确格式的18位统一社会信用代码',
-                        trigger: 'blur'
-                      }
-                    ]">
+                    {
+                      pattern: /^[a-zA-Z0-9]{18}$/,
+                      message: '请输入正确格式的18位统一社会信用代码',
+                      trigger: 'blur'
+                    }
+                  ]">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1275,12 +1270,12 @@
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
                   <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)" :rules="[
-                      {
-                        pattern: /^[a-zA-Z0-9]{18}$/,
-                        message: '请输入正确格式的18位统一社会信用代码',
-                        trigger: 'blur'
-                      }
-                    ]">
+                    {
+                      pattern: /^[a-zA-Z0-9]{18}$/,
+                      message: '请输入正确格式的18位统一社会信用代码',
+                      trigger: 'blur'
+                    }
+                  ]">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1321,12 +1316,12 @@
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
                   <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)" :rules="[
-                      {
-                        pattern: /^[a-zA-Z0-9]{18}$/,
-                        message: '请输入正确格式的18位统一社会信用代码',
-                        trigger: 'blur'
-                      }
-                    ]">
+                    {
+                      pattern: /^[a-zA-Z0-9]{18}$/,
+                      message: '请输入正确格式的18位统一社会信用代码',
+                      trigger: 'blur'
+                    }
+                  ]">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1366,13 +1361,13 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)"  :rules="[
-                      {
-                        pattern: /^[a-zA-Z0-9]{18}$/,
-                        message: '请输入正确格式的18位统一社会信用代码',
-                        trigger: 'blur'
-                      }
-                    ]">
+                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)" :rules="[
+                    {
+                      pattern: /^[a-zA-Z0-9]{18}$/,
+                      message: '请输入正确格式的18位统一社会信用代码',
+                      trigger: 'blur'
+                    }
+                  ]">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1415,12 +1410,12 @@
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
                   <el-form-item class="daoqitixingren" :prop="`xtjsUnit[${index}].tyshxydm`" :rules="[
-                    {required: true, message: '请输入', trigger: 'blur'},
+                    { required: true, message: '请输入', trigger: 'blur' },
                     {
-                        pattern: /^[a-zA-Z0-9]{18}$/,
-                        message: '请输入正确格式的18位统一社会信用代码',
-                        trigger: 'blur'
-                      }
+                      pattern: /^[a-zA-Z0-9]{18}$/,
+                      message: '请输入正确格式的18位统一社会信用代码',
+                      trigger: 'blur'
+                    }
                   ]" required :label="'统一社会信用代码' + (index == 0 ? '' : index)">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
@@ -1443,8 +1438,8 @@
                         trigger: 'blur'
                       },
                       {
-                    required: true, message: '请输入', trigger: 'blur'
-                  }
+                        required: true, message: '请输入', trigger: 'blur'
+                      }
                     ]">
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
@@ -1487,16 +1482,14 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" required :prop="`xtyyUnit[${index}].tyshxydm`"
-                  :rules="[
-                    {required: true, message: '请输入', trigger: 'blur'},
+                  <el-form-item class="daoqitixingren" required :prop="`xtyyUnit[${index}].tyshxydm`" :rules="[
+                    { required: true, message: '请输入', trigger: 'blur' },
                     {
-                        pattern: /^[a-zA-Z0-9]{18}$/,
-                        message: '请输入正确格式的18位统一社会信用代码',
-                        trigger: 'blur'
-                      }
-                  ]"
-                  :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                      pattern: /^[a-zA-Z0-9]{18}$/,
+                      message: '请输入正确格式的18位统一社会信用代码',
+                      trigger: 'blur'
+                    }
+                  ]" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1512,14 +1505,14 @@
                 <el-col :span="12" style="margin-left: 10px;">
                   <el-form-item class="daoqitixingren" required :label="'联系电话' + (index == 0 ? '' : index)"
                     :prop="'xtyyUnit.' + index + '.lxdh'" :rules="[
-                     {
+                      {
                         pattern: /^1[3-9]\d{9}$|^0\d{2,3}-\d{7,8}$/,
                         message: '请输入正确的手机号码',
                         trigger: 'blur'
                       },
                       {
-                    required: true, message: '请输入', trigger: 'blur'
-                  }
+                        required: true, message: '请输入', trigger: 'blur'
+                      }
                     ]">
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
@@ -1562,10 +1555,10 @@
                 <el-col :span="12" style="margin-left: 10px;">
                   <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)" :rules="[
                     {
-                        pattern: /^[a-zA-Z0-9]{18}$/,
-                        message: '请输入正确格式的18位统一社会信用代码',
-                        trigger: 'blur'
-                      }
+                      pattern: /^[a-zA-Z0-9]{18}$/,
+                      message: '请输入正确格式的18位统一社会信用代码',
+                      trigger: 'blur'
+                    }
                   ]">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
@@ -1605,7 +1598,7 @@
             <el-row style="margin: 10px 0;">
               <span class="top-title-two-box">服务器信息</span>
             </el-row>
-            <div v-for="(domain, index) in ruleForm.fwqxx" :key="domain.key" >
+            <div v-for="(domain, index) in ruleForm.fwqxx" :key="domain.key">
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item class="daoqitixingren" required :prop="`fwqxx[${index}].sblx`" :rules="{
@@ -1734,25 +1727,25 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" required  :label="'设备IP' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" required :label="'设备IP' + (index == 0 ? '' : index)">
                     <el-row style="display: flex;">
                       <el-col :span="8">
                         <el-form-item :prop="`wlsb[${index}].ipType`" :rules="{
-                    required: true, message: '请输入', trigger: 'change'
-                  }">
-                        <el-select v-model="domain.ipType" placeholder="请选择设备IP">
-                          <el-option v-for="dict in dict.type.sb_ip" :key="dict.value" :label="dict.label"
-                            :value="dict.label" />
-                        </el-select>
-                      </el-form-item>
+                          required: true, message: '请输入', trigger: 'change'
+                        }">
+                          <el-select v-model="domain.ipType" placeholder="请选择设备IP">
+                            <el-option v-for="dict in dict.type.sb_ip" :key="dict.value" :label="dict.label"
+                              :value="dict.label" />
+                          </el-select>
+                        </el-form-item>
                       </el-col>
                       <el-col :span="16" style="margin-left: 10px;">
                         <el-form-item :prop="`wlsb[${index}].sbIp`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                          required: true, message: '请输入', trigger: 'blur'
+                        }">
 
-                        <el-input v-model="domain.sbIp" placeholder="请输入"></el-input>
-                      </el-form-item>
+                          <el-input v-model="domain.sbIp" placeholder="请输入"></el-input>
+                        </el-form-item>
 
                       </el-col>
                     </el-row>
@@ -1833,20 +1826,20 @@
                     <el-row style="display: flex;">
                       <el-col :span="8">
                         <el-form-item :prop="`aqsb[${index}].ipType`" :rules="{
-                    required: true, message: '请输入', trigger: 'change'
-                  }">
-                        <el-select v-model="domain.ipType"  placeholder="请选择设备IP">
-                          <el-option v-for="dict in dict.type.sb_ip" :key="dict.value" :label="dict.label"
-                            :value="dict.label" />
-                        </el-select>
-                      </el-form-item>
+                          required: true, message: '请输入', trigger: 'change'
+                        }">
+                          <el-select v-model="domain.ipType" placeholder="请选择设备IP">
+                            <el-option v-for="dict in dict.type.sb_ip" :key="dict.value" :label="dict.label"
+                              :value="dict.label" />
+                          </el-select>
+                        </el-form-item>
                       </el-col>
                       <el-col :span="16" style="margin-left: 10px;">
                         <el-form-item :prop="`aqsb[${index}].sbIp`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
-                        <el-input v-model="domain.sbIp" placeholder="请输入"></el-input>
-                      </el-form-item>
+                          required: true, message: '请输入', trigger: 'blur'
+                        }">
+                          <el-input v-model="domain.sbIp" placeholder="请输入"></el-input>
+                        </el-form-item>
                       </el-col>
                     </el-row>
                   </el-form-item>
@@ -1854,7 +1847,7 @@
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
-                  <el-form-item class="daoqitixingren" required  :prop="`aqsb[${index}].yjxh`" :rules="{
+                  <el-form-item class="daoqitixingren" required :prop="`aqsb[${index}].yjxh`" :rules="{
                     required: true, message: '请输入', trigger: 'blur'
                   }" :label="'硬件型号' + (index == 0 ? '' : index)">
                     <el-input v-model="domain.yjxh" placeholder="请输入硬件型号"></el-input>
@@ -2500,15 +2493,15 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="数据库名称" required :prop="`sjzcSjkmc`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-input v-model="ruleForm.sjzcSjkmc" placeholder="请输入数据库名称"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据库类型" required :prop="`sjzcSjklx`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
                 </el-form-item>
               </el-col>
@@ -2516,15 +2509,15 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="端口" required :prop="`sjzcDk`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-input v-model="ruleForm.sjzcDk" placeholder="请输入端口"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据库版本" required :prop="`sjzcSjkbb`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-input v-model="ruleForm.sjzcSjkbb" placeholder="请输入数据库版本"></el-input>
                 </el-form-item>
               </el-col>
@@ -2532,15 +2525,15 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="数据库所在IP" required :prop="`sjzcSjkIp`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-input v-model="ruleForm.sjzcSjkIp" placeholder="请输入数据库所在IP"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="共享属性" required :prop="`sjzcGxsx`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-select v-model="ruleForm.sjzcGxsx" placeholder="请选择共享属性">
                     <el-option v-for="dict in dict.type.sjzc_gxsx" :key="dict.value" :label="dict.label"
                       :value="dict.value" />
@@ -2551,8 +2544,8 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="开放属性" required :prop="`sjzcKfsx`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-select v-model="ruleForm.sjzcKfsx" placeholder="请选择开放属性">
                     <el-option v-for="dict in dict.type.sjzc_kfsx" :key="dict.value" :label="dict.label"
                       :value="dict.value" />
@@ -2561,8 +2554,8 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据领域" required :prop="`sjzcSjly`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-select v-model="ruleForm.sjzcSjly" placeholder="请选择数据领域">
                     <el-option v-for="dict in dict.type.sjzc_sjly" :key="dict.value" :label="dict.label"
                       :value="dict.value" />
@@ -2573,8 +2566,8 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="更新周期" required :prop="`sjzcGxzq`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-select v-model="ruleForm.sjzcGxzq" placeholder="请选择数据领域">
                     <el-option v-for="dict in dict.type.sjzc_gxzq" :key="dict.value" :label="dict.label"
                       :value="dict.value" />
@@ -2583,8 +2576,8 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据类型" required :prop="`sjzcSjlx`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <!-- <el-select v-model="ruleForm.region" placeholder="请选择数据类型">
                     <el-option
                       v-for="dict in dict.type.sjzc_gxzq"
@@ -2600,15 +2593,15 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="数据量" required :prop="`sjzcSjl`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-input v-model="ruleForm.sjzcSjl" placeholder="请输入数据量"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="是否涉密数据" required :prop="`sjzcSmsj`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-select v-model="ruleForm.sjzcSmsj" placeholder="请选择是否涉密数据">
                     <el-option v-for="dict in dict.type.is_no" :key="dict.value" :label="dict.label"
                       :value="dict.value" />
@@ -2619,8 +2612,8 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="数据是否出境" required :prop="`sjzcCj`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-select v-model="ruleForm.sjzcCj" placeholder="请选择数据是否出境">
                     <el-option v-for="dict in dict.type.is_no" :key="dict.value" :label="dict.label"
                       :value="dict.value" />
@@ -2629,8 +2622,8 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据分级分类" required :prop="`sjzcSjfjfl`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-select v-model="ruleForm.sjzcSjfjfl" placeholder="请选择数据分级分类">
                     <el-option v-for="dict in dict.type.sjzc_sjfjfl" :key="dict.value" :label="dict.label"
                       :value="dict.value" />
@@ -2641,8 +2634,8 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="数据重要程度" required :prop="`sjzcSjzycd`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }">
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
                   <el-select v-model="ruleForm.sjzcSjzycd" placeholder="请选择数据重要程度">
                     <el-option v-for="dict in dict.type.zc_xtzyx" :key="dict.value" :label="dict.label"
                       :value="dict.value" />
@@ -2660,37 +2653,47 @@
             </el-row>
             <!-- 业务系统拓扑图 -->
             <el-row style="margin: 10px 0;">
-              <span class="top-title-box">业务系统拓扑图</span>
+              <span class="top-title-box">
+                <span style="color:#ff4949;font-size: 16px">*</span>
+                 业务系统拓扑图
+                 <span style="color:#ff4949;font-size: 13px;font-weight: 400;margin-left:10px">提示：附件/图片请至少选择一项</span>
+                 
+                </span>
             </el-row>
-            <el-row style="margin: 20px 0;">
-              <el-form-item  prop="ywxttpwj" label="附件上传">
-                <myUpload :fileSize="30" :limit="1" :fileType="accept" v-model="ruleForm.ywxttpwj">
-                  <div class="upload-file">
-                    <i class="el-icon-paperclip"></i>
-                    <span>支持xls、xlsx、doc、docx、pdf、rar、zip、pcap、txt、最多上传1个文件，每个不超过30M</span>
-                  </div>
-                </myUpload>
-              </el-form-item>
+            <span class="guanbixinghao">
+              <el-row style="margin: 20px 0;">
+                
+
+                <el-form-item :required="false" prop="ywxttpwj" label="附件上传">
+                  <myUpload :fileSize="30" :limit="1" :fileType="accept" v-model="ruleForm.ywxttpwj">
+                    <div class="upload-file">
+                      <i class="el-icon-paperclip"></i>
+                      <span>支持xls、xlsx、doc、docx、pdf、rar、zip、pcap、txt、最多上传1个文件，每个不超过30M</span>
+                    </div>
+                  </myUpload>
+                </el-form-item>
+              </el-row>
+              <el-row style="margin: 20px 0;">
+                <el-form-item :required="false" prop="ywxttpt" label="图片上传">
+                  <myUpload :fileSize="30" :limit="1" :fileType="acceptTwo" v-model="ruleForm.ywxttpt">
+                    <div class="upload-file">
+                      <i class="el-icon-paperclip"></i>
+                      <span>支持jpg、jpeg、png、最多上传1张图片，每个不超过30M</span>
+                    </div>
+                  </myUpload>
+                </el-form-item>
+              </el-row>
+            </span>
+            <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
+              <span class="top-title-box">关停原因</span>
             </el-row>
             <el-row style="margin: 20px 0;">
-              <el-form-item  prop="ywxttpt" label="图片上传">
-                <myUpload :fileSize="30" :limit="1" :fileType="acceptTwo" v-model="ruleForm.ywxttpt">
-                  <div class="upload-file">
-                    <i class="el-icon-paperclip"></i>
-                    <span>支持jpg、jpeg、png、最多上传1张图片，每个不超过30M</span>
-                  </div>
-                </myUpload>
+              <el-form-item>
+                <div>{{ ruleForm.bfyy }}</div>
               </el-form-item>
             </el-row>
-            <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
-       <span class="top-title-box">关停原因</span>
-      </el-row>
-      <el-row style="margin: 20px 0;">
-       <el-form-item>
-        <div>{{ruleForm.bfyy}}</div>
-       </el-form-item>
-      </el-row>
-            <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="$route.query.pageType == 'change'">
+            <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+              v-if="$route.query.pageType == 'change'">
               <el-button type="danger" @click="newAssets(0)">关停</el-button>
               <el-button @click="newAssets(1)">取消</el-button>
               <el-button type="warning" @click="newAssets(2)">暂存</el-button>
@@ -2699,21 +2702,21 @@
           </div>
         </el-form>
       </div>
-      <my-dialog title="提示" ref="liebiaoDialog"  @close="importClose" class="taskDialogBox" width="40%">
-      <el-row>
-        <el-col :span="21">
-          <el-form :model="dialogruleForm" :rules="dialogruleFormrules" ref="dialogruleForm" label-width="100px">
-            <el-form-item label="关停原因:" prop="bfyy">
-              <el-input v-model="dialogruleForm.bfyy" placeholder="请输入关停原因"></el-input>
-            </el-form-item>
-            <el-form-item class="newTask-form-item">
-              <el-button @click="resetForm('dialogruleForm')">取消</el-button>
-              <el-button type="primary" @click="submitForm('dialogruleForm')">确定</el-button>
-            </el-form-item>
-          </el-form>
-        </el-col>
-        <el-col :span="6"></el-col>
-      </el-row>
+      <my-dialog title="提示" ref="liebiaoDialog" @close="importClose" class="taskDialogBox" width="40%">
+        <el-row>
+          <el-col :span="21">
+            <el-form :model="dialogruleForm" :rules="dialogruleFormrules" ref="dialogruleForm" label-width="100px">
+              <el-form-item label="关停原因:" prop="bfyy">
+                <el-input v-model="dialogruleForm.bfyy" placeholder="请输入关停原因"></el-input>
+              </el-form-item>
+              <el-form-item class="newTask-form-item">
+                <el-button @click="resetForm('dialogruleForm')">取消</el-button>
+                <el-button type="primary" @click="submitForm('dialogruleForm')">确定</el-button>
+              </el-form-item>
+            </el-form>
+          </el-col>
+          <el-col :span="6"></el-col>
+        </el-row>
       </my-dialog>
     </div>
 
@@ -2739,13 +2742,13 @@ export default {
     'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls'
   ],
   components: {
-    myUpload,myDialog
+    myUpload, myDialog
   },
   data() {
-      //表单校验
-var validateName = (rule, value, callback) => {
+    //表单校验
+    var validateName = (rule, value, callback) => {
       if (!this.ruleForm.ywxttpwj && !this.ruleForm.ywxttpt) {
-        
+
         callback(new Error("附件，图片请任意上传一项"))
       } else {
         //任意值被填写，清除验证提示
@@ -2880,43 +2883,43 @@ var validateName = (rule, value, callback) => {
           },
 
         ],
-         // 网络设备
+        // 网络设备
 
 
-         wlsb: [
-            {
-              sblx: "",
-              pp: "",
-              ipType: "",
-              sbIP: "",
-              czxx: "",
-              czxxbb: "",
-              yjxh: "",
-              yjxlh: "",
-              yjbbxx: "",
-              yjyt: "",
-              yjbswz: "",
-              type: 2,
-            }
-          ],
+        wlsb: [
+          {
+            sblx: "",
+            pp: "",
+            ipType: "",
+            sbIP: "",
+            czxx: "",
+            czxxbb: "",
+            yjxh: "",
+            yjxlh: "",
+            yjbbxx: "",
+            yjyt: "",
+            yjbswz: "",
+            type: 2,
+          }
+        ],
 
-      // 安全设备
-      aqsb: [
-        {
-          sblx: "",
-          pp: "",
-          ipType: "",
-          sbIP: "",
-          czxx: "",
-          czxxbb: "",
-          yjxh: "",
-          yjxlh: "",
-          yjbbxx: "",
-          yjyt: "",
-          yjbswz: "",
-          type: 3,
-        }
-      ],
+        // 安全设备
+        aqsb: [
+          {
+            sblx: "",
+            pp: "",
+            ipType: "",
+            sbIP: "",
+            czxx: "",
+            czxxbb: "",
+            yjxh: "",
+            yjxlh: "",
+            yjbbxx: "",
+            yjyt: "",
+            yjbswz: "",
+            type: 3,
+          }
+        ],
       },
       // 地理位置
       dlwz: [],
@@ -2930,10 +2933,10 @@ var validateName = (rule, value, callback) => {
       xtfhqkFzd: [],
       // 防勒索
       xtfhqkFls: [],
-      dialogruleForm:{
-        bfyy:""
+      dialogruleForm: {
+        bfyy: ""
       },
-      dialogruleFormrules:{
+      dialogruleFormrules: {
         bfyy: [
           { required: true, message: '请输入', trigger: 'blur' },
         ],
@@ -2953,7 +2956,7 @@ var validateName = (rule, value, callback) => {
             trigger: "change",
           },
         ],
-        },
+      },
       disabled: false,
       loading: false,
     }
@@ -2968,7 +2971,7 @@ var validateName = (rule, value, callback) => {
       this.getInfo(obj)
       this.disabled = true;
       this.isMore = true;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         const inputElements = document.querySelectorAll('.el-input__inner');
         const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
         inputElements.forEach((input) => {
@@ -2985,11 +2988,11 @@ var validateName = (rule, value, callback) => {
     }
   },
   methods: {
-    importClose(){},
-     // 关闭新增弹窗
-     resetForm() {
+    importClose() { },
+    // 关闭新增弹窗
+    resetForm() {
       this.dialogruleForm = {
-        bfyy:""
+        bfyy: ""
       }
       this.$refs.liebiaoDialog.close()
 
@@ -3005,7 +3008,7 @@ var validateName = (rule, value, callback) => {
               type: 'info',
               message: '已关停'
             });
-        this.loading = false
+            this.loading = false
 
             this.$router.go(-1);
             this.ruleForm.bfyy = ""
@@ -3027,7 +3030,7 @@ var validateName = (rule, value, callback) => {
           this.ruleForm.xjgywxt = {}
           this.$set(this.ruleForm.xjgywxt, 'remark', "")
         }
-        if(this.ruleForm.fwwz) {
+        if (this.ruleForm.fwwz) {
           let arr = this.ruleForm.fwwz.split("-")
           this.select = arr[0]
           this.ruleForm.fwwz = arr[1]
@@ -3080,7 +3083,7 @@ var validateName = (rule, value, callback) => {
         } else if (this.ruleForm.sheng) {
           this.dlwz = [this.ruleForm.sheng]
         }
-      this.loading = false
+        this.loading = false
 
       })
     },
@@ -3210,7 +3213,7 @@ var validateName = (rule, value, callback) => {
     // 新增资产确认按钮
     newAssets(type) {
       if (type == 1) {
-      this.loading = true
+        this.loading = true
 
         //取消
         this.$router.go(-1);
@@ -3218,8 +3221,8 @@ var validateName = (rule, value, callback) => {
         return
       }
 
-      this.ruleForm.taskId= this.$route.query.taskId
-      this.ruleForm.assetId= this.$route.query.assetId
+      this.ruleForm.taskId = this.$route.query.taskId
+      this.ruleForm.assetId = this.$route.query.assetId
 
 
       this.ruleForm.xttz = this.xttz.join(',');
@@ -3234,46 +3237,46 @@ var validateName = (rule, value, callback) => {
         this.ruleForm.shi = this.dlwz[1]
         this.ruleForm.qu = this.dlwz[2]
       }
-      if(this.ruleForm.fwwz) {
+      if (this.ruleForm.fwwz) {
         this.ruleForm.fwwz = this.select + "-" + this.ruleForm.fwwz
       }
       if (type == 0) {
-      this.$refs.liebiaoDialog.open()
+        this.$refs.liebiaoDialog.open()
 
       }
 
       if (type == 2) {
-      this.loading = true
+        this.loading = true
 
         //暂存
         assetTaskzc(this.ruleForm).then(res => {
           console.log(res, "res");
           this.$modal.msgSuccess("修改成功");
           this.$router.go(-1);
-        this.loading = false
+          this.loading = false
 
         })
       }
       if (type == 3) {
-      this.loading = true
+        this.loading = true
 
         //提交
         this.$refs['ruleForm'].validate((valid) => {
           if (valid) {
             assetTaskjyTj(this.ruleForm).then(res => {
-          console.log(res, "res");
-          this.$modal.msgSuccess("提交成功");
-          this.$router.go(-1);
-        this.loading = false
+              console.log(res, "res");
+              this.$modal.msgSuccess("提交成功");
+              this.$router.go(-1);
+              this.loading = false
 
-        })
+            })
           } else {
-        this.loading = false
+            this.loading = false
 
             this.$message({
-            type: 'info',
-            message: '请填写完整'
-          });
+              type: 'info',
+              message: '请填写完整'
+            });
             return false;
           }
         });
@@ -3296,3 +3299,8 @@ var validateName = (rule, value, callback) => {
   },
 }
 </script>
+<style scoped lang="scss">
+::v-deep .guanbixinghao .el-form-item.is-required .el-form-item__label:before {
+  content: '' !important;
+}
+</style>
diff --git a/src/views/unitPages/myTask/index.vue b/src/views/unitPages/myTask/index.vue
index 04aa22b..2d9ce93 100644
--- a/src/views/unitPages/myTask/index.vue
+++ b/src/views/unitPages/myTask/index.vue
@@ -18,6 +18,8 @@
           <el-col :span="7">
             <el-form-item label="任务状态：">
               <el-select v-model="formInline.taskStatus" placeholder="请选择">
+                <el-option label="关闭" value="0">
+                </el-option>
                 <el-option label="进行中" value="1">
                 </el-option>
                 <el-option label="正常完成" value="2">
@@ -54,6 +56,9 @@
           <el-table-column label="任务状态" key="taskStatus" width="200px" prop="taskStatus" class-name="table-status"
             align="center">
             <template slot-scope="scope">
+              <span v-if="scope.row.taskStatus == 0" style="color: #F56C6C;">
+                已关闭
+              </span>
               <span v-if="scope.row.taskStatus == 1" style="color: #E6A23C;">
                 进行中
               </span>
@@ -80,7 +85,7 @@
                     style="color: #1485EF;cursor: pointer;">查看</span>
                 </div>
                 <!-- v-if="scope.row.taskStatus == 1" -->
-                <div  style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="delInfo(scope.row)" v-if="scope.row.taskStatus == 1">
+                <div  style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="delInfo(scope.row)" v-if="scope.row.taskStatus == 1&& scope.row.taskStatus != 0">
                   <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="del-info"
                     style="color: #1485EF;cursor: pointer;">开始核查</span>
diff --git a/src/views/unitPages/myTask/info.vue b/src/views/unitPages/myTask/info.vue
index 972106c..d56fce5 100644
--- a/src/views/unitPages/myTask/info.vue
+++ b/src/views/unitPages/myTask/info.vue
@@ -36,7 +36,7 @@
         <div class="info-bottom-box">
           <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" v-if="index == 1">
             <el-row>
-              <el-col :span="8">
+              <el-col :span="7">
                 <el-form-item label="核查单位:">
                   <el-input v-model="formInline.dwmc" placeholder="请输入"></el-input>
                 </el-form-item>
@@ -50,7 +50,7 @@
                   </el-select>
                 </el-form-item>
               </el-col> -->
-              <el-col :span="9">
+              <el-col :span="7">
                 <el-form-item label="审核状态:">
                   <el-select v-model="formInline.status" placeholder="请选择">
                     <el-option label="未核查" value="0">