From 5a6aa4b4a0b31b87d8a59d02d85f248da13cf486 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 19 Nov 2024 17:02:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auditPagesApi/index.js                |  26 ++
 .../assetsManagement/assetsAuth.vue           | 208 ++++++++-------
 .../auditPages/assetsManagement/index.vue     | 251 ++++++------------
 .../auditPages/taskManagement/auditList.vue   |   1 -
 src/views/auditPages/taskManagement/index.vue |   8 +-
 src/views/auditPages/unitManagement/index.vue | 139 ++++++++--
 src/views/system/user/index.vue               |  14 +-
 src/views/unitPages/myAssets/index.vue        |  12 +-
 src/views/unitPages/myTask/auditList.vue      |  13 +-
 src/views/unitPages/myTask/index.vue          |  16 +-
 src/views/unitPages/myTask/info.vue           |   5 +-
 11 files changed, 377 insertions(+), 316 deletions(-)

diff --git a/src/api/auditPagesApi/index.js b/src/api/auditPagesApi/index.js
index f9de158..2158f52 100644
--- a/src/api/auditPagesApi/index.js
+++ b/src/api/auditPagesApi/index.js
@@ -24,10 +24,36 @@ export function delUnit(unitId) {
     method: 'delete'
   })
 }
+
 // 单位详情
 export function lookUnit(unitId) {
   return request({
     url: '/tc/unit/' + unitId,
     method: 'get'
   })
+}
+
+// 查询/新增/修改 资产列表
+export function assetUnit(method,query) {
+  return request({
+    url: '/tc/assetCurrent',
+    method: method,
+    params: query
+  })
+}
+// 查询详情
+export function assetInfo(id) {
+  return request({
+    url: '/tc/assetCurrent/' + id,
+    method: 'get',
+  })
+}
+
+// 删除资产
+export function deleteAssetInfo(id) {
+  return request({
+    url: '/tc/assetCurrent/' + id,
+    method: 'delete',
+
+  })
 }
\ No newline at end of file
diff --git a/src/views/auditPages/assetsManagement/assetsAuth.vue b/src/views/auditPages/assetsManagement/assetsAuth.vue
index cfdda1f..122da7f 100644
--- a/src/views/auditPages/assetsManagement/assetsAuth.vue
+++ b/src/views/auditPages/assetsManagement/assetsAuth.vue
@@ -5,7 +5,7 @@
         <span class="top-title-box">基本信息</span>
       </el-row>
       <div class="assets-info-box">
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="170px" class="demo-ruleForm" label-position="right" disabled>
+        <el-form :model="ruleForm" :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="系统名称">
@@ -58,13 +58,13 @@
                 <el-row>
                   <el-col :span="19">
                     <el-form-item prop="name">
-                      <el-input v-model="ruleForm.ip_address" style="width: 100%;" placeholder="请输入IP地址"></el-input>
+                      <el-input v-model="ruleForm.ipAddress" style="width: 100%;" placeholder="请输入IP地址"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col class="line" :span="1">:</el-col>
                   <el-col :span="4">
                     <el-form-item prop="name">
-                      <el-input v-model="ruleForm.ip_port" style="width: 100%;" placeholder="端口号"></el-input>
+                      <el-input v-model="ruleForm.ipPort" style="width: 100%;" placeholder="端口号"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -1698,12 +1698,12 @@
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="云平台服务商">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入云平台服务商"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.yptFws" style="width: 100%;" placeholder="请输入云平台服务商"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="是否租户级安全">
-                    <el-select v-model="ruleForm.region" placeholder="请选择是否租户级安全">
+                    <el-select v-model="ruleForm.xjgywxt.yptSfzh" placeholder="请选择是否租户级安全">
                       <el-option
                         v-for="dict in dict.type.is_no"
                         :key="dict.value"
@@ -1715,43 +1715,43 @@
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="云平台类型">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入备案网站首页"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.yptLx" style="width: 100%;" placeholder="请输入备案网站首页"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="硬件资源大小">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入硬件资源大小">
+                    <el-input v-model="ruleForm.xjgywxt.yptYjzydx" style="width: 100%;" placeholder="请输入硬件资源大小">
                       <template slot="append">支持G\TB\PB</template>
                     </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="平台架构">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入平台架构"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.yptPtjg" style="width: 100%;" placeholder="请输入平台架构"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="互联网IP段">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入互联网IP段"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.yptIp" style="width: 100%;" placeholder="请输入互联网IP段"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="机房联系人">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入机房联系人"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.yptJflxr" style="width: 100%;" placeholder="请输入机房联系人"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="机房联系人电话">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入机房联系人电话"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.yptJflxrdh" style="width: 100%;" placeholder="请输入机房联系人电话"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="服务器设备类型">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入服务器设备类型"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.yptFwqsblx" style="width: 100%;" placeholder="请输入服务器设备类型"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -1764,17 +1764,17 @@
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="平台服务商">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入平台服务商"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.dsjPtfws" style="width: 100%;" placeholder="请输入平台服务商"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="敏感数据类型">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入敏感数据类型"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.dsjMgsjlx" style="width: 100%;" placeholder="请输入敏感数据类型"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="硬件资源">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入硬件资源">
+                    <el-input v-model="ruleForm.xjgywxt.dsjYjzy" style="width: 100%;" placeholder="请输入硬件资源">
                       <template slot="append">支持G\TB\PB</template>
                     </el-input>
                   </el-form-item>
@@ -1783,26 +1783,26 @@
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="系统数据量">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入系统数据量">
+                    <el-input v-model="ruleForm.xjgywxt.dsjXtsjl" style="width: 100%;" placeholder="请输入系统数据量">
                       <template slot="append">支持G\TB\PB</template>
                     </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="机房联系人">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入机房联系人"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.dsjJflxr" style="width: 100%;" placeholder="请输入机房联系人"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="机房联系人电话">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入机房联系人电话"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.dsjJflxrdh" style="width: 100%;" placeholder="请输入机房联系人电话"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="是否数据审计">
-                    <el-select v-model="ruleForm.region" placeholder="请选择是否数据审计">
+                    <el-select v-model="ruleForm.xjgywxt.dsjSfsjsj" placeholder="请选择是否数据审计">
                       <el-option
                         v-for="dict in dict.type.is_no"
                         :key="dict.value"
