From 69cbe15bbb36f6e12c5d5821bb3ca0b7186f03ca Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Wed, 3 Apr 2024 16:04:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E8=AE=BE=E6=96=BD?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/szxc/jminfo/index.vue |   4 +-
 ruoyi-ui/src/views/szxc/zcss/index.vue   |  19 +-
 ruoyi-ui/src/views/szxc/zcssxj/index.vue | 441 +++++++++++++++++------
 3 files changed, 336 insertions(+), 128 deletions(-)

diff --git a/ruoyi-ui/src/views/szxc/jminfo/index.vue b/ruoyi-ui/src/views/szxc/jminfo/index.vue
index 3fec905..467defa 100644
--- a/ruoyi-ui/src/views/szxc/jminfo/index.vue
+++ b/ruoyi-ui/src/views/szxc/jminfo/index.vue
@@ -721,7 +721,7 @@
             v-model="hzInfo.queryParams.idCard"
             placeholder="请输入身份证号"
             clearable
-            @keyup.enter.native="handleQuery"
+            @keyup.enter.native="hzInfoQuery"
           />
         </el-form-item>
         <el-form-item label="姓名" prop="name">
@@ -729,7 +729,7 @@
             v-model="hzInfo.queryParams.name"
             placeholder="请输入姓名"
             clearable
-            @keyup.enter.native="handleQuery"
+            @keyup.enter.native="hzInfoQuery"
           />
         </el-form-item>
         <el-form-item>
diff --git a/ruoyi-ui/src/views/szxc/zcss/index.vue b/ruoyi-ui/src/views/szxc/zcss/index.vue
index 1dcd823..2743d75 100644
--- a/ruoyi-ui/src/views/szxc/zcss/index.vue
+++ b/ruoyi-ui/src/views/szxc/zcss/index.vue
@@ -237,14 +237,14 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="所属网格" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
-                          placeholder="请选择所属网格" style="width:100%;" @select="selectedTree"/>
+            <el-form-item label="资产名称" prop="zcName">
+              <el-input v-model="form.zcName" placeholder="请输入资产名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="资产名称" prop="zcName">
-              <el-input v-model="form.zcName" placeholder="请输入资产名称" />
+            <el-form-item label="所属网格" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
+                          placeholder="请选择所属网格" style="width:100%;" @select="selectedTree"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -269,7 +269,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="安装时间" prop="installDate">
-              <el-date-picker clearable
+              <el-date-picker clearable style="width: 100%"
                               v-model="form.installDate"
                               type="date"
                               value-format="yyyy-MM-dd"
@@ -314,7 +314,7 @@
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="上次巡检时间" prop="lastTime">
-              <el-date-picker clearable
+              <el-date-picker clearable style="width: 100%"
                               v-model="form.lastTime"
                               type="date"
                               value-format="yyyy-MM-dd"
@@ -332,7 +332,7 @@
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="巡检开始日期" prop="xjStart">
-              <el-date-picker clearable
+              <el-date-picker clearable style="width: 100%"
                               v-model="form.xjStart"
                               type="date"
                               value-format="yyyy-MM-dd"
@@ -342,7 +342,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="巡检结束日期" prop="xjEnd">
-            <el-date-picker clearable
+            <el-date-picker clearable style="width: 100%"
                             v-model="form.xjEnd"
                             type="date"
                             value-format="yyyy-MM-dd"
@@ -365,6 +365,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
   </div>
 </template>
 
diff --git a/ruoyi-ui/src/views/szxc/zcssxj/index.vue b/ruoyi-ui/src/views/szxc/zcssxj/index.vue
index 86c90b9..cfe4a04 100644
--- a/ruoyi-ui/src/views/szxc/zcssxj/index.vue
+++ b/ruoyi-ui/src/views/szxc/zcssxj/index.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="资产设施id" prop="zcssId">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="所属网格" prop="deptName">
         <el-input
-          v-model="queryParams.zcssId"
-          placeholder="请输入资产设施id"
+          v-model="queryParams.deptName"
+          placeholder="请输入所属网格"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="资产设备名称" prop="zcName">
+      <el-form-item label="资产设备" prop="zcName">
         <el-input
           v-model="queryParams.zcName"
           placeholder="请输入资产设备名称"
@@ -57,14 +57,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="巡检照片" prop="picture">
-        <el-input
-          v-model="queryParams.picture"
-          placeholder="请输入巡检照片"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="开始时间" prop="xjStart">
         <el-date-picker clearable
           v-model="queryParams.xjStart"
