From bf896dc786821aa8ecada163b704571a945d913a Mon Sep 17 00:00:00 2001
From: 00945 <1558175113@qq.com>
Date: Thu, 31 Mar 2022 14:17:32 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=B7=A5=E5=8D=95=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/power/examine/index.vue     |  2 ++
 src/views/power/maintenance/index.vue |  5 +++--
 src/views/power/mywork/details.vue    | 15 +++++++++++++++
 src/views/power/mywork/index.vue      | 22 ++++++++++++----------
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/views/power/examine/index.vue b/src/views/power/examine/index.vue
index 9834b62a..6aabab89 100644
--- a/src/views/power/examine/index.vue
+++ b/src/views/power/examine/index.vue
@@ -72,6 +72,8 @@
       @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="deviceName" />
       <el-table-column
         sortable="custom"
diff --git a/src/views/power/maintenance/index.vue b/src/views/power/maintenance/index.vue
index 07b09fc4..077b5dcd 100644
--- a/src/views/power/maintenance/index.vue
+++ b/src/views/power/maintenance/index.vue
@@ -102,8 +102,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['iot:maintenance:add']"
-          >新增</el-button
-        >
+          >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -131,6 +130,8 @@
         :index="indexFormatter"
         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="deviceName" />
       <el-table-column
         label="故障类型"
diff --git a/src/views/power/mywork/details.vue b/src/views/power/mywork/details.vue
index e38d4f22..c508c594 100644
--- a/src/views/power/mywork/details.vue
+++ b/src/views/power/mywork/details.vue
@@ -2,6 +2,21 @@
   <div class="maintennce-details" v-loading="loading">
     <el-divider content-position="left">工单信息</el-divider>
     <div class="info-wrap">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <div class="item-block">
+            <span>项目名称：</span>
+            <span>{{ workDetails.projectName }}</span>
+          </div>
+        </el-col>
+        <el-col :span="12">
+          <div class="item-block">
+            <span>项目地址：</span>
+            <span>{{ workDetails.projectAddress }}</span>
+          </div>
+        </el-col>
+      </el-row>
+
       <el-row :gutter="20">
         <el-col :span="12">
           <div class="item-block">
diff --git a/src/views/power/mywork/index.vue b/src/views/power/mywork/index.vue
index b0d08b8b..d7f85a4a 100644
--- a/src/views/power/mywork/index.vue
+++ b/src/views/power/mywork/index.vue
@@ -56,16 +56,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['iot:maintenance:add']"
-        >新增</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['iot:maintenance:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -82,6 +82,8 @@
     <el-table v-loading="loading" :data="maintenanceList" :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="项目名称" align="left" prop="projectName"/>
+      <el-table-column label="项目地址" align="left" prop="projectAddress"/>
       <el-table-column label="设备名称" align="left" prop="deviceName" />
       <el-table-column
         label="故障类型"