@@ -1822,17 +1822,17 @@
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="系统集成商名称">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入系统集成商名称"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.wlwsbXtjcs" style="width: 100%;" placeholder="请输入系统集成商名称"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="用户数量">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入用户数量"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.wlwsbYhsl" style="width: 100%;" placeholder="请输入用户数量"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="服务对象">
-                    <el-select v-model="ruleForm.region" placeholder="请选择服务对象">
+                    <el-select v-model="ruleForm.xjgywxt.wlwsbFwdx" placeholder="请选择服务对象">
                       <el-option
                         v-for="dict in dict.type.wlw_fwdx"
                         :key="dict.value"
@@ -1846,12 +1846,12 @@
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="终端数量">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入终端数量"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.wlwsbZdsl" style="width: 100%;" placeholder="请输入终端数量"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="网络互连情况">
-                    <el-select v-model="ruleForm.region" placeholder="请选择网络互连情况">
+                    <el-select v-model="ruleForm.xjgywxt.wlwsbWlhlqk" placeholder="请选择网络互连情况">
                       <el-option
                         v-for="dict in dict.type.wlw_wlhlqk"
                         :key="dict.value"
@@ -1863,14 +1863,14 @@
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="联系人">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入联系人"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.wlwsbLxr" style="width: 100%;" placeholder="请输入联系人"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="服务范围">
-                    <el-select v-model="ruleForm.region" placeholder="请选择服务范围">
+                    <el-select v-model="ruleForm.xjgywxt.wlwsbFwfw" placeholder="请选择服务范围">
                       <el-option
                         v-for="dict in dict.type.wlw_fwfw"
                         :key="dict.value"
@@ -1882,12 +1882,12 @@
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="联系人电话">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入联系人电话"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.wlwsbLxrdh" style="width: 100%;" placeholder="请输入联系人电话"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="服务内容">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入服务内容"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.wlwsbFwnr" style="width: 100%;" placeholder="请输入服务内容"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -1898,46 +1898,46 @@
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="摄像头品牌">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入摄像头品牌"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.sxtPp" style="width: 100%;" placeholder="请输入摄像头品牌"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="位置">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入位置"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.sxtWz" style="width: 100%;" placeholder="请输入位置"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="摄像头IP">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入摄像头IP"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.sxtIp" style="width: 100%;" placeholder="请输入摄像头IP"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="区域">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入区域"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.sxtQy" style="width: 100%;" placeholder="请输入区域"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="摄像头数量">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入摄像头数量"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.sxtSl" style="width: 100%;" placeholder="请输入摄像头数量"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="端口">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入端口"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.sxtDk" style="width: 100%;" placeholder="请输入端口"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="设备型号">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入设备型号"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.sxtSbxh" style="width: 100%;" placeholder="请输入设备型号"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="固定版本">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入固定版本"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.sxtGdbb" style="width: 100%;" placeholder="请输入固定版本"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -1950,41 +1950,41 @@
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="移动APP系统">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入移动APP系统"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.appXt" style="width: 100%;" placeholder="请输入移动APP系统"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="服务端域名">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入服务端域名"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.appYm" style="width: 100%;" placeholder="请输入服务端域名"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="移动APP渠道">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入移动APP渠道"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.appQd" style="width: 100%;" placeholder="请输入移动APP渠道"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="服务端IP">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入服务端IP"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.appIp" style="width: 100%;" placeholder="请输入服务端IP"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="联系人">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入联系人"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.appLxr" style="width: 100%;" placeholder="请输入联系人"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="联系人电话">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入联系人电话"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.appLxrdh" style="width: 100%;" placeholder="请输入联系人电话"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="是否有身份认证">
-                    <el-select v-model="ruleForm.region" placeholder="请选择是否有身份认证">
+                    <el-select v-model="ruleForm.xjgywxt.appSfysfrz" placeholder="请选择是否有身份认证">
                       <el-option
                         v-for="dict in dict.type.is_no"
                         :key="dict.value"
@@ -2004,13 +2004,13 @@
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="系统集成商名称">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入系统集成商名称"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.gykzJcs" style="width: 100%;" placeholder="请输入系统集成商名称"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="运行时间">
                     <el-date-picker
-                      v-model="ruleForm.name"
+                      v-model="ruleForm.xjgywxt.gykzYxsj"
                       type="date"
                       format="yyyy-MM-dd"
                       value-format="yyyy-MM-dd"
@@ -2020,7 +2020,7 @@
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="服务对象">
-                    <el-select v-model="ruleForm.region" placeholder="请选择服务对象">
+                    <el-select v-model="ruleForm.xjgywxt.gykzFwdx" placeholder="请选择服务对象">
                       <el-option
                         v-for="dict in dict.type.wlw_fwdx"
                         :key="dict.value"
@@ -2034,12 +2034,12 @@
               <el-row style="display: flex;">
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="集成商国内外情况">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入集成商国内外情况"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.gykzJcsqk" style="width: 100%;" placeholder="请输入集成商国内外情况"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="网络互联情况">
-                    <el-select v-model="ruleForm.region" placeholder="请选择网络互联情况">
+                    <el-select v-model="ruleForm.xjgywxt.gykzWlhxqk" placeholder="请选择网络互联情况">
                       <el-option
                         v-for="dict in dict.type.wlw_wlhlqk"
                         :key="dict.value"
@@ -2051,14 +2051,14 @@
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="联系人">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入联系人"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.gykzLxr" style="width: 100%;" placeholder="请输入联系人"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="服务范围">
-                    <el-select v-model="ruleForm.region" placeholder="请选择服务范围">
+                    <el-select v-model="ruleForm.xjgywxt.gykzFwfw" placeholder="请选择服务范围">
                       <el-option
                         v-for="dict in dict.type.wlw_fwfw"
                         :key="dict.value"