@@ -81,30 +73,7 @@
           placeholder="请选择结束时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属网格" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入所属网格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建者ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -157,46 +126,68 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="zcssxjList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="资产设施id" align="center" prop="zcssId" />
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="45" align="center" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="所属网格" align="center" prop="deptName" />
       <el-table-column label="资产设备名称" align="center" prop="zcName" />
       <el-table-column label="巡检人" align="center" prop="xjName" />
       <el-table-column label="巡检人电话" align="center" prop="phone" />
-      <el-table-column label="巡检日期" align="center" prop="xjDate" width="180">
+      <el-table-column label="巡检日期" align="center" prop="xjDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.xjDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="巡检标题" align="center" prop="title" />
-      <el-table-column label="巡检结果" align="center" prop="xjResult" />
-      <el-table-column label="巡检说明" align="center" prop="xjExplain" />
-      <el-table-column label="巡检照片" align="center" prop="picture" />
-      <el-table-column label="巡检状态(字典)" align="center" prop="xjStatus" />
-      <el-table-column label="开始时间" align="center" prop="xjStart" width="180">
+      <el-table-column label="开始时间" align="center" prop="xjStart">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.xjStart, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="xjEnd" width="180">
+      <el-table-column label="结束时间" align="center" prop="xjEnd">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.xjEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
-      <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="巡检结果" align="center" prop="xjResult" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_xj_result" :value="scope.row.xjResult"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡检说明" align="center" prop="xjExplain" />
+      <el-table-column label="巡检照片" align="center" prop="picture" >
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.picture" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡检状态" align="center" prop="xjStatus" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_zcssxj_staus" :value="scope.row.xjStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="处理说明" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150" fixed="right">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.xjStatus==='0'"
+            style="padding: 5px 10px"
             size="mini"
-            type="text"
-            icon="el-icon-edit"
+            type="primary"
+            plain
             @click="handleUpdate(scope.row)"
             v-hasPermi="['szxc:zcssxj:edit']"
-          >修改</el-button>
+          >巡检登记</el-button>
+
+          <el-button
+            v-if="scope.row.xjStatus==='2'"
+            style="padding: 5px 10px"
+            size="mini"
+            type="primary"
+            plain
+            @click="handled(scope.row)"
+            v-hasPermi="['szxc:zcssxj:edit']"
+          >完成</el-button>
+
           <el-button
             size="mini"
             type="text"
@@ -204,10 +195,11 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['szxc:zcssxj:remove']"
           >删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -217,82 +209,187 @@
     />
 
     <!-- 添加或修改资产设施巡检对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="资产设施id" prop="zcssId">
-          <el-input v-model="form.zcssId" placeholder="请输入资产设施id" />
-        </el-form-item>
-        <el-form-item label="资产设备名称" prop="zcName">
-          <el-input v-model="form.zcName" placeholder="请输入资产设备名称" />
-        </el-form-item>
-        <el-form-item label="巡检人" prop="xjName">
-          <el-input v-model="form.xjName" placeholder="请输入巡检人" />
-        </el-form-item>
-        <el-form-item label="巡检人电话" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入巡检人电话" />
-        </el-form-item>
-        <el-form-item label="巡检日期" prop="xjDate">
-          <el-date-picker clearable
-            v-model="form.xjDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择巡检日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="巡检标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入巡检标题" />
-        </el-form-item>
-        <el-form-item label="巡检结果" prop="xjResult">
-          <el-input v-model="form.xjResult" placeholder="请输入巡检结果" />
-        </el-form-item>
-        <el-form-item label="巡检说明" prop="xjExplain">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="资产设备" prop="zcName">
+              <el-input readonly v-if="!form.id"
+                        placeholder="请选择资产设备"
+                        v-model="form.zcName">
+                <el-button slot="append" icon="el-icon-search" @click="zcQuery"></el-button>
+              </el-input>
+
+              <el-input v-if="form.id" v-model="form.zcName" placeholder="请选择资产设备" disabled/>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属网格" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入所属网格" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <el-form-item label="巡检标题" prop="title">
+              <el-input v-model="form.title" placeholder="请输入巡检标题" :disabled="form.id ? true : false"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="开始时间" prop="xjStart">
+              <el-date-picker clearable style="width: 100%" :disabled="form.id ? true : false"
+                              v-model="form.xjStart"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择开始时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="结束时间" prop="xjEnd">
+              <el-date-picker clearable style="width: 100%" :disabled="form.id ? true : false"
+                              v-model="form.xjEnd"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择结束时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10" v-if="form.id">
+          <el-col :span="12">
+            <el-form-item label="巡检人" prop="xjName">
+              <el-input v-model="form.xjName" placeholder="请输入巡检人"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="巡检人电话" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入巡检人电话"/>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row :gutter="10" v-if="form.id">
+          <el-col :span="12">
+            <el-form-item label="巡检日期" prop="xjDate">
+              <el-date-picker clearable style="width: 100%;"
+                              v-model="form.xjDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择巡检日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="巡检结果" prop="xjResult">
+              <el-radio-group v-model="form.xjResult">
+                <el-radio
+                  v-for="dict in dict.type.szxc_xj_result"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-form-item label="巡检说明" prop="xjExplain" v-if="form.id">
           <el-input v-model="form.xjExplain" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="巡检照片" prop="picture">
