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

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 若依管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.119:9015'
+VUE_APP_BASE_API = 'http://192.168.0.108:9015'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/auditPages/taskManagement/index.vue

@@ -5,17 +5,13 @@
       <div class="search-title">查询条件</div>
       <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="7">
             <el-form-item label="任务名称：">
               <el-input v-model="formInline.taskName" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="任务编号：">
-              <el-input v-model="formInline.id" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
+        
+          <el-col :span="7">
             <el-form-item label="任务状态：">
               <el-select v-model="formInline.taskStatus" placeholder="请选择">
                 <el-option label="进行中" value="1">
@@ -27,17 +23,25 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-
-
+          <el-col :span="5">
+            <!-- <el-form-item label="任务编号：">
+              <el-input v-model="formInline.id" placeholder="请输入"></el-input>
+            </el-form-item> -->
             <el-form-item label="任务完成时间：">
               <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>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <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> -->
+            </el-form-item>
+          </el-col>
           <el-col :span="16" style="text-align: right;padding-right: 20px;">
             <el-form-item>
               <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
@@ -63,7 +67,7 @@
         <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="id" width="200px" prop="id" align="center" />
+          <!-- <el-table-column label="任务编号" key="id" width="200px" prop="id" align="center" /> -->
           <el-table-column label="任务名称" key="taskName" prop="taskName" align="center" />
           <el-table-column label="任务下发时间" key="taskTime" prop="taskTime" align="center">
             <!-- <template slot-scope="scope">
@@ -83,7 +87,7 @@
               </span>
               <span v-if="scope.row.taskStatus == 3" style="color: #16B771;">
                 超期完成
-              </span>
+              </span> 
               <span v-if="scope.row.taskStatus == 4" style="color: #1485EF;">
                 审核不通过
               </span>