@@ -2070,53 +2070,53 @@
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="联系人电话">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入联系人电话"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.gykzLxrdh" style="width: 100%;" placeholder="请输入联系人电话"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="设备名称">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入设备名称"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.gykzSbmc" style="width: 100%;" placeholder="请输入设备名称"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="设备品牌">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入设备品牌"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.gykzSbpp" style="width: 100%;" placeholder="请输入设备品牌"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="设备类别">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入设备类别"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.gykzSblb" style="width: 100%;" placeholder="请输入设备类别"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="运营商">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入运营商"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.gykzYys" style="width: 100%;" placeholder="请输入运营商"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="互联网IP">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入互联网IP"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.gykzHlwIp" style="width: 100%;" placeholder="请输入互联网IP"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="网络层级">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入网络层级"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.gykzWlcj" style="width: 100%;" placeholder="请输入网络层级"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="控制台IP">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入控制台IP"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.gykzKztIp" style="width: 100%;" placeholder="请输入控制台IP"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="描述">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入描述"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.gykzMs" style="width: 100%;" placeholder="请输入描述"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -2129,12 +2129,12 @@
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="CDN供应商">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入CDN供应商"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.cdnGys" style="width: 100%;" placeholder="请输入CDN供应商"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="CDN是否使用">
-                    <el-select v-model="ruleForm.region" placeholder="请选择CDN是否使用">
+                    <el-select v-model="ruleForm.xjgywxt.cdnSfsy" placeholder="请选择CDN是否使用">
                       <el-option
                         v-for="dict in dict.type.is_no"
                         :key="dict.value"
@@ -2146,31 +2146,31 @@
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="CDN类型">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入CDN类型"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.cdnLx" style="width: 100%;" placeholder="请输入CDN类型"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="CDN域名">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入CDN域名"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.cdnYm" style="width: 100%;" placeholder="请输入CDN域名"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="联系人">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入联系人"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.cdnLxr" style="width: 100%;" placeholder="请输入联系人"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="margin-left: 10px;">
                   <el-form-item label="联系人电话">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入联系人电话"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.cdnLxrdh" style="width: 100%;" placeholder="请输入联系人电话"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="8">
                   <el-form-item label="CDN加速信息">
-                    <el-input v-model="ruleForm.name" style="width: 100%;" placeholder="请输入CDN加速信息"></el-input>
+                    <el-input v-model="ruleForm.xjgywxt.cdnJsxx" style="width: 100%;" placeholder="请输入CDN加速信息"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -2181,7 +2181,7 @@
             </el-row>
             <el-row>
               <el-form-item label="有效性质">
-                <el-radio-group v-model="ruleForm.whois_yxx">
+                <el-radio-group v-model="ruleForm.whoisYxx">
                   <el-radio :label="1">是</el-radio>
                   <el-radio :label="2">否</el-radio>
                 </el-radio-group>
@@ -2190,49 +2190,49 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="注册名">
-                  <el-input v-model="ruleForm.whois_zcm" placeholder="请输入注册名"></el-input>
+                  <el-input v-model="ruleForm.whoisZcm" placeholder="请输入注册名"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="服务商">
-                  <el-input v-model="ruleForm.whois_fws" placeholder="请输入服务商"></el-input>
+                  <el-input v-model="ruleForm.whoisFws" placeholder="请输入服务商"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="注册邮箱">
-                  <el-input v-model="ruleForm.whois_zcyx" placeholder="请输入注册邮箱"></el-input>
+                  <el-input v-model="ruleForm.whoisZcyx" placeholder="请输入注册邮箱"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="注册国家">
-                  <el-input v-model="ruleForm.whois_zcgj" placeholder="请输入注册国家"></el-input>
+                  <el-input v-model="ruleForm.whoisZcgj" placeholder="请输入注册国家"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="注册省">
-                  <el-input v-model="ruleForm.whois_zcs" placeholder="请输入注册省"></el-input>
+                  <el-input v-model="ruleForm.whoisZcs" placeholder="请输入注册省"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="注册地址">
-                  <el-input v-model="ruleForm.whois_zcdz" placeholder="请输入注册地址"></el-input>
+                  <el-input v-model="ruleForm.whoisZcdz" placeholder="请输入注册地址"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="注册机构">
-                  <el-input v-model="ruleForm.whois_zcjg" placeholder="请输入注册机构"></el-input>
+                  <el-input v-model="ruleForm.whoisZcjg" placeholder="请输入注册机构"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="注册时间">
                   <el-date-picker
-                    v-model="ruleForm.whois_zcsj"
+                    v-model="ruleForm.whoisZcsj"
                     type="date"
                     format="yyyy-MM-dd"
                     value-format="yyyy-MM-dd"
@@ -2245,7 +2245,7 @@
               <el-col :span="12">
                 <el-form-item label="最后更新时间">
                   <el-date-picker
-                    v-model="ruleForm.whois_zhgxsj"
+                    v-model="ruleForm.whoisZhgxsj"
                     type="date"
                     format="yyyy-MM-dd"
                     value-format="yyyy-MM-dd"
@@ -2256,7 +2256,7 @@
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="到期时间">
                   <el-date-picker
-                    v-model="ruleForm.whois_dqsj"
+                    v-model="ruleForm.whoisDqsj"
                     type="date"
                     format="yyyy-MM-dd"
                     value-format="yyyy-MM-dd"
@@ -2272,36 +2272,36 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="数据库名称">
-                  <el-input v-model="ruleForm.sjzc_sjkmc" placeholder="请输入数据库名称"></el-input>
+                  <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="数据库类型">
-                  <el-input v-model="ruleForm.sjzc_sjklx" placeholder="请输入数据库类型"></el-input>
+                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="端口">
-                  <el-input v-model="ruleForm.sjzc_dk" placeholder="请输入端口"></el-input>
+                  <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="数据库版本">
-                  <el-input v-model="ruleForm.sjzc_sjkbb" placeholder="请输入数据库版本"></el-input>
+                  <el-input v-model="ruleForm.sjzcSjkbb" placeholder="请输入数据库版本"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="数据库所在IP">
-                  <el-input v-model="ruleForm.sjzc_sjk_ip" placeholder="请输入数据库所在IP"></el-input>
+                  <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="共享属性">
-                  <el-select v-model="ruleForm.region" placeholder="请选择共享属性">
+                  <el-select v-model="ruleForm.sjzcGxsx" placeholder="请选择共享属性">
                     <el-option
                       v-for="dict in dict.type.sjzc_gxsx"
                       :key="dict.value"
@@ -2315,7 +2315,7 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="开放属性">
-                  <el-select v-model="ruleForm.sjzc_kfsx" placeholder="请选择开放属性">
+                  <el-select v-model="ruleForm.sjzcKfsx" placeholder="请选择开放属性">
                     <el-option
                       v-for="dict in dict.type.sjzc_kfsx"
                       :key="dict.value"
@@ -2327,7 +2327,7 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据领域">
-                  <el-select v-model="ruleForm.sjzc_sjly" placeholder="请选择数据领域">
+                  <el-select v-model="ruleForm.sjzcSjly" placeholder="请选择数据领域">
                     <el-option
                       v-for="dict in dict.type.sjzc_sjly"
                       :key="dict.value"