-          <el-input v-model="form.picture" placeholder="请输入巡检照片" />
+        <el-form-item label="巡检照片" prop="picture" v-if="form.id">
+          <image-upload v-model="form.picture"/>
         </el-form-item>
-        <el-form-item label="开始时间" prop="xjStart">
-          <el-date-picker clearable
-            v-model="form.xjStart"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择开始时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="xjEnd">
-          <el-date-picker clearable
-            v-model="form.xjEnd"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择结束时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="选择资产设施" :visible.sync="zcss.visible" width="900px" append-to-body>
+      <el-form :model="zcss.queryParams" ref="queryForm" size="small" :inline="true" label-width="70px">
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            v-model="zcss.queryParams.name"
+            placeholder="请输入姓名"
+            clearable
+            @keyup.enter.native="zcssQuery"
+          />
         </el-form-item>
-        <el-form-item label="所属网格" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="zcssQuery">搜索</el-button>
         </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+      </el-form>
+      <el-alert title="双击选择资产设施" type="warning" :closable="false"></el-alert>
+      <el-table v-loading="zcss.loading" :data="zcss.list" border @cell-dblclick="zcssDblclick">
+        <el-table-column label="所属网格" align="center" prop="deptName" />
+        <el-table-column label="资产名称" align="center" prop="zcName" />
+        <el-table-column label="资产类型" align="center" prop="zcType" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_zc_type" :value="scope.row.zcType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="安装时间" align="center" prop="installDate">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.installDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="负责人" align="center" prop="fzr" />
+        <el-table-column label="联系电话" align="center" prop="phone" />
+        <el-table-column label="详细地址" align="center" prop="address" />
+        <el-table-column label="资产照片" align="center" prop="picture" >
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.picture" :width="50" :height="50"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="zcss.total>0"
+        :total="zcss.total"
+        :page.sync="zcss.queryParams.pageNum"
+        :limit.sync="zcss.queryParams.pageSize"
+        @pagination="getlistZcss"
+      />
+    </el-dialog>
+
+    <!-- 资产设施巡检完成对话框 -->
+    <el-dialog title="完成" :visible.sync="wc_open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+
+        <el-form-item label="处理说明" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入处理说明"/>
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listZcssxj, getZcssxj, delZcssxj, addZcssxj, updateZcssxj } from "@/api/szxc/zcssxj";
+import { listZcss } from "@/api/szxc/zcss";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Zcssxj",
+  components: { Treeselect },
+  dicts: ['szxc_zc_type', 'szxc_zcssxj_staus', 'szxc_xj_result'],
   data() {
     return {
       // 遮罩层
@@ -308,11 +405,15 @@ export default {
       // 总条数
       total: 0,
       // 资产设施巡检表格数据
-      zcssxjList: [],
+      list: [],
+      // 组织树选项
+      deptOptions: undefined,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      // 完成
+      wc_open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -337,18 +438,78 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+        zcName: [
+          { required: true, message: "资产设备不能为空", trigger: "blur" }
+        ],
+        deptName: [
+          { required: true, message: "所属网格不能为空", trigger: "blur" }
+        ],
+        title: [
+          { required: true, message: "巡检标题不能为空", trigger: "blur" }
+        ],
+        xjName: [
+          { required: true, message: "巡检人不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "巡检人电话不能为空", trigger: "blur" }
+        ],
+        xjDate: [
+          { required: true, message: "巡检日期不能为空", trigger: "blur" }
+        ],
+        xjStart: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
+        xjEnd: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" }
+        ],
+        xjResult: [
+          { required: true, message: "巡检结果不能为空", trigger: "blur" }
+        ],
+        xjExplain: [
+          { required: true, message: "巡检说明不能为空", trigger: "blur" }
+        ],
+        picture: [
+          { required: true, message: "巡检照片不能为空", trigger: "blur" }
+        ],
+        remark: [
+          { required: true, message: "处理说明不能为空", trigger: "blur" }
+        ]
+      },
+      // 资产设施信息
+      zcss: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 总条数
+        total: 0,
+        // 查询参数
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10
+        },
+        // 查询列表
+        list: [],
+        // 选中数据
+        selectRow: null
+      },
     };
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    /** 查询组织下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
     /** 查询资产设施巡检列表 */
     getList() {
       this.loading = true;
       listZcssxj(this.queryParams).then(response => {
-        this.zcssxjList = response.rows;
+        this.list = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -356,6 +517,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.wc_open = false;
       this.reset();
     },
     // 表单重置
@@ -414,7 +576,7 @@ export default {
       getZcssxj(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改资产设施巡检";
+        this.title = "巡检登记";
       });
     },
     /** 提交按钮 */
@@ -422,12 +584,23 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+            if (this.form.xjResult==='0'){
+              this.form.xjStatus = '1'
+            }
+            if (this.form.xjResult==='1'){
+              this.form.xjStatus = '2'
+            }
+            if(this.form.xjStatus === '2' && this.wc_open){
+              this.form.xjStatus = '3'
+            }
             updateZcssxj(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.wc_open = false;
               this.getList();
             });
           } else {
+            this.form.xjStatus = '0';
             addZcssxj(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -452,6 +625,40 @@ export default {
       this.download('szxc/zcssxj/export', {
         ...this.queryParams
       }, `zcssxj_${new Date().getTime()}.xlsx`)
+    },
+    // 点击选择资产设施
+    zcQuery(){
+      this.zcss.visible = true;
+      this.getlistZcss()
+    },
+    /** 查询资产设施信息列表 */
+    getlistZcss() {
+      this.zcss.loading = true;
+      listZcss(this.zcss.queryParams).then(response => {
+        this.zcss.list = response.rows;
+        this.zcss.total = response.total;
+        this.zcss.loading = false;
+      });
+    },
+    // 资产设施信息查询
+    zcssQuery(){
+      this.zcss.queryParams.pageNum = 1;
+      this.getlistZcss();
+    },
+    // 资产设施选择 选中数据
+    zcssDblclick(row) {
+      this.zcss.selectRow = row;
+      this.form.zcssId = row.id;
+      this.form.zcName = row.zcName;
+      this.form.deptId = row.deptId;
+      this.form.deptName = row.deptName;
+      this.zcss.visible = false
+    },
+    // 去处理
+    handled(row){
+      this.reset();
+      this.wc_open = true;
+      this.form = row;
     }
   }
 };

