From c82a5d61e68866bc6721321c965e64b72cb0184a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Fri, 22 Nov 2024 18:22:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 src/views/auditPages/taskManagement/index.vue | 37 +++++++++++--------
 src/views/auditPages/taskManagement/info.vue  |  8 ++--
 src/views/components/myDialog/index.vue       |  5 ++-
 src/views/system/user/danweiList.vue          | 31 +++++++++++++---
 src/views/tool/build/IconsDialog.vue          |  2 +
 src/views/unitPages/myTask/audit.vue          | 15 ++++++--
 src/views/unitPages/myTask/index.vue          | 16 +++++---
 src/views/unitPages/myTask/info.vue           | 16 +++++++-
 9 files changed, 95 insertions(+), 37 deletions(-)

diff --git a/.env.development b/.env.development
index a4fa909..bc5430f 100644
--- a/.env.development
+++ b/.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
diff --git a/src/views/auditPages/taskManagement/index.vue b/src/views/auditPages/taskManagement/index.vue
index c38873c..524d430 100644
--- a/src/views/auditPages/taskManagement/index.vue
+++ b/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,9 +87,9 @@
               </span>
               <span v-if="scope.row.taskStatus == 3" style="color: #16B771;">
                 超期完成
-              </span>
+              </span> 
               <span v-if="scope.row.taskStatus == 4" style="color: #1485EF;">
-                正常完成
+                审核不通过
               </span>
               <span v-if="scope.row.taskStatus == 5" style="color: #1485EF;">
                 审核驳回
@@ -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(",")
diff --git a/src/views/auditPages/taskManagement/info.vue b/src/views/auditPages/taskManagement/info.vue
index 3cbe702..4e2d630 100644
--- a/src/views/auditPages/taskManagement/info.vue
+++ b/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" >
diff --git a/src/views/components/myDialog/index.vue b/src/views/components/myDialog/index.vue
index e4652ea..f451756 100644
--- a/src/views/components/myDialog/index.vue
+++ b/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;
diff --git a/src/views/system/user/danweiList.vue b/src/views/system/user/danweiList.vue
index 17a42b7..47635a4 100644
--- a/src/views/system/user/danweiList.vue
+++ b/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>
\ No newline at end of file
diff --git a/src/views/tool/build/IconsDialog.vue b/src/views/tool/build/IconsDialog.vue
index 958be50..b456905 100644
--- a/src/views/tool/build/IconsDialog.vue
+++ b/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;
diff --git a/src/views/unitPages/myTask/audit.vue b/src/views/unitPages/myTask/audit.vue
index 21ebb3b..ffd7302 100644
--- a/src/views/unitPages/myTask/audit.vue
+++ b/src/views/unitPages/myTask/audit.vue
@@ -1549,7 +1549,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"
@@ -1661,7 +1661,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"
@@ -1756,7 +1756,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"
@@ -2605,6 +2605,15 @@
                 </myUpload>
               </el-form-item>
             </el-row>
+            <el-row style="margin: 10px 0;">
+              <span class="top-title-box">报废原因</span>
+            </el-row>
+            <el-row style="margin: 20px 0;">
+              <el-form-item>
+                <div></div>
+              </el-form-item>
+            </el-row>
+          
             <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;">
               <el-button type="danger" @click="newAssets(0)">报废</el-button>
               <el-button @click="newAssets(1)">取消</el-button>
diff --git a/src/views/unitPages/myTask/index.vue b/src/views/unitPages/myTask/index.vue
index 90f4779..f7ff37b 100644
--- a/src/views/unitPages/myTask/index.vue
+++ b/src/views/unitPages/myTask/index.vue
@@ -10,11 +10,11 @@
               <el-input v-model="formInline.taskName" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="7">
+          <!-- <el-col :span="7">
             <el-form-item label="任务编号：">
               <el-input v-model="formInline.id" placeholder="请输入"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="7">
             <el-form-item label="任务状态：">
               <el-select v-model="formInline.taskStatus" placeholder="请选择">
@@ -42,7 +42,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">
@@ -64,7 +64,7 @@
                 超期完成
               </span>
               <span v-if="scope.row.taskStatus == 4" style="color: #1485EF;">
-                正常完成
+                审核不通过
               </span>
               <span v-if="scope.row.taskStatus == 5" style="color: #1485EF;">
                 审核驳回
@@ -308,16 +308,20 @@ export default {
       this.$router.push({
         name: 'mytaskInfo', query: {
           pageType: "look",
-          id:row.id
+          id:row.id,
+          dwmc:row.dwmc
         }
       })
     },
     delInfo(row) {
       //taskAudit
+      console.log(row);
+      
       this.$router.push({
         name: 'mytaskInfo', query: {
           pageType: "info",
-          id:row.id
+          id:row.id,
+          dwmc:row.dwmc
         }
       })
     },
diff --git a/src/views/unitPages/myTask/info.vue b/src/views/unitPages/myTask/info.vue
index 0b538e1..31b7a27 100644
--- a/src/views/unitPages/myTask/info.vue
+++ b/src/views/unitPages/myTask/info.vue
@@ -176,7 +176,7 @@
 </template>
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
-import { getassetTaskid, geassetTaskcHc } from "@/api/renwuApi/index.js"
+import { getassetTaskid, geassetTaskcHc,assetLcpage } from "@/api/renwuApi/index.js"
 
 export default {
   dicts: ['zc_xtlx'],
@@ -369,6 +369,7 @@ export default {
     getList() {
       this.loading = true
       this.pagination.taskId = this.$route.query.id || this.$route.meta.id
+      this.pagination.dwmc = this.$route.query.dwmc || this.$route.meta.dwmc
       geassetTaskcHc(this.pagination).then(res => {
         
         this.tableData = res.data.records
@@ -411,3 +412,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>

From 2822f5a1eba49dc96bfe93de804f890c86c4f728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Fri, 22 Nov 2024 18:30:09 +0800
Subject: [PATCH 2/2] genggai

---
 src/views/unitPages/myTask/audit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/unitPages/myTask/audit.vue b/src/views/unitPages/myTask/audit.vue
index 3e5359d..97de7f3 100644
--- a/src/views/unitPages/myTask/audit.vue
+++ b/src/views/unitPages/myTask/audit.vue
@@ -2605,7 +2605,7 @@
                 </myUpload>
               </el-form-item>
             </el-row>
-            <el-row style="margin: 10px 0;">
+            <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
               <span class="top-title-box">报废原因</span>
             </el-row>
             <el-row style="margin: 20px 0;">