@@ -225,6 +229,9 @@ export default {
           addassetTaskadd(this.ruleForm).then(res => {
             this.resetForm()
             this.getInfo();
+            this.$modal.msgSuccess("新增成功");
+
+
           })
           setTimeout(() => {
             this.ruleForm.dwmc = this.ruleForm.dwmc.split(",")

src/views/auditPages/taskManagement/info.vue

@@ -53,14 +53,14 @@
                 <el-select v-model="formInline.status" placeholder="请选择">
                   <el-option label="待核查" value="0">
                   </el-option>
-                  <el-option label="已核查" value="1">
+                  <el-option label="待审核" value="1">
                   </el-option>
                   <el-option label="审核通过" value="3">
                   </el-option>
                   <el-option label="审核不通过" value="4">
                   </el-option>
-                  <el-option label="已报废" value="5">
-                  </el-option>
+                  <!-- <el-option label="已报废" value="5">
+                  </el-option> -->
                 </el-select>
               </el-form-item>
             </el-col>
@@ -99,7 +99,7 @@
           <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="id" width="200px" prop="id" align="center" />
+            <!-- <el-table-column label="资产编号" key="id" width="200px" prop="id" align="center" /> -->
             <el-table-column label="系统名称" key="xtmc" prop="xtmc" align="center" />
             <el-table-column label="系统类型" key="xtlx" prop="xtlx" align="center">
               <template slot-scope="scope" >

src/views/components/myDialog/index.vue

@@ -62,12 +62,15 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-dialog {
-  border-radius: 5px;
+  border-radius: 10px;
 
   .el-dialog__header {
     border-bottom: 1px solid #DDDDDD;
     padding: 10px 20px;
     background: #F2F4F6;
+    border-top-left-radius: 10px;  /* 上左角圆角 */
+    border-top-right-radius: 10px; /* 上右角圆角 */
+
 
     span {
       // font-family: PingFang-SC, PingFang-SC;

src/views/system/user/danweiList.vue

@@ -1,25 +1,25 @@
 <template>
 
 
-  <div class="L-main" id="L-size-main">
+  <div class="L-main L-mainTow" id="L-size-main">
     <div class="content-search" id="L-header">
       <div class="search-title">查询条件</div>
       <el-form :inline="true" :model="queryParams" ref="queryForm" size="small" >
         <el-row>
-          <el-col :span="6">
+          <el-col :span="7">
             <el-form-item label="单位名称：" prop="nickName">
               <el-input v-model="queryParams.nickName" placeholder="请输入单位名称" clearable
                 @keyup.enter.native="handleQuery" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="7">
             <el-form-item label="单位类型：" prop="dwlx">
               <el-select v-model="queryParams.dwlx" placeholder="用户状态" clearable>
                 <el-option v-for="dict in dict.type.dwlx" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="7">
             <el-form-item label="统一社会信用代码：" class="tyshxydm-class" prop="userName">
               <el-input v-model="queryParams.userName" placeholder="请输入统一社会信用代码" clearable
                 @keyup.enter.native="handleQuery" />
@@ -57,7 +57,7 @@
             <template slot-scope="scope">{{ scope.row.userName }}</template>
           </el-table-column>
           <el-table-column label="所属区域" align="center" key="ssqycounty" prop="ssqycounty">
-            <template slot-scope="scope">{{ scope.row.ssqycity }}</template>
+            <template slot-scope="scope">{{ getSsqu(scope.row) }}</template>
           </el-table-column>
           <el-table-column label="所属行业" align="center" key="sshy" prop="sshy">
             <template slot-scope="scope">
@@ -182,6 +182,17 @@ export default {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   methods: {
+    getSsqu(row) {
+      if(row.ssqyprovince && row.ssqycity && row.ssqycounty) {
+        return row.ssqyprovince + "/" + row.ssqycity + '/' + row.ssqycounty
+      } else if(row.ssqyprovince && row.ssqycity) {
+        return row.ssqyprovince + "/" + row.ssqycity
+      } else if(row.ssqyprovince) {
+        return row.ssqyprovince
+      } else {
+        return
+      }
+    },
     dakai(val) {
       console.log(val);
 
@@ -274,7 +285,15 @@ export default {
 ::v-deep .danweiList{
   padding: 0 20px;
 }
-::v-deep .content-search{
+
+::v-deep .content-search{ 
   padding-top: 10px;
+
+}
+.L-mainTow {
+  background-color: #ffffff !important; 
+}
+::v-deep .search-title{
+  border: none !important;
 }
 </style>

src/views/tool/build/IconsDialog.vue

@@ -112,6 +112,8 @@ export default {
     box-sizing: border-box;
     .el-dialog__header {
       padding-top: 14px;
+    border-radius:15px;
+
     }
     .el-dialog__body {
       margin: 0 20px 20px 20px;

src/views/unitPages/myTask/audit.vue

@@ -94,7 +94,7 @@
                   <el-col :span="23">
                     <el-input v-model="domain.key" placeholder="请输入关联域名"></el-input>
                   </el-col>
-                  <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
+                  <el-col :span="1" style="text-align: center;">
                     <i @click="addForm('glymList')" v-if="index == 0" class="el-icon-circle-plus-outline"
                       style="margin-left: 5px;font-size: 16px;cursor: pointer;"></i>
                     <i @click="removeDomainOne(domain, 'glymList')" v-else class="el-icon-remove-outline"
@@ -134,7 +134,7 @@
                   <el-col :span="23">
                     <el-input v-model="domain.key" placeholder="请输入关联IP"></el-input>
                   </el-col>
-                  <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
+                  <el-col :span="1" style="text-align: center;">
                     <i @click="addForm('glIpList')" v-if="index == 0" class="el-icon-circle-plus-outline"
                       style="margin-left: 5px;font-size: 16px;cursor: pointer;"></i>
                     <i @click="removeDomainOne(domain, 'glIpList')" v-else class="el-icon-remove-outline"
@@ -720,7 +720,7 @@
                           <el-input v-model="domain.qtlxryx" style="width: 100%;" placeholder="请输入邮箱"></el-input>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
+                      <el-col :span="1" style="text-align: center;">
                         <i @click="removeDomain(domain, 'otherConcat')" class="el-icon-remove-outline"
                           style="font-size: 16px;cursor: pointer;"></i>
                       </el-col>
@@ -728,7 +728,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row v-if="$route.query.pageType !== 'look'">
+              <el-row>
                 <el-col :span="24">
                   <el-form-item prop="btn">
                     <el-button @click="addOtherConcat('otherConcat')">添加其他联系人</el-button>
@@ -1223,7 +1223,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
+                <el-col :span="1" style="text-align: center;">
                   <i @click="addGongyinglian('chepingUnit', 1)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'chepingUnit')" v-else class="el-icon-remove-outline"
@@ -1263,7 +1263,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
+                <el-col :span="1" style="text-align: center;">
                   <i @click="addGongyinglian('yjgysUnit', 2)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'yjgysUnit')" v-else class="el-icon-remove-outline"
@@ -1303,7 +1303,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
+                <el-col :span="1" style="text-align: center;">
                   <i @click="addGongyinglian('jfywUnit', 3)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'jfywUnit')" v-else class="el-icon-remove-outline"
@@ -1343,7 +1343,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
+                <el-col :span="1" style="text-align: center;">
                   <i @click="addGongyinglian('xtsjUnit', 4)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'xtsjUnit')" v-else class="el-icon-remove-outline"
@@ -1414,7 +1414,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
+                <el-col :span="1" style="text-align: center;">
                   <i @click="addGongyinglian('xtjsUnit', 5)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'xtjsUnit')" v-else class="el-icon-remove-outline"
@@ -1485,7 +1485,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
+                <el-col :span="1" style="text-align: center;">
                   <i @click="addGongyinglian('xtyyUnit', 7)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'xtyyUnit')" v-else class="el-icon-remove-outline"
@@ -1525,7 +1525,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
+                <el-col :span="1" style="text-align: center;">
                   <i @click="addGongyinglian('aqfwUnit', 6)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'aqfwUnit')" v-else class="el-icon-remove-outline"
@@ -1562,7 +1562,7 @@
                     <el-row style="display: flex;">
                       <el-col :span="8">
                         <el-form-item :prop="`fwqxx[${index}].ipType`" :rules="{
-                          required: true, message: '请输入', trigger: 'blur'
+                          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"
@@ -1674,7 +1674,7 @@
                     <el-row style="display: flex;">
                       <el-col :span="8">
                         <el-form-item :prop="`wlsb[${index}].ipType`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
+                    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"
@@ -1769,7 +1769,7 @@
                     <el-row style="display: flex;">
                       <el-col :span="8">
                         <el-form-item :prop="`aqsb[${index}].ipType`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
+                    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"

src/views/unitPages/myTask/index.vue

@@ -315,6 +315,8 @@ export default {
     },
     delInfo(row) {
       //taskAudit
+      console.log(row);
+      
       this.$router.push({
         name: 'mytaskInfo', query: {
           pageType: "info",

src/views/unitPages/myTask/info.vue

@@ -413,3 +413,16 @@ export default {
   },
 }
 </script>
+<style lang="scss" scoped>
+::v-deep .el-timeline {
+  padding-left: 0;
+  font-size: 12px;
+}
+
+::v-deep .el-form-item__label {
+  padding-right: 3px;
+}
+
+.look-info {
+}
+</style>