From 7c1628187f7439f785ca70890866616ca30f190a Mon Sep 17 00:00:00 2001
From: 23688nl <329261568@qq.com>
Date: Fri, 22 Apr 2022 10:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/spaceDevice.js                    |   3 +-
 src/api/system/dept.js                        |   2 +-
 src/views/iot/alarm/record/index.vue          |   2 +-
 src/views/iot/alarm/waringRecord/index.vue    |   2 +-
 src/views/iot/device/index.vue                |   5 +-
 src/views/iot/ota/index.vue                   |   6 +-
 src/views/iot/project/index.vue               |   2 +-
 src/views/iot/project/profile/spaceDevice.vue |   3 +-
 src/views/power/examine/index.vue             | 152 +++++++++++++-----
 src/views/power/maintenance/index.vue         |  40 +++--
 src/views/power/mywork/details.vue            |   3 +-
 src/views/power/mywork/index.vue              |  16 +-
 src/views/system/tenant/profile/disRole.vue   |   5 +-
 src/views/tenant/circuitBreaker/index.vue     |   1 -
 14 files changed, 168 insertions(+), 74 deletions(-)

diff --git a/src/api/iot/spaceDevice.js b/src/api/iot/spaceDevice.js
index d2182715..fe4e8831 100644
--- a/src/api/iot/spaceDevice.js
+++ b/src/api/iot/spaceDevice.js
@@ -53,9 +53,10 @@ export function exportSpace_device(query) {
 }
 
 // 根据项目ID查询项目下所有设备