@@ -2341,7 +2341,7 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="更新周期">
-                  <el-select v-model="ruleForm.sjzc_gxzq" placeholder="请选择数据领域">
+                  <el-select v-model="ruleForm.sjzcGxzq" placeholder="请选择数据领域">
                     <el-option
                       v-for="dict in dict.type.sjzc_gxzq"
                       :key="dict.value"
@@ -2361,19 +2361,19 @@
                       :value="dict.value"
                     />
                   </el-select> -->
-                  <el-input v-model="ruleForm.sjzc_sjlx" placeholder="请输入数据类型"></el-input>
+                  <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据类型"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="数据量">
-                  <el-input v-model="ruleForm.sjzc_sjl" placeholder="请输入注册省"></el-input>
+                  <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="是否涉密数据">
-                  <el-select v-model="ruleForm.sjzc_smsj" placeholder="请选择数据领域">
+                  <el-select v-model="ruleForm.sjzcSmsj" placeholder="请选择数据领域">
                     <el-option
                       v-for="dict in dict.type.is_no"
                       :key="dict.value"
@@ -2387,7 +2387,7 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="数据是否出境">
-                  <el-select v-model="ruleForm.sjzc_cj" placeholder="请选择数据领域">
+                  <el-select v-model="ruleForm.sjzcCj" placeholder="请选择数据领域">
                     <el-option
                       v-for="dict in dict.type.is_no"
                       :key="dict.value"
@@ -2399,7 +2399,7 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据分级分类">
-                  <el-select v-model="ruleForm.sjzc_sjfjfl" placeholder="请选择数据领域">
+                  <el-select v-model="ruleForm.sjzcSjfjfl" placeholder="请选择数据领域">
                     <el-option
                       v-for="dict in dict.type.sjzc_sjfjfl"
                       :key="dict.value"
@@ -2413,7 +2413,7 @@
             <el-row style="display: flex;">
               <el-col :span="12">
                 <el-form-item label="数据重要程度">
-                  <el-select v-model="ruleForm.sjzc_sjzycd" placeholder="请选择数据领域">
+                  <el-select v-model="ruleForm.sjzcSjzycd" placeholder="请选择数据领域">
                     <el-option
                       v-for="dict in dict.type.zc_xtzyx"
                       :key="dict.value"
@@ -2427,11 +2427,11 @@
             <el-row style="display: flex;">
               <el-col :span="24">
                 <el-form-item label="数据描述">
-                  <el-input type="textarea" resize="none" placeholder="请输入数据描述" :rows="5" v-model="ruleForm.sjzc_sjms"></el-input>
+                  <el-input type="textarea" resize="none" placeholder="请输入数据描述" :rows="5" v-model="ruleForm.sjzcSjms"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- 数据资产 -->
+            <!-- 业务系统拓扑图 -->
             <el-row style="margin: 10px 0;">
               <span class="top-title-box">业务系统拓扑图</span>
             </el-row>
@@ -2464,6 +2464,7 @@
 <script>
 import pcas from "@/utils/pca-code.json"
 import myUpload from "@/views/components/myUpload/index.vue";