From 4e8f3396bbec17d45c06810c3910611d444d9a7d Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Wed, 3 Apr 2024 16:31:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/szxc/lunbo/index.vue | 29 +++++++++++--------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/ruoyi-ui/src/views/szxc/lunbo/index.vue b/ruoyi-ui/src/views/szxc/lunbo/index.vue
index 9e8e99c..14ea563 100644
--- a/ruoyi-ui/src/views/szxc/lunbo/index.vue
+++ b/ruoyi-ui/src/views/szxc/lunbo/index.vue
@@ -9,14 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="图片地址" prop="picture">
-        <el-input
-          v-model="queryParams.picture"
-          placeholder="请输入图片地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -69,11 +61,15 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="lunboList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="lunboList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="图片地址" align="center" prop="picture" />
+      <el-table-column label="图片" align="center" prop="picture" >
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.picture" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
       <el-table-column label="简介" align="center" prop="content" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -95,7 +91,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -105,19 +101,19 @@
     />
 
     <!-- 添加或修改轮播设置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入标题" />
         </el-form-item>
-        <el-form-item label="图片地址" prop="picture">
-          <el-input v-model="form.picture" placeholder="请输入图片地址" />
+        <el-form-item label="图片" prop="picture">
+          <image-upload v-model="form.picture" limit="1"/>
         </el-form-item>
         <el-form-item label="简介">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -125,6 +121,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
   </div>
 </template>