-export function listProjectDevice() {
+export function listProjectDevice(data) {
   return request({
       url: '/iot/space_device/not-used',
       method: 'get',
+      params: data
   })
 }
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 1365f359..0507627e 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -35,7 +35,7 @@ export function treeselect() {
 }
 
 // 根据角色ID查询部门树结构
-export function roleDeptTreeselect(roleId, tenantId) {
+export function roleDeptTree(roleId, tenantId) {
   let reqUrl =  tenantId ? '/' + tenantId + '/' : '/'
   return request({
     url: '/system/dept/roleDeptTreeselect' + reqUrl + roleId,
diff --git a/src/views/iot/alarm/record/index.vue b/src/views/iot/alarm/record/index.vue
index b71aa1a3..18ca6713 100644
--- a/src/views/iot/alarm/record/index.vue
+++ b/src/views/iot/alarm/record/index.vue
@@ -241,7 +241,7 @@ export default {
         })
         .then(() => {
           this.msgSuccess("创建成功！");
-          this.$router.push("/power/maintenancet");
+          this.$router.push("/power/maintenance");
         });
     },
     sortChange(column) {
diff --git a/src/views/iot/alarm/waringRecord/index.vue b/src/views/iot/alarm/waringRecord/index.vue
index b7d3c9a5..f536090c 100644
--- a/src/views/iot/alarm/waringRecord/index.vue
+++ b/src/views/iot/alarm/waringRecord/index.vue
@@ -184,7 +184,7 @@ export default {
         })
         .then(() => {
           this.msgSuccess("创建成功！");
-          this.$router.push("/power/maintenancet");
+          this.$router.push("/power/maintenance");
         });
     },
     sortChange(column) {
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 39e6f97a..fa86e6e0 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -556,9 +556,8 @@ export default {
           labelWidth: "68px",
           params: {
             deviceName: "",
-            modelId: "",
-            parentId: 0,
-            deviceType: ""
+            deviceType: "GATEWAY_CONTROLLER",
+            // parentId: '0'
           },
           page: {
             pageSize: 10,
diff --git a/src/views/iot/ota/index.vue b/src/views/iot/ota/index.vue
index c44f3b12..e089ea4b 100644
--- a/src/views/iot/ota/index.vue
+++ b/src/views/iot/ota/index.vue
@@ -82,17 +82,17 @@
         :index="indexFormatter"
         width="80px"
       ></el-table-column>
-      <el-table-column label="型号" align="laft" width="200" prop="modelName" />
+      <el-table-column label="型号" align="laft" width="150" prop="modelName" />
       <el-table-column
         label="固件版本"
         align="center"
-        width="160"
+        width="120"
         prop="otaVersion"
       />
       <el-table-column
         label="固件大小"
         align="center"
-        width="160"
+        width="120"
         prop="otaSize"
       />
       <el-table-column label="升级地址" align="left" prop="otaUrl">
diff --git a/src/views/iot/project/index.vue b/src/views/iot/project/index.vue
index 6be81224..9beda1c8 100644
--- a/src/views/iot/project/index.vue
+++ b/src/views/iot/project/index.vue
@@ -240,7 +240,7 @@
           </el-row>
 
           <el-form-item label="总路设备:" >
-            <el-input v-model="form.projectDeviceName" suffix-icon="el-icon-caret-bottom"  @focus="openTableSelectDialog()" placeholder="请输入电价合同" />
+            <el-input v-model="form.projectDeviceName" suffix-icon="el-icon-caret-bottom"  @focus="openTableSelectDialog()" placeholder="请输入总路设备" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
diff --git a/src/views/iot/project/profile/spaceDevice.vue b/src/views/iot/project/profile/spaceDevice.vue
index 7df42956..ff18ca74 100644
--- a/src/views/iot/project/profile/spaceDevice.vue
+++ b/src/views/iot/project/profile/spaceDevice.vue
@@ -250,7 +250,8 @@ export default {
       this.selectTableShow = true;
     },
     childGetList(data) {
-      listProjectDevice().then(response => {
+      console.log(data.param)
+      listProjectDevice(data.param).then(response => {
         this.tableSelectOption.tableList = response.data;
         // this.tableSelectOption.queryOpt.page.total = Number(response.total);
       });
diff --git a/src/views/power/examine/index.vue b/src/views/power/examine/index.vue
index 6aabab89..cfa4a861 100644
--- a/src/views/power/examine/index.vue
+++ b/src/views/power/examine/index.vue
@@ -18,7 +18,12 @@
       </el-form-item>
 
       <el-form-item label="故障类型" prop="faultType">
-        <el-select v-model="queryParams.faultType" placeholder="请选择故障类型" clearable size="small">
+        <el-select
+          v-model="queryParams.faultType"
+          placeholder="请选择故障类型"
+          clearable
+          size="small"
+        >
           <el-option
             v-for="dict in faultTypeOptions"
             :key="dict.dictValue"
@@ -28,7 +33,7 @@
         </el-select>
       </el-form-item>
 
-       <el-form-item label="上报人" prop="reporterName">
+      <el-form-item label="上报人" prop="reporterName">
         <el-input
           v-model="queryParams.reporterName"
           placeholder="请输入上报人名称"
@@ -49,8 +54,16 @@
       </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>
+        <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
+        >
       </el-form-item>
     </el-form>
 
@@ -68,12 +81,22 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>-->
 
-    <el-table v-loading="loading" :data="nodeList" :default-sort="{ prop: 'handleTime', order: 'descending' }"
-      @sort-change="sortChange">
-      <el-table-column type="index" label="序号" align="center" :index="indexFormatter" width="80px"></el-table-column>
+    <el-table
+      v-loading="loading"
+      :data="nodeList"
+      :default-sort="{ prop: 'handleTime', order: 'descending' }"
+      @sort-change="sortChange"
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        align="center"
+        :index="indexFormatter"
+        width="80px"
+      ></el-table-column>
       <!-- <el-table-column label="审核节点ID" align="center" prop="nodeId" /> -->
-      <el-table-column label="项目名称" align="left" prop="projectName"/>
-      <el-table-column label="项目地址" align="left" prop="projectAddress"/>
+      <el-table-column label="项目名称" align="left" prop="projectName" />
+      <el-table-column label="项目地址" align="left" prop="projectAddress" />
       <el-table-column label="设备名称" align="left" prop="deviceName" />
       <el-table-column
         sortable="custom"
@@ -85,10 +108,25 @@
       />
       <el-table-column label="上报人" align="left" prop="reporterName" />
       <el-table-column label="处理人" align="left" prop="handlerName" />
-      <el-table-column label="工作内容" align="left" prop="maintenanceContext" />
-      <el-table-column label="处理时间" align="center" sortable="custom" prop="handleTime" width="120">
+      <el-table-column label="工作内容" align="left" prop="maintenanceContext">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.handleTime, '{y}-{m}-{d}') }}</span>
+          <span
+            class="lay-table-textarea"
+            :title="scope.row.maintenanceContext"
+          >
+            {{ scope.row.maintenanceContext }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="处理时间"
+        align="center"
+        sortable="custom"
+        prop="handleTime"
+        width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.handleTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
 
@@ -97,15 +135,27 @@
           <span>{{ workStateList[scope.row.workOrderStatus] }}</span>
         </template>
       </el-table-column>-->
-      <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        width="250"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handelDetailExamine(scope.row)"
-          >工单审核</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">通过</el-button>
+            >工单审核</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            >通过</el-button
+          >
           <!-- <el-button
             size="mini"
             type="text"
@@ -117,7 +167,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -141,12 +191,20 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="审核意见:" prop="auditOpinion">
-            <el-input v-model="form.auditOpinion" type="textarea" :rows="2" placeholder="请输入审核意见" />
+            <el-input
+              v-model="form.auditOpinion"
+              type="textarea"
+              maxlength="150"
+              :rows="2"
+              placeholder="请输入审核意见"
+            />
           </el-form-item>
         </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="mini" type="primary" @click="submitForm">确 定</el-button>
+        <el-button size="mini" type="primary" @click="submitForm"
+          >确 定</el-button
+        >
         <el-button size="mini" @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -165,25 +223,39 @@
       <el-divider content-position="left">审核信息</el-divider>
       <el-form>
         <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-          <el-form-item label="审核结果:" prop="auditResult" >
-            <el-radio-group v-model="form.auditResult" @change="auditResultChange">
+          <el-form-item label="审核结果:" prop="auditResult">
+            <el-radio-group
+              v-model="form.auditResult"
+              @change="auditResultChange"
+            >
               <el-radio label="通过">通过</el-radio>
               <el-radio label="不通过">不通过</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="退回节点:" v-if="form.auditResult === '不通过'" prop="maintenanceStatus">
+          <el-form-item
+            label="退回节点:"
+            v-if="form.auditResult === '不通过'"
+            prop="maintenanceStatus"
+          >
             <el-radio-group v-model="form.maintenanceStatus">
               <el-radio label="4">退回处理</el-radio>
               <el-radio label="1">退回上报</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="审核意见:" prop="auditOpinion">
-            <el-input v-model="form.auditOpinion" type="textarea" :rows="2" placeholder="请输入审核意见" />
+            <el-input
+              v-model="form.auditOpinion"
+              type="textarea"
+              :rows="2"
+              placeholder="请输入审核意见"
+            />
           </el-form-item>
         </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="mini" type="primary" @click="submitForm">确 定</el-button>
+        <el-button size="mini" type="primary" @click="submitForm"
+          >确 定</el-button
+        >
         <el-button size="mini" @click="openDetails = false">取 消</el-button>
       </div>
     </el-dialog>
@@ -198,7 +270,7 @@ import PowerDetailsWrap from "../mywork/details";
 export default {
   name: "Node",
   components: {
-    PowerDetailsWrap
+    PowerDetailsWrap,
   },
   data() {
     return {
@@ -229,27 +301,27 @@ export default {
         auditorName: null,
         auditTime: null,
         auditResult: null,
-        auditOpinion: null
+        auditOpinion: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         auditResult: [
-          { required: true, message: "审核结果不能为空", trigger: "blur" }
+          { required: true, message: "审核结果不能为空", trigger: "blur" },
         ],
         maintenanceStatus: [
-          { required: true, message: "退回节点不能为空", trigger: "blur" }
-        ]
+          { required: true, message: "退回节点不能为空", trigger: "blur" },
+        ],
       },
       workDetails: {},
       openDetails: false,
-      faultTypeOptions: []
+      faultTypeOptions: [],
     };
   },
   created() {
     // 获取故障类型（字典）
-    this.getDicts("fault_type").then(response => {
+    this.getDicts("fault_type").then((response) => {
       this.faultTypeOptions = response.data;
     });
     this.getList();
@@ -283,7 +355,7 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.maintenanceStatus = "3";
-      listMaintenance(this.queryParams).then(response => {
+      listMaintenance(this.queryParams).then((response) => {
         this.nodeList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -302,7 +374,7 @@ export default {
         auditResult: "通过",
         auditOpinion: null,
         remark: null,
-        maintenanceStatus: "5"
+        maintenanceStatus: "5",
       };
       this.resetForm("form");
     },
@@ -318,7 +390,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.nodeId);
+      this.ids = selection.map((item) => item.nodeId);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -333,19 +405,19 @@ export default {
       this.workDetails = row;
       this.reset();
       this.title = "工单审核";
-      this.form.auditResult = '通过';
+      this.form.auditResult = "通过";
       this.open = true;
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           this.form.maintenanceId = this.workDetails.maintenanceId;
-          addNode(this.form).then(response => {
+          addNode(this.form).then((response) => {
             updateMaintenance({
               maintenanceId: this.workDetails.maintenanceId,
-              maintenanceStatus: this.form.maintenanceStatus
-            }).then(response => {
+              maintenanceStatus: this.form.maintenanceStatus,
+            }).then((response) => {
               this.msgSuccess("请求成功");
               this.openDetails = false;
               this.open = false;
@@ -354,8 +426,8 @@ export default {
           });
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss">
diff --git a/src/views/power/maintenance/index.vue b/src/views/power/maintenance/index.vue
index ee5d7e81..9c191686 100644
--- a/src/views/power/maintenance/index.vue
+++ b/src/views/power/maintenance/index.vue
@@ -102,7 +102,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['iot:maintenance:add']"
-          >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -121,8 +122,12 @@
       ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="maintenanceList" :default-sort="{ prop: 'createTime', order: 'descending' }"
-      @sort-change="sortChange">
+    <el-table
+      v-loading="loading"
+      :data="maintenanceList"
+      :default-sort="{ prop: 'createTime', order: 'descending' }"
+      @sort-change="sortChange"
+    >
       <el-table-column
         type="index"
         label="序号"
@@ -131,7 +136,13 @@
         width="80px"
       ></el-table-column>
       <el-table-column label="项目名称" align="left" prop="projectName" />
-      <el-table-column label="项目地址" align="left" prop="projectAddress" />
+      <el-table-column label="项目地址" align="left" prop="projectAddress">
+        <template slot-scope="scope">
+          <span class="lay-table-textarea" :title="scope.row.projectAddress">
+            {{ scope.row.projectAddress }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="设备名称" align="left" prop="deviceName" />
       <el-table-column
         label="故障类型"
@@ -143,11 +154,13 @@
       />
       <el-table-column label="上报人" align="left" prop="reporterName" />
       <el-table-column label="处理人" align="left" prop="handlerName" />
-      <el-table-column
-        label="工作内容"
-        align="left"
-        prop="maintenanceContext"
-      />
+      <el-table-column label="工作内容" align="left" prop="maintenanceContext">
+        <template slot-scope="scope">
+          <span class="lay-table-textarea" :title="scope.row.maintenanceContext">
+            {{ scope.row.maintenanceContext }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="上报时间"
         align="left"
@@ -178,7 +191,7 @@
         prop="maintenanceStatus"
       >
         <template slot-scope="scope">
-           <el-tag
+          <el-tag
             v-if="scope.row.maintenanceStatus === '-1'"
             type="info"
             effect="plain"
@@ -302,6 +315,7 @@
           <el-input
             v-model="form.maintenanceContext"
             type="textarea"
+            maxlength="200"
             placeholder="请输入内容"
           />
         </el-form-item>
@@ -482,7 +496,7 @@ export default {
     },
     // 查看详情
     handleDetails(row) {
-      console.log('handleDetail:', row)
+      console.log("handleDetail:", row);
       this.workDetails = row;
       this.openDestail = true;
     },
@@ -606,7 +620,7 @@ export default {
     },
     // 获取 工单 处理人列表
     gdListUser() {
-      gdListUser().then(response => {
+      gdListUser().then((response) => {
         this.gdUserList = response.data;
       });
     },
@@ -615,7 +629,7 @@ export default {
       var userList = [];
       var _this = this;
       listUser().then((response) => {
-        debugger
+        debugger;
         userList = response.rows;
         if (userList) {
           userList.forEach((v) => {
diff --git a/src/views/power/mywork/details.vue b/src/views/power/mywork/details.vue
index fc4f9a9b..097fa945 100644
--- a/src/views/power/mywork/details.vue
+++ b/src/views/power/mywork/details.vue
@@ -42,7 +42,7 @@
         <el-col :span="12">
           <div class="item-block">
             <span>故障类型：</span>
-            <span >{{ fanltTypeList[workDetails["faultType"]]  || workDetails['faultTypeName']}}</span>
+            <span >{{ workDetails['faultTypeName']}}</span>
           </div>
         </el-col>
       </el-row>
@@ -452,6 +452,7 @@
               type="textarea"
               :autosize="{ minRows: 2, maxRows: 5 }"
               placeholder
+              maxlength="150"
               v-model="form.advice"
             ></el-input>
           </el-form-item>
diff --git a/src/views/power/mywork/index.vue b/src/views/power/mywork/index.vue
index 8532306d..1e2b9067 100644
--- a/src/views/power/mywork/index.vue
+++ b/src/views/power/mywork/index.vue
@@ -126,11 +126,16 @@
       />
       <el-table-column label="上报人" align="left" prop="reporterName" />
       <el-table-column label="处理人" align="left" prop="handlerName" />
-      <el-table-column
-        label="工作内容"
-        align="left"
-        prop="maintenanceContext"
-      />
+      <el-table-column label="工作内容" align="left" prop="maintenanceContext">
+        <template slot-scope="scope">
+          <span
+            class="lay-table-textarea"
+            :title="scope.row.maintenanceContext"
+          >
+            {{ scope.row.maintenanceContext }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="上报时间"
         align="left"
@@ -296,6 +301,7 @@
           <el-input
             v-model="form.maintenanceContext"
             type="textarea"
+            maxlength="200"
             placeholder="请输入内容"
           />
         </el-form-item>
diff --git a/src/views/system/tenant/profile/disRole.vue b/src/views/system/tenant/profile/disRole.vue
index 8d21a041..bbb329b3 100644
--- a/src/views/system/tenant/profile/disRole.vue
+++ b/src/views/system/tenant/profile/disRole.vue
@@ -287,7 +287,7 @@ import {
 } from "@/api/system/menu";
 import {
   treeselect as deptTreeselect,
-  roleDeptTreeselects
+  roleDeptTree
 } from "@/api/system/dept";
 import CompTree from "@/components/Tree/src/tree";
 
@@ -508,7 +508,7 @@ export default {
     },
     /** 根据角色ID查询部门树结构 */
     getRoleDeptTreeselect(roleId) {
-      roleDeptTreeselects({ roleId: roleId, tenantId: this.tenantId }).then(
+      roleDeptTree(roleId, this.tenantId).then(
         response => {
           this.deptOptions = response.depts;
           this.$refs.dept.setCheckedKeys(response.checkedKeys);
@@ -608,6 +608,7 @@ export default {
     /** 分配数据权限操作 */
     handleDataScope(row) {
       this.reset();
+      // this.getDeptTreeselect()
       this.$nextTick(() => {
         this.getRoleDeptTreeselect(row.roleId);
       });
diff --git a/src/views/tenant/circuitBreaker/index.vue b/src/views/tenant/circuitBreaker/index.vue
index c15418d5..d419858d 100644
--- a/src/views/tenant/circuitBreaker/index.vue
+++ b/src/views/tenant/circuitBreaker/index.vue
@@ -406,7 +406,6 @@ export default {
           params: {
             deviceName: "",
             modelId: "",
-            parentId: 0,
             deviceType: "GATEWAY_CONTROLLER"
           },
           page: {