+import { assetUnit, assetInfo } from "@/api/auditPagesApi/index";
 export default {
   name: "AssetsAuth",
   dicts:[
@@ -2490,6 +2491,8 @@ export default {
         checkStrictly:true,
       },
       ruleForm:{
+        // 新监管业务形态
+        xjgywxt:{},
         // 关联域名--多个
         domins:[{
           glym:""
@@ -2508,6 +2511,8 @@ export default {
         xtfhqk_fzd:[],
         // 防勒索
         xtfhqk_fls:[],
+        // 提交使用供应链信息列表
+        gylxxList:[],
         // 测评单位
         chepingUnit:[
           {
@@ -2515,6 +2520,7 @@ export default {
             tyshxydm:"",
             lxr:"",
             lxdh:"",
+            type:1
           }
         ],
         // 硬件供应商单位
@@ -2524,6 +2530,7 @@ export default {
             tyshxydm:"",
             lxr:"",
             lxdh:"",
+            type:2
           }
         ],
         // 机房运维单位
@@ -2533,6 +2540,7 @@ export default {
             tyshxydm:"",
             lxr:"",
             lxdh:"",
+            type:3
           }
         ],
         // 系统设计单位
@@ -2542,6 +2550,7 @@ export default {
             tyshxydm:"",
             lxr:"",
             lxdh:"",
+            type:4
           }
         ],
         // 系统建设单位
@@ -2551,6 +2560,7 @@ export default {
             tyshxydm:"",
             lxr:"",
             lxdh:"",
+            type:5
           }
         ],
         // 系统运营单位
@@ -2560,6 +2570,7 @@ export default {
             tyshxydm:"",
             lxr:"",
             lxdh:"",
+            type:6
           }
         ],
         // 安全服务单位
@@ -2569,6 +2580,7 @@ export default {
             tyshxydm:"",
             lxr:"",
             lxdh:"",
+            type:7
           }
         ],
         // 服务器
@@ -2620,10 +2632,16 @@ export default {
         restContacts:[],
         type:[]
       },
-      rules:{}
+      rules:{},
+      disabled:false,
     }
   },
   methods:{
+    getInfo(id){
+      assetInfo(id).then(res=>{
+        console.log(res,"res");
+      })
+    },
     //也可以这样写
     handleChange (value) {
       console.log(value)
diff --git a/src/views/auditPages/assetsManagement/index.vue b/src/views/auditPages/assetsManagement/index.vue
index ae4a503..d3241f2 100644
--- a/src/views/auditPages/assetsManagement/index.vue
+++ b/src/views/auditPages/assetsManagement/index.vue
@@ -3,29 +3,27 @@
   <div class="L-main" id="L-size-main">
     <div class="content-search" id="L-header">
       <div class="search-title">查询条件</div>
-      <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline">
+      <el-form :inline="true" ref="queryForm" :model="formInline" size="small" class="demo-form-inline">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="系统名称：">
-              <el-input v-model="formInline.name" placeholder="请输入"></el-input>
+            <el-form-item label="系统名称：" prop="xtmc">
+              <el-input v-model="formInline.xtmc" placeholder="请输入系统名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="系统类型：">
-              <el-select v-model="formInline.type" placeholder="请选择">
-                <el-option label="item.label" value="item.value">
-                </el-option>
-                <!-- <el-option
-                  v-for="dict in dict.type.bms_approval_status"
+            <el-form-item label="系统类型：" prop="xtlx">
+              <el-select v-model="formInline.xtlx" placeholder="请选择系统类型">
+                <el-option
+                  v-for="dict in dict.type.zc_xtlx"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value">
-                </el-option> -->
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="新增时间：">
+            <el-form-item label="新增时间：" prop="time">
               <el-date-picker
                 v-model="formInline.time"
                 format="yyyy-MM-dd HH:mm:ss"
@@ -41,21 +39,19 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="单位名称：">
-              <el-input v-model="formInline.number" placeholder="请输入"></el-input>
+            <el-form-item label="单位名称：" prop="dwmc">
+              <el-input v-model="formInline.dwmc" placeholder="请输入单位名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="系统状态：">
-              <el-select v-model="formInline.status" placeholder="请选择">
-                <el-option label="item.label" value="item.value">
-                </el-option>
-                <!-- <el-option
-                  v-for="dict in dict.type.bms_approval_status"
+            <el-form-item label="系统状态：" prop="xtzt">
+              <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
+                <el-option
+                  v-for="dict in dict.type.zc_xtzt"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value">
-                </el-option> -->
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -104,29 +100,33 @@
       <section>
         <el-table v-loading="loading" :data="tableData" :height="tabHeader" :row-class-name="tableRowClassName" :max-height="tabHeader">
           <el-table-column type="index" width="50" label="序号" align="center"/>
-          <el-table-column label="系统名称" key="name" width="200px" prop="name" align="center" />
-          <el-table-column label="系统类型" key="type" prop="type" align="center" />
-          <el-table-column label="单位名称" key="unitName" prop="unitName" align="center">
+          <el-table-column label="系统名称" key="xtmc" width="200px" prop="xtmc" align="center" />
+          <el-table-column label="系统类型" key="xtlx" prop="xtlx" align="center">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.zc_xtlx" :value="scope.row.xtlx"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="单位名称" key="dwmc" prop="dwmc" 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="time" prop="time" align="center" />
+          <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" />
           <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: #16B771;">
+              <span  v-if="scope.row.xtzt == 1" style="color: #16B771;">
                 已安装
               </span>
-              <span v-if="scope.row.status === 1" style="color: #F58A0C;">
+              <span v-if="scope.row.xtzt == 2" style="color: #F58A0C;">
                 测试中
               </span>
-              <span v-if="scope.row.status === 2" style="color: #1485EF;">
+              <span v-if="scope.row.xtzt == 3" style="color: #1485EF;">
                 使用中
               </span>
-              <span v-if="scope.row.status === 3" style="color: #29A07A;">
+              <span v-if="scope.row.xtzt == 4" style="color: #29A07A;">
                 维护中
               </span>
-              <span v-if="scope.row.status === 4" style="color: #F50C0C;">
+              <span v-if="scope.row.xtzt == 5" style="color: #F50C0C;">
                 报废
               </span>
             </template>
@@ -134,17 +134,17 @@
           <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
             <template slot-scope="scope">
               <div style="display: flex;align-items: center;justify-content: center;">
-                <div style="display: flex;align-items: center;">
+                <div style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" @click="goInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">查看</span>
+                  <span class="look-info" @click="goInfo(scope.row,1)" style="color: #1485EF;margin-right: 15px;">查看</span>
                 </div>
-                <div style="display: flex;align-items: center;">
+                <div style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="look-info" @click="goInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">编辑</span>
+                  <span class="look-info" @click="goInfo(scope.row,2)" style="color: #1485EF;margin-right: 15px;">编辑</span>
                 </div>
-                <div style="display: flex;align-items: center;">
+                <div style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" @click="goInfo(scope.row)" style="color: #F50C0C;margin-right: 15px;cursor: pointer;">删除</span>
+                  <span class="look-info" @click="goInfo(scope.row,3)" style="color: #F50C0C;margin-right: 15px;">删除</span>
                 </div>
               </div>
             </template>
@@ -154,10 +154,10 @@
       <my-pagination 
         id="L-pagination"
         :total="total"
-        :page="pagination.current"
-        :limit="pagination.size"
+        :page="formInline.current"
+        :limit="formInline.size"
         @pagination="getPagination"
-        :current-page.sync="pagination.current" 
+        :current-page.sync="formInline.current" 
       ></my-pagination>
     </main>
   </div>
@@ -165,122 +165,31 @@
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
 // import myDialog from "@/views/components/myDialog/index.vue"
+import { assetUnit, deleteAssetInfo } from "@/api/auditPagesApi/index";
 export default {
-  // dicts: ['jjh_project_type', 'bms_approval_status', "project_middle_type", "project_small_type", "project_categories"],
+  dicts: ['zc_xtzt','zc_xtlx'],
   components:{myPagination},
   data() {
     return {
       formInline:{
-        name:"",
-        type:"",
+        xtmc:"",
+        xtlx:"",
         time:[],
-        number:"",
-        status:"",
-      },
-      total:0,
-      pagination:{
+        startTime:"",
+        endTime:"",
+        dwmc:"",
+        xtzt:"",
         current:1,
         size:10,
       },
-      tableData:[
-        {
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:0,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:1,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:2,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:3,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:4,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:0,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:1,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:2,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:3,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:4,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:0,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:1,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:2,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:3,
-        },{
-          name:"XXX系统",
-          type:"门户网站",
-          unitName:"太仓市XXX局",
-          time:"2023-07-30 16:30:21",
-          status:4,
-        },
-      ],
+      total:0,
+      tableData:[],
       loading:false,
       tabHeader: undefined,
     }
   },
   mounted(){
-    this.getInfo();
+    this.getList();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
   },
@@ -289,46 +198,34 @@ export default {
   },
   methods:{
     // 获取列表
-    getInfo(){
-      // this.loading = true;
-      // jProject(this.pagination).then(res=>{
-      //   this.loading = false;
-      //   this.total = res.data.total;
-      //   this.tableData = res.data.records;
-      // })
+    getList(){
+      this.loading = true;
+      assetUnit('get',this.formInline).then(res=>{
+        this.loading = false;
+        this.total = res.data.total;
+        this.tableData = res.data.records;
+      })
     },
     // 重置
     resetQuery(){
-      this.formInline = {
-        name:"",
-        type:"",
-        time:[],
-        number:"",
-        status:"",
-      }
-      this.pagination = {
-        current: 1,
-        size: 10,
-      }
+      this.resetForm("queryForm");
+      this.handleQuery();
       this.getList();
     },
     // 查询
     handleQuery(){
-      this.pagination = {
-        current: 1,
-        size: 10
-      }
-      if(this.formInline.time.length > 0) {
+      this.formInline.current = 1;
+      if(this.formInline.time) {
         this.formInline.startTime = this.formInline.time[0]
         this.formInline.endTime = this.formInline.time[1]
       }
-      this.pagination = { ...this.pagination,...this.formInline };
+      this.formInline.time = [];
       this.getList();
     },
     // 页码获取
     getPagination(pages){
-      this.pagination.current = pages.page;
-      this.pagination.size = pages.limit;
+      this.formInline.current = pages.page;
+      this.formInline.size = pages.limit;
       this.getList();
     },
     // 导入
@@ -342,7 +239,27 @@ export default {
       }})
     },
     // 查看详情
-    goInfo(){},
+    goInfo(row,id){
+      if(id == 1) {
+        this.$router.push({name: 'AssetsAuth',query: {
+          pageType: "look",
+          id:row.id
+        }})
+      } else if(id == 2) {
+        this.$router.push({name: 'AssetsAuth',query: {
+          pageType: "chang",
+          id:row.id
+        }})
+      } else if(id == 3) {
+        const userIds = row.id;
+        this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+          return deleteAssetInfo(userIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+        }
+    },
     // 编辑
     edit(){
     },
diff --git a/src/views/auditPages/taskManagement/auditList.vue b/src/views/auditPages/taskManagement/auditList.vue
index eab3c9e..c4b7e98 100644
--- a/src/views/auditPages/taskManagement/auditList.vue
+++ b/src/views/auditPages/taskManagement/auditList.vue
@@ -88,7 +88,6 @@
       <section v-if="index == 1">
         <el-table v-loading="loading" :data="tableData" :height="tabHeader" :max-height="tabHeader" :row-class-name="tableRowClassName">
           <el-table-column type="index" width="50" label="序号" align="center"/>
-          <el-table-column label="资产编号" key="number" width="200px" prop="number" align="center" />
           <el-table-column label="资产名称" key="name" prop="name" align="center" />
           <el-table-column label="资产类型" key="type" prop="type" align="center">
             <!-- <template slot-scope="scope">
diff --git a/src/views/auditPages/taskManagement/index.vue b/src/views/auditPages/taskManagement/index.vue
index 716c902..55fdc9a 100644
--- a/src/views/auditPages/taskManagement/index.vue
+++ b/src/views/auditPages/taskManagement/index.vue
@@ -109,13 +109,13 @@
           <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
             <template slot-scope="scope">
               <div style="display: flex;align-items: center;justify-content: center;">
-                <div style="display: flex;align-items: center;">
+                <div style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" @click="goInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">查看</span>
+                  <span class="look-info" @click="goInfo(scope.row)" style="color: #1485EF;margin-right: 15px;">查看</span>
                 </div>
-                <div v-if="scope.row.status == 0" style="display: flex;align-items: center;">
+                <div v-if="scope.row.status == 0" style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="del-info" @click="delInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">审核</span>
+                  <span class="del-info" @click="delInfo(scope.row)" style="color: #1485EF;margin-right: 15px;">审核</span>
                 </div>
               </div>
             </template>
diff --git a/src/views/auditPages/unitManagement/index.vue b/src/views/auditPages/unitManagement/index.vue
index 1552a6f..093c664 100644
--- a/src/views/auditPages/unitManagement/index.vue
+++ b/src/views/auditPages/unitManagement/index.vue
@@ -40,7 +40,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="所属行业" required>
-                <el-select v-model="ruleForm.sshy" placeholder="请选择系统重要性">
+                <el-select v-model="ruleForm.sshy" placeholder="请选择所属行业">
                   <el-option
                     v-for="dict in dict.type.zc_xtzyx"
                     :key="dict.value"
@@ -52,7 +52,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="单位类型" required>
-                <el-select v-model="ruleForm.dwlx" placeholder="请选择系统重要性">
+                <el-select v-model="ruleForm.dwlx" placeholder="请选择单位类型">
                   <el-option
                     v-for="dict in dict.type.dwlx"
                     :key="dict.value"
@@ -66,7 +66,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="单位标签">
-                <el-select v-model="ruleForm.dwbq" placeholder="请选择系统重要性">
+                <el-select v-model="ruleForm.dwbq" placeholder="请选择单位标签">
                   <el-option
                     v-for="dict in dict.type.zc_xtzyx"
                     :key="dict.value"
@@ -85,7 +85,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="单位角色">
-                <el-select v-model="ruleForm.dwjs" placeholder="请选择系统重要性">
+                <el-select v-model="ruleForm.dwjs" placeholder="请选择单位角色">
                   <el-option
                     v-for="dict in dict.type.dwjs"
                     :key="dict.value"
@@ -97,7 +97,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="单位直属性质">
-                <el-select v-model="ruleForm.dwzsxz" placeholder="请选择系统重要性">
+                <el-select v-model="ruleForm.dwzsxz" placeholder="请选择单位直属性质">
                   <el-option
                     v-for="dict in dict.type.dwzsxz"
                     :key="dict.value"
@@ -116,7 +116,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="是否关基单位">
-                <el-select v-model="ruleForm.gjdw" placeholder="请选择系统重要性">
+                <el-select v-model="ruleForm.gjdw" placeholder="请选择是否关基单位">
                   <el-option
                     v-for="dict in dict.type.is_no"
                     :key="dict.value"
@@ -147,7 +147,7 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="6" style="margin-left: 10px;">
-                      <el-form-item
+                      <el-form-item prop="dwfzrlxfs"
                         :rules="[
                           {
                             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
@@ -160,7 +160,15 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="6" style="margin-left: 10px;">
-                      <el-form-item prop="dwfzryx">
+                      <el-form-item prop="dwfzryx"
+                        :rules="[
+                          {
+                            type: 'email',
+                            message: '请输入正确的邮箱地址',
+                            trigger: ['blur', 'change']
+                          }
+                        ]"
+                      >
                         <el-input v-model="ruleForm.dwfzryx" style="width: 100%;" placeholder="请输入邮箱"></el-input>
                       </el-form-item>
                     </el-col>
@@ -183,12 +191,28 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="6" style="margin-left: 10px;">
-                      <el-form-item prop="phonenumber">
+                      <el-form-item prop="fgfzrlxfs"
+                        :rules="[
+                          {
+                            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                            message: '请输入正确的手机号码',
+                            trigger: 'blur'
+                          }
+                        ]"
+                      >
                         <el-input v-model="ruleForm.fgfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :span="6" style="margin-left: 10px;">
-                      <el-form-item prop="email">
+                      <el-form-item prop="fgfzryx"
+                        :rules="[
+                          {
+                            type: 'email',
+                            message: '请输入正确的邮箱地址',
+                            trigger: ['blur', 'change']
+                          }
+                        ]"
+                      >
                         <el-input v-model="ruleForm.fgfzryx" style="width: 100%;" placeholder="请输入邮箱"></el-input>
                       </el-form-item>
                     </el-col>
@@ -211,12 +235,28 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="6" style="margin-left: 10px;">
-                      <el-form-item prop="phonenumber">
+                      <el-form-item prop="bmfzrlxfs"
+                        :rules="[
+                          {
+                            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                            message: '请输入正确的手机号码',
+                            trigger: 'blur'
+                          }
+                        ]"
+                      >
                         <el-input v-model="ruleForm.bmfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :span="6" style="margin-left: 10px;">
-                      <el-form-item prop="email">
+                      <el-form-item prop="bmfzryx"
+                        :rules="[
+                          {
+                            type: 'email',
+                            message: '请输入正确的邮箱地址',
+                            trigger: ['blur', 'change']
+                          }
+                        ]"
+                      >
                         <el-input v-model="ruleForm.bmfzryx" style="width: 100%;" placeholder="请输入邮箱"></el-input>
                       </el-form-item>
                     </el-col>
@@ -239,12 +279,28 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="6" style="margin-left: 10px;">
-                      <el-form-item prop="phonenumber">
+                      <el-form-item prop="dylxrlxfs"
+                        :rules="[
+                          {
+                            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                            message: '请输入正确的手机号码',
+                            trigger: 'blur'
+                          }
+                        ]"
+                      >
                         <el-input v-model="ruleForm.dylxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :span="6" style="margin-left: 10px;">
-                      <el-form-item prop="email">
+                      <el-form-item prop="dylxryx"
+                        :rules="[
+                          {
+                            type: 'email',
+                            message: '请输入正确的邮箱地址',
+                            trigger: ['blur', 'change']
+                          }
+                        ]"
+                      >
                         <el-input v-model="ruleForm.dylxryx" style="width: 100%;" placeholder="请输入邮箱"></el-input>
                       </el-form-item>
                     </el-col>
@@ -259,7 +315,7 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="其他联系人" class="daoqitixingren" v-for="(domain, index) in ruleForm.otherConcat" :key="domain.key" :prop="'otherConcat.' + index + '.value'">
+                <el-form-item label="其他联系人" class="daoqitixingren" v-for="(domain, index) in ruleForm.otherConcat" :key="domain.key" :prop="'otherConcat.' + index + '.qtlxrlxfs'">
                   <el-row>
                     <el-col :span="6">
                       <el-form-item prop="name">
@@ -267,12 +323,28 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="6" style="margin-left: 10px;">
-                      <el-form-item prop="phonenumber">
+                      <el-form-item :prop="'otherConcat.' + index + '.qtlxrlxfs'"
+                        :rules="[
+                          {
+                            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                            message: '请输入正确的手机号码',
+                            trigger: 'blur'
+                          }
+                        ]"
+                      >
                         <el-input v-model="domain.qtlxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :span="6" style="margin-left: 10px;">
-                      <el-form-item prop="email">
+                      <el-form-item prop="qtlxryx"
+                        :rules="[
+                          {
+                            type: 'email',
+                            message: '请输入正确的邮箱地址',
+                            trigger: ['blur', 'change']
+                          }
+                        ]"
+                      >
                         <el-input v-model="domain.qtlxryx" style="width: 100%;" placeholder="请输入邮箱"></el-input>
                       </el-form-item>
                     </el-col>
@@ -391,8 +463,8 @@
             </el-col>
           </el-row>
           <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;">
-            <el-button type="danger">取消</el-button>
-            <el-button type="primary" @click="newUnit">确定</el-button>
+            <el-button type="danger" @click="cancel" :disabled="false">取消</el-button>
+            <el-button type="primary" @click="newUnit" :disabled="false">确定</el-button>
           </el-row>
         </el-form>
       </div>
@@ -507,17 +579,36 @@ export default {
       }
     },
     newUnit(){
+      if(this.$route.query.pageType == 'look') {
+        this.$router.go(-1);
+        return;
+      }
       if(this.ruleForm.ssqy.length > 0) {
         this.ruleForm.ssqyprovince = this.ruleForm.ssqy[0]
         this.ruleForm.ssqycity = this.ruleForm.ssqy[1]
         this.ruleForm.ssqycounty = this.ruleForm.ssqy[2]
       }
       this.loading = true;
-      postUnit('post',this.ruleForm).then(res=>{
-        console.log(res);
-        this.loading = false;
-      })
-
+      if(this.$route.query.pageType == 'change') {
+        postUnit('put',this.ruleForm).then(res=>{
+          this.loading = false;
+          this.$modal.msgSuccess("修改成功");
+          this.$router.go(-1);
+        }).catch(err=>{
+          this.loading = false;
+        })
+      } else if(this.$route.query.pageType == 'add') {
+        postUnit('post',this.ruleForm).then(res=>{
+          this.loading = false;
+          this.$modal.msgSuccess("新增成功");
+          this.$router.go(-1);
+        }).catch(err=>{
+          this.loading = false;
+        })
+      }
+    },
+    cancel(){
+      this.$router.go(-1);
     },
   },
   beforeRouteEnter(to,from,next){
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index b729ee6..8b79798 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -252,17 +252,17 @@
           <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
             <template slot-scope="scope">
               <div style="display: flex;align-items: center;justify-content: center;">
-                <div style="display: flex;align-items: center;">
+                <div style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" @click="handleLookdate(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">查看</span>
+                  <span class="look-info" @click="handleLookdate(scope.row)" style="color: #1485EF;margin-right: 15px;">查看</span>
                 </div>
-                <div style="display: flex;align-items: center;">
+                <div style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="look-info" @click="handleUpdate(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">编辑</span>
+                  <span class="look-info" @click="handleUpdate(scope.row)" style="color: #1485EF;margin-right: 15px;">编辑</span>
                 </div>
-                <div style="display: flex;align-items: center;">
+                <div style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" @click="handleDelete(scope.row)" style="color: #F50C0C;margin-right: 15px;cursor: pointer;">删除</span>
+                  <span class="look-info" @click="handleDelete(scope.row)" style="color: #F50C0C;margin-right: 15px;">删除</span>
                 </div>
               </div>
             </template>
@@ -494,7 +494,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const userIds = row.userId || this.ids;
+      const userIds = row.id || this.ids;
       this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
         return delUnit(userIds);
       }).then(() => {
diff --git a/src/views/unitPages/myAssets/index.vue b/src/views/unitPages/myAssets/index.vue
index 2955b41..5d7583c 100644
--- a/src/views/unitPages/myAssets/index.vue
+++ b/src/views/unitPages/myAssets/index.vue
@@ -84,17 +84,17 @@
           <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
             <template slot-scope="scope">
               <div style="display: flex;align-items: center;justify-content: center;">
-                <div style="display: flex;align-items: center;">
+                <div style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" @click="goInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">查看</span>
+                  <span class="look-info" @click="goInfo(scope.row)" style="color: #1485EF;margin-right: 15px;">查看</span>
                 </div>
-                <div style="display: flex;align-items: center;">
+                <div style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="look-info" @click="goInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">编辑</span>
+                  <span class="look-info" @click="goInfo(scope.row)" style="color: #1485EF;margin-right: 15px;">编辑</span>
                 </div>
-                <div style="display: flex;align-items: center;">
+                <div style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" @click="goInfo(scope.row)" style="color: #F50C0C;margin-right: 15px;cursor: pointer;">删除</span>
+                  <span class="look-info" @click="goInfo(scope.row)" style="color: #F50C0C;margin-right: 15px;">删除</span>
                 </div>
               </div>
             </template>
diff --git a/src/views/unitPages/myTask/auditList.vue b/src/views/unitPages/myTask/auditList.vue
index ed928b0..bcf6f42 100644
--- a/src/views/unitPages/myTask/auditList.vue
+++ b/src/views/unitPages/myTask/auditList.vue
@@ -69,7 +69,6 @@
         <section>
           <el-table v-loading="loading" :data="tableData" :height="tabHeader" :max-height="tabHeader" :row-class-name="tableRowClassName">
             <el-table-column type="index" width="50" label="序号" align="center"/>
-            <el-table-column label="资产编号" key="number" width="200px" prop="number" align="center" />
             <el-table-column label="资产名称" key="name" prop="name" align="center" />
             <el-table-column label="资产类型" key="type" prop="type" align="center">
               <!-- <template slot-scope="scope">
@@ -92,8 +91,16 @@
             </el-table-column>
             <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
               <template slot-scope="scope">
-                <span class="look-info" @click="goAudit(scope.row)" style="color: #192A92;cursor: pointer;" v-if="scope.row.status == 2">审核</span>
-                <span class="look-info" @click="goInfo(scope.row)" style="color: #192A92;cursor: pointer;" v-else>查看</span>
+                <div style="display: flex;align-items: center;justify-content: center;">
+                  <div v-if="scope.row.status == 2" style="display: flex;align-items: center;">
+                    <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
+                    <span class="del-info" @click="delInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">审核</span>
+                  </div>
+                  <div style="display: flex;align-items: center;" v-else>
+                    <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                    <span class="look-info" @click="goInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">查看</span>
+                  </div>
+                </div>
               </template>
             </el-table-column>
           </el-table>
diff --git a/src/views/unitPages/myTask/index.vue b/src/views/unitPages/myTask/index.vue
index bc6127e..c696359 100644
--- a/src/views/unitPages/myTask/index.vue
+++ b/src/views/unitPages/myTask/index.vue
@@ -69,17 +69,17 @@
           <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
             <template slot-scope="scope">
               <div style="display: flex;align-items: center;justify-content: center;">
-                <div v-if="scope.row.status == 2" style="display: flex;align-items: center;">
+                <div v-if="scope.row.status == 2" style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" @click="goInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">查看</span>
+                  <span class="look-info" @click="goInfo(scope.row,3)" style="color: #1485EF;margin-right: 15px;">查看</span>
                 </div>
-                <div v-if="scope.row.status == 0" style="display: flex;align-items: center;">
+                <div v-if="scope.row.status == 0" style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="del-info" @click="delInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">开始核查</span>
+                  <span class="del-info" @click="goInfo(scope.row,1)" style="color: #1485EF;margin-right: 15px;">开始核查</span>
                 </div>
-                <div v-if="scope.row.status == 1" style="display: flex;align-items: center;">
+                <div v-if="scope.row.status == 1" style="display: flex;align-items: center;cursor: pointer;">
                   <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="del-info" @click="delInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">重新核查</span>
+                  <span class="del-info" @click="goInfo(scope.row,2)" style="color: #1485EF;margin-right: 15px;">重新核查</span>
                 </div>
               </div>
             </template>
@@ -206,11 +206,11 @@ export default {
     goInfo(row,id){
       if(id == 1) {
         this.$router.push({name: 'mytaskAudit',query: {
-          pageType: "info",
+          pageType: "inspect",
         }})
       } else if(id == 2) {
         this.$router.push({name: 'mytaskAudit',query: {
-          pageType: "info",
+          pageType: "inspect",
         }})
       } else if(id == 3) {
         this.$router.push({name: 'mytaskInfo',query: {
diff --git a/src/views/unitPages/myTask/info.vue b/src/views/unitPages/myTask/info.vue
index 8030bab..5d83696 100644
--- a/src/views/unitPages/myTask/info.vue
+++ b/src/views/unitPages/myTask/info.vue
@@ -89,7 +89,10 @@
                   </el-table-column>
                   <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
                     <template slot-scope="scope">
-                      <span class="look-info" @click="goInfo(scope.row)" style="color: #192A92;cursor: pointer;">查看</span>
+                      <div style="display: flex;align-items: center;cursor: pointer;">
+                        <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                        <span class="look-info" @click="goInfo(scope.row)" style="color: #1485EF;margin-right: 15px;">查看</span>
+                      </div>
                     </template>
                   </el-table-column>
                 </el-table>