Merge branch 'master' of http://192.168.4.125:32792/04787/smart-power-ui

# Conflicts:
#	src/views/power/mywork/index.vue

.env.development

@@ -11,6 +11,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 port= 9988
 
 # 服务端地址
-// target = http://192.168.18.135:8899
+ target = http://192.168.18.134:8899
- target = http://192.168.18.139:8899
+ //target = http://192.168.18.139:8899
 // target = http://192.168.18.136:8899

src/api/alarm/record.js

@@ -51,3 +51,12 @@ export function exportRecord(query) {
         params: query
     })
 }
+
+// 新增报警记录
+export function addAlarmRecord(data) {
+  return request({
+      url: '/iot/maintenance/',
+      method: 'post',
+      data: data
+  })
+}

src/views/iot/alarm/record/index.vue

@@ -95,7 +95,9 @@
         width="150"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.alarmTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
+          <span>{{
+            parseTime(scope.row.alarmTime, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -119,7 +121,9 @@
         width="150"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.processTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
+          <span>{{
+            parseTime(scope.row.processTime, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -129,6 +133,31 @@
         prop="typeName"
       />
       <!-- <el-table-column label="类型编码" align="left" width="150px" prop="typeCode" /> -->
+      <el-table-column
+        label="操作"
+        width="150"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <!-- <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            v-show="scope.row.processStatus === '1'"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['iot:record:edit']"
+          >处理</el-button> -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleWork(scope.row)"
+            v-hasPermi="['iot:maintenance:add']"
+            >创建工单</el-button
+          >
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -142,7 +171,7 @@
 </template>
 
 <script>
-import { listRecord, getRecord, exportRecord } from "@/api/alarm/record";
+import { listRecord, getRecord, exportRecord, addAlarmRecord } from "@/api/alarm/record";
 import Editor from "@/components/Editor";
 
 export default {
@@ -191,6 +220,30 @@ export default {
     this.getList();
   },
   methods: {
+    // 转工单处理
+    handleWork(row) {
+      console.log('addWork:', row)
+      this.$confirm("是否创建告警工单?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return addAlarmRecord({
+            recordId: row.recordId, //告警记录id
+            deviceId: row.deviceId,
+            deviceName: row.deviceName,
+            faultType: "3", //固定
+            maintenanceStatus: "-1", //固定（工单已生成）
+            tenantId: null,
+            faultTypeName: "告警工单", //固定
+          });
+        })
+        .then(() => {
+          this.msgSuccess("创建成功！");
+          this.$router.push("/power/maintenancet");
+        });
+    },
     sortChange(column) {
       const sort = {
         isAsc: column.order === "descending" ? "desc" : "asc",

src/views/iot/alarm/waringRecord/index.vue

@@ -80,6 +80,31 @@
       </el-table-column>
       <el-table-column label="告警类型" align="left" width="150px" prop="typeName" />
       <!-- <el-table-column label="类型编码" align="left" width="150px" prop="typeCode" /> -->
+        <el-table-column
+        label="操作"
+        width="150"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <!-- <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            v-show="scope.row.processStatus === '1'"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['iot:record:edit']"
+          >处理</el-button> -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleWork(scope.row)"
+            v-hasPermi="['iot:maintenance:add']"
+            >创建工单</el-button
+          >
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -93,7 +118,7 @@
 </template>
 
 <script>
-import { listRecord, getRecord, exportRecord } from "@/api/alarm/record";
+import { listRecord, getRecord, exportRecord, addAlarmRecord } from "@/api/alarm/record";
 
 export default {
   name: "WarningRecord",
@@ -139,6 +164,29 @@ export default {
     this.getList();
   },
   methods: {
+    // 转工单处理
+    handleWork(row) {
+      this.$confirm("是否创建预警工单?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return addAlarmRecord({
+            recordId: row.recordId, //告警记录id
+            deviceId: row.deviceId,
+            deviceName: row.deviceName,
+            faultType: "4", //固定
+            maintenanceStatus: "-1", //固定（工单已生成）
+            tenantId: null,
+            faultTypeName: "预警工单", //固定
+          });
+        })
+        .then(() => {
+          this.msgSuccess("创建成功！");
+          this.$router.push("/power/maintenancet");
+        });
+    },
     sortChange(column) {
       const sort = {
         isAsc: column.order === "descending" ? "desc" : "asc",

src/views/power/maintenance/index.vue

@@ -121,7 +121,7 @@
       ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="maintenanceList" :default-sort="{ prop: 'handleTime', order: 'descending' }"
+    <el-table v-loading="loading" :data="maintenanceList" :default-sort="{ prop: 'createTime', order: 'descending' }"
       @sort-change="sortChange">
       <el-table-column
         type="index"
@@ -149,11 +149,22 @@
         prop="maintenanceContext"
       />
       <el-table-column
-        label="处理时间"
+        label="上报时间"
-        align="center"
+        align="left"
-        prop="handleTime"
+        prop="createTime"
         sortable="custom"
         width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="处理时间"
+        align="left"
+        prop="handleTime"
+        width="120"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.handleTime, "{y}-{m}-{d}") }}</span>
@@ -167,6 +178,13 @@
         prop="maintenanceStatus"
       >
         <template slot-scope="scope">
+           <el-tag
+            v-if="scope.row.maintenanceStatus === '-1'"
+            type="info"
+            effect="plain"
+          >
+            {{ workStateList[scope.row.maintenanceStatus] }}
+          </el-tag>
           <el-tag v-if="scope.row.maintenanceStatus === '0'" type="info">{{
             workStateList[scope.row.maintenanceStatus]
           }}</el-tag>
@@ -368,6 +386,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 // 工单状态(0:上报人创建工单 1:驳回上报人工单 2:处理人确认工单 3:处理人完成工单 4:驳回处理人工单 5:领导审批通过流程结束)
 const workStateList = {
+  "-1": "工单已生成",
   0: "工单已创建",
   1: "退回工单",
   2: "确认工单",

src/views/power/mywork/details.vue

@@ -21,13 +21,13 @@
         <el-col :span="12">
           <div class="item-block">
             <span>工单 I D ：</span>
-            <span>{{ workDetails['maintenanceId'] }}</span>
+            <span>{{ workDetails["maintenanceId"] }}</span>
           </div>
         </el-col>
         <el-col :span="12">
           <div class="item-block">
             <span>工单状态：</span>
-            <span>{{ workStateList[workDetails['maintenanceStatus']] }}</span>
+            <span>{{ workStateList[workDetails["maintenanceStatus"]] }}</span>
           </div>
         </el-col>
       </el-row>
@@ -36,13 +36,13 @@
         <el-col :span="12">
           <div class="item-block">
             <span>设备名称：</span>
-            <span>{{ workDetails['deviceName'] }}</span>
+            <span>{{ workDetails["deviceName"] }}</span>
           </div>
         </el-col>
         <el-col :span="12">
           <div class="item-block">
             <span>故障类型：</span>
-            <span>{{ fanltTypeList[workDetails['faultType']] }}</span>
+            <span >{{ fanltTypeList[workDetails["faultType"]]  || workDetails['faultTypeName']}}</span>
           </div>
         </el-col>
       </el-row>
@@ -160,7 +160,7 @@
                   border-radius: 3px;
                 "
                 :src="getIotFileUrl(val)"
-                v-for="(val) in pictures"
+                v-for="val in pictures"
                 :key="val"
               />
             </div>
@@ -169,45 +169,18 @@
       </el-row>
     </div>
 
-    <div
-      class="info-wrap feedback-wrap"
-      v-if="
-        showForm === '0' &&
-        (workDetails.maintenanceStatus === '-1')
-      "
-    >
-      <el-row :gutter="20">
-        <el-col :span="24">
-          <div class="item-block">
-            <span>处理人员：</span>
-            <!-- <span>{{ workDetails.handlerName }}</span> -->
-            <el-select
-              v-model="form.handlerId"
-              style="width: 100%"
-              placeholder="请选择处理人"
-            >
-              <el-option
-                v-for="item in handleUserList"
-                :key="item.userId"
-                :label="item.nickName"
-                :value="item.userId"
-              />
-            </el-select>
-          </div>
-        </el-col>
-      </el-row>
-    </div>
-
     <el-divider
       content-position="left"
       v-if="
-        workDetails.maintenanceStatus === '1' && workDetails.maintenanceNodeList.length > 0
+        workDetails.maintenanceStatus === '1' &&
+        workDetails.maintenanceNodeList.length > 0
       "
       >退回意见</el-divider
     >
     <div
       v-if="
-        workDetails.maintenanceStatus === '1' && workDetails.maintenanceNodeList.length > 0
+        workDetails.maintenanceStatus === '1' &&
+        workDetails.maintenanceNodeList.length > 0
       "
     >
       <el-card>
@@ -299,7 +272,8 @@
             workDetails.maintenanceStatus === '1') ||
           (workDetails.maintenanceStatus === '3' && showForm === '0') ||
           (workDetails.handlerId !== logUser &&
-            workDetails.maintenanceStatus === '4'))
+            workDetails.maintenanceStatus === '4') ||
+          (tempType !== 'workList' && workDetails.maintenanceStatus === '-1'))
       "
       >订单进程</el-divider
     >
@@ -314,7 +288,8 @@
             workDetails.maintenanceStatus === '1') ||
           (workDetails.maintenanceStatus === '3' && showForm === '0') ||
           (workDetails.handlerId !== logUser &&
-            workDetails.maintenanceStatus === '4'))
+            workDetails.maintenanceStatus === '4') ||
+          (workDetails.handlerId !== logUser && workDetails.maintenanceStatus === '-1'))
       "
     >
       <span
@@ -347,7 +322,7 @@
       <span
         style="margin-left: 20px; height: 50px; display: block"
         v-show="
-          workDetails.handlerId !== logUser &&
+          tempType !== 'workList' &&
           workDetails.maintenanceStatus === '-1'
         "
         v-text="'工单正在等待分配指定处理人...'"
@@ -367,6 +342,46 @@
       v-if="tempType === 'myWork' && expFromShow(workDetails)"
       >操作</el-divider
     >
+    <el-divider
+      content-position="left"
+      v-if="tempType === 'workList' && workDetails.maintenanceStatus === '-1'"
+      >操作</el-divider
+    >
+    <el-form
+      :model="form"
+      :rules="rules"
+      v-if="tempType === 'workList' && workDetails.maintenanceStatus === '-1'"
+      ref="ruleForm"
+      label-width="100px"
+      class="demo-ruleForm"
+      style="padding-right: 0;"
+    >
+      <el-form-item
+        label="处理人："
+        v-if="showForm === '0' && workDetails.maintenanceStatus === '-1'"
+        prop="name"
+      >
+        <el-select v-model="form.handlerId">
+          <el-option
+            v-for="docItem in handleUserList"
+            :key="docItem.userId"
+            :label="docItem.nickName"
+            :value="docItem.userId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <div class="form-submit-div">
+        <el-button
+          size="mini"
+          type="primary"
+          :disabled="!form.handlerId && form.handlerId !== 0"
+          v-if="showForm === '0' && workDetails.maintenanceStatus === '-1'"
+          @click="setHandleSubmit()"
+          >提交</el-button
+        >
+      </div>
+    </el-form>
     <el-form
       :model="form"
       :rules="rules"
@@ -504,6 +519,21 @@
         </div>
       </div>
 
+      <el-form-item
+        label="处理人："
+        v-if="showForm === '0' && workDetails.maintenanceStatus === '-1'"
+        prop="name"
+      >
+        <el-select v-model="form.handlerId">
+          <el-option
+            v-for="docItem in handleUserList"
+            :key="docItem.userId"
+            :label="docItem.nickName"
+            :value="docItem.userId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
       <div class="form-submit-div">
         <el-button
           type="primary"
@@ -544,6 +574,14 @@
           @click="handelComplete()"
           >处理完成</el-button
         >
+        <!-- <el-button
+          size="mini"
+          type="primary"
+          :disabled="!form.handlerId && form.handlerId !== 0"
+          v-if="showForm === '0' && workDetails.maintenanceStatus === '-1'"
+          @click="setHandleSubmit()"
+          >提交设置处理人</el-button
+        > -->
         <el-button
           size="mini"
           type="primary"
@@ -571,17 +609,23 @@
   </div>
 </template>
 <script>
-import { updateMaintenance, getMaintenance, getTenantHandleUser } from "@/api/power/maintenance";
+import {
+  updateMaintenance,
+  getMaintenance,
+  getTenantHandleUser,
+} from "@/api/power/maintenance";
 import { uploadFile } from "@/api/file";
 import { getIotFileUrl } from "@/utils/hciot";
 // 工单状态(0:工单已创建 1:工单执行中 2:工单审核失败 3:工单审核成功)
 const workStateList = {
+  "-1": "工单已生成",
   0: "工单已创建",
   1: "退回工单",
   2: "确认工单",
   3: "处理完成",
   4: "退回处理",
   5: "审核通过",
+  6: "暂缓处理",
 };
 // 故障类型(0:设备离线 1:设备超警)
 const fanltTypeList = {
@@ -614,7 +658,7 @@ export default {
       pictures: [],
       dialogVisible: false,
       dialogImageUrl: "",
-      handleUserList: []
+      handleUserList: [],
     };
   },
   created() {
@@ -628,13 +672,13 @@ export default {
     getHandleUser() {
       getTenantHandleUser({
         tenantId: this.$store.getters.tenantId,
-        pageNum: '1',
+        pageNum: "1",
-        pageSize: '9999',
+        pageSize: "9999",
-        orderByColumn: 'createTime',
+        orderByColumn: "createTime",
-        isAsc: 'desc'
+        isAsc: "desc",
-      }).then(res => {
+      }).then((res) => {
-        this.handleUserList = res.rows
+        this.handleUserList = res.rows;
-      })
+      });
     },
     // 限制图片大小和类型
     beforeAvatarUpload(file) {
@@ -696,8 +740,9 @@ export default {
       //     auditOpinion: '不合格通过！'
       //   }
       // ]
+      console.log(this.maintenanceId);
       getMaintenance(this.maintenanceId).then((response) => {
-        this.workDetails = response.data;
+        this.workDetails = response.data || {};
         this.newTemp();
         this.pictures = this.workDetails.scenePictures
           ? this.workDetails.scenePictures.split(",")
@@ -749,6 +794,20 @@ export default {
         }
       });
     },
+    // 提交 设置工单处理人
+    setHandleSubmit() {
+      // this.newTemp()
+      updateMaintenance({
+        handlerId: this.form.handlerId, //选择用户
+        maintenanceId: this.workDetails.maintenanceId, //工单id
+        maintenanceStatus: "0", //固定（工单已创建）
+      }).then((res) => {
+        if (res.code === 200) {
+          // this.workDetails = Object.assign(this.workDetails, this.form);
+          this.handleDetails();
+        }
+      });
+    },
     // 处理人完成工单
     handelComplete() {
       this.newTemp();
@@ -772,7 +831,13 @@ export default {
       });
     },
     expFromShow(row) {
-      if (row.reporterId === this.logUser && row.maintenanceStatus === "1") {
+      // if (row.maintenanceStatus === "-1") {
+      //   return true;
+      // } else
+       if (
+        row.reporterId === this.logUser &&
+        row.maintenanceStatus === "1"
+      ) {
         return true;
       } else if (
         row.handlerId === this.logUser &&

src/views/power/mywork/index.vue

@@ -17,7 +17,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"
@@ -46,26 +51,40 @@
           clearable
           size="small"
         >
-          <el-option :label="keys" :value="val" v-for="(keys, val) in workStateList" :key="keys" />
+          <el-option
+            :label="keys"
+            :value="val"
+            v-for="(keys, val) in workStateList"
+            :key="keys"
+          />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
+      <el-col :span="1.5">
-<!--        <el-button-->
+        <el-button
-<!--          type="primary"-->
+          type="primary"
-<!--          plain-->
+          plain
-<!--          icon="el-icon-plus"-->
+          icon="el-icon-plus"
-<!--          size="mini"-->
+          size="mini"
-<!--          @click="handleAdd"-->
+          @click="handleAdd"
-<!--          v-hasPermi="['iot:maintenance:add']"-->
+          v-hasPermi="['iot:maintenance:add']"
-<!--        >新增</el-button>-->
+          >新增</el-button
-<!--      </el-col>-->
+        >
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -74,16 +93,28 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['iot:maintenance:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="maintenanceList" :default-sort="{ prop: 'handleTime', order: 'descending' }"
+    <el-table
-      @sort-change="sortChange">
+      v-loading="loading"
-      <el-table-column type="index" label="序号" align="center" :index="indexFormatter" width="80px"></el-table-column>
+      :data="maintenanceList"
-      <el-table-column label="项目名称" align="left" prop="projectName"/>
+      :default-sort="{ prop: 'createTime', order: 'descending' }"
-      <el-table-column label="项目地址" align="left" prop="projectAddress"/>
+      @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="deviceName" />
       <el-table-column
         label="故障类型"
@@ -95,15 +126,48 @@
       />
       <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
-      <el-table-column label="处理时间" align="center" sortable="custom" prop="handleTime" width="120">
+        label="工作内容"
+        align="left"
+        prop="maintenanceContext"
+      />
+      <el-table-column
+        label="上报时间"
+        align="left"
+        prop="createTime"
+        sortable="custom"
+        width="120"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.handleTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="工单状态" align="center" width="120" prop="maintenanceStatus">
+      <el-table-column
+        label="处理时间"
+        align="left"
+        prop="handleTime"
+        width="120"
+      >
         <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.handleTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="工单状态"
+        align="center"
+        width="120"
+        prop="maintenanceStatus"
+      >
+        <template slot-scope="scope">
+          <el-tag
+            v-if="scope.row.maintenanceStatus === '-1'"
+            type="info"
+            effect="plain"
+          >
+            {{ workStateList[scope.row.maintenanceStatus] }}
+          </el-tag>
           <el-tag v-if="scope.row.maintenanceStatus === '0'" type="info">{{
             workStateList[scope.row.maintenanceStatus]
           }}</el-tag>
@@ -126,7 +190,12 @@
           >
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        width="200"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <!-- <el-button
             size="mini"
@@ -135,19 +204,22 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['iot:maintenance:edit']"
           >修改</el-button>-->
-          <el-button size="mini" type="text" @click="handleDetails(scope.row)">工单追踪</el-button>
+          <el-button size="mini" type="text" @click="handleDetails(scope.row)"
+            >工单追踪</el-button
+          >
           <el-button
             size="mini"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['iot:maintenance:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -155,13 +227,27 @@
     />
 
     <!-- 添加或修改工单信息对话框 -->
-    <el-dialog class="eldialog-wrap" :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px">
+    <el-dialog
+      class="eldialog-wrap"
+      :close-on-click-modal="false"
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="设备名称" prop="deviceName">
-          <el-input v-model="form.deviceName" @focus="openTableSelectDialog" placeholder="请输入设备名称" />
+          <el-input
+            v-model="form.deviceName"
+            @focus="openTableSelectDialog"
+            placeholder="请输入设备名称"
+          />
         </el-form-item>
         <el-form-item label="故障类型" prop="faultType">
-          <el-select v-model="form.faultType" style="width: 100%;" placeholder="请选择故障类型">
+          <el-select
+            v-model="form.faultType"
+            style="width: 100%"
+            placeholder="请选择故障类型"
+          >
             <el-option
               v-for="dict in faultTypeOptions"
               :key="dict.dictValue"
@@ -207,11 +293,17 @@
         </el-form-item>
 
         <el-form-item label="工作内容" prop="maintenanceContext">
-          <el-input v-model="form.maintenanceContext" type="textarea" placeholder="请输入内容" />
+          <el-input
+            v-model="form.maintenanceContext"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
       </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>
@@ -235,8 +327,18 @@
       />
 
       <div slot="footer" class="dialog-footer">
-        <el-button size="mini" type="primary" @click="resuleClick">确 定</el-button>
+        <el-button size="mini" type="primary" @click="resuleClick"
-        <el-button size="mini" @click="() =>{selectTableShow = false}">取 消</el-button>
+          >确 定</el-button
+        >
+        <el-button
+          size="mini"
+          @click="
+            () => {
+              selectTableShow = false;
+            }
+          "
+          >取 消</el-button
+        >
       </div>
     </el-dialog>
 
@@ -267,7 +369,7 @@ import {
   delMaintenance,
   addMaintenance,
   updateMaintenance,
-  exportMaintenance
+  exportMaintenance,
 } from "@/api/power/maintenance";
 import { listDevice } from "@/api/iot/device";
 import { listUser, gdListUser } from "@/api/system/user";
@@ -279,12 +381,13 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 // 工单状态(0:上报人创建工单 1:驳回上报人工单 2:处理人确认工单 3:处理人完成工单 4:驳回处理人工单 5:领导审批通过流程结束)
 const workStateList = {
-  "0": "工单已创建",
+  "-1": "工单已生成",
-  "1": "退回工单",
+  0: "工单已创建",
-  "2": "确认工单",
+  1: "退回工单",
-  "3": "处理完成",
+  2: "确认工单",
-  "4": "退回处理",
+  3: "处理完成",
-  "5": "审核通过"
+  4: "退回处理",
+  5: "审核通过",
 };
 
 export default {
@@ -292,7 +395,7 @@ export default {
   components: {
     Treeselect,
     SelectTableWrap,
-    DetailsWrap
+    DetailsWrap,
   },
   data() {
     return {
@@ -338,19 +441,19 @@ export default {
         scenePictures: null,
         feedbackInformation: null,
         advice: null,
-        maintenanceStatus: null
+        maintenanceStatus: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {},
       deptOptions: [],
-      gdUserList: []
+      gdUserList: [],
     };
   },
   created() {
     // 获取故障类型（字典）
-    this.getDicts("fault_type").then(response => {
+    this.getDicts("fault_type").then((response) => {
       this.faultTypeOptions = response.data;
     });
     this.getList();
@@ -359,7 +462,7 @@ export default {
   methods: {
     // 获取 工单 处理人列表
     gdListUser() {
-      gdListUser().then(response => {
+      gdListUser().then((response) => {
         this.gdUserList = response.data;
       });
     },
@@ -384,7 +487,7 @@ export default {
       this.selectResult = {};
       this.tableSelectOption = {
         otherOption: {
-          tableType: "device"
+          tableType: "device",
         },
         queryOpt: {
           disable: false,
@@ -393,12 +496,12 @@ export default {
             deviceName: "",
             modelId: "",
             parentId: 0,
-            deviceType: ""
+            deviceType: "",
           },
           page: {
             pageSize: 10,
             pageNum: 1,
-            total: 0
+            total: 0,
           },
           inline: true,
           queryChilds: [
@@ -410,9 +513,9 @@ export default {
               type: "input",
               key: "deviceName",
               size: "small",
-              value: ""
+              value: "",
-            }
+            },
-          ]
+          ],
         },
         tableOpt: {
           loading: false,
@@ -428,7 +531,7 @@ export default {
               align: "left",
               width: "",
               "show-overflow-tooltip": false,
-              tempType: "span"
+              tempType: "span",
             },
             {
               style: "",
@@ -438,7 +541,7 @@ export default {
               align: "left",
               width: "",
               "show-overflow-tooltip": false,
-              tempType: "span"
+              tempType: "span",
             },
             {
               style: "",
@@ -448,7 +551,7 @@ export default {
               align: "left",
               width: "",
               "show-overflow-tooltip": false,
-              tempType: "span"
+              tempType: "span",
             },
             {
               style: "",
@@ -458,21 +561,21 @@ export default {
               align: "center",
               width: "160",
               "show-overflow-tooltip": false,
-              tempType: "span"
+              tempType: "span",
-            }
+            },
           ],
           tableList: {
-            type: Array
+            type: Array,
-          }
+          },
         },
-        tableList: []
+        tableList: [],
       };
       this.selectTableShow = true;
     },
     // 查询回调
     childGetList(data) {
       listDevice(Object.assign(data.page, data.param, { selected: 1 })).then(
-        response => {
+        (response) => {
           this.tableSelectOption.tableList = response.rows;
           this.tableSelectOption.queryOpt.page.total = Number(response.total);
         }
@@ -500,10 +603,10 @@ export default {
     getUserList(data) {
       var userList = [];
       var _this = this;
-      listUser().then(response => {
+      listUser().then((response) => {
         userList = response.rows;
         if (userList) {
-          userList.forEach(v => {
+          userList.forEach((v) => {
             if (v.deptId) {
               let deptId = v.deptId;
               v.deptId = v.userId;
@@ -517,7 +620,7 @@ export default {
     },
     /** 查询部门人员列表 */
     getTreeselect() {
-      listDept({ pageNum: 1, pageSize: 99999 }).then(response => {
+      listDept({ pageNum: 1, pageSize: 99999 }).then((response) => {
         this.getUserList(response.data);
       });
     },
@@ -528,7 +631,7 @@ export default {
       return {
         id: node.deptId,
         label: node.deptName ? node.deptName : node.nickName,
-        children: node.children
+        children: node.children,
       };
     },
     treeselect(node, instanceId) {
@@ -546,7 +649,7 @@ export default {
     /** 查询工单信息列表 */
     getList() {
       this.loading = true;
-      myListMaintenance(this.queryParams).then(response => {
+      myListMaintenance(this.queryParams).then((response) => {
         this.maintenanceList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -580,7 +683,7 @@ export default {
         createTime: null,
         updateId: null,
         updateTime: null,
-        remark: null
+        remark: null,
       };
       this.resetForm("form");
     },
@@ -596,14 +699,14 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.maintenanceId);
+      this.ids = selection.map((item) => item.maintenanceId);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.gdListUser()
+      this.gdListUser();
       this.form.reporterName = this.$store.getters.name;
       this.form.reporterId = this.$store.getters.userId;
       this.open = true;
@@ -613,7 +716,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const maintenanceId = row.maintenanceId || this.ids;
-      getMaintenance(maintenanceId).then(response => {
+      getMaintenance(maintenanceId).then((response) => {
         this.gdListUser();
         this.form = response.data;
         this.open = true;
@@ -624,16 +727,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.maintenanceId != null) {
-            updateMaintenance(this.form).then(response => {
+            updateMaintenance(this.form).then((response) => {
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addMaintenance(this.form).then(response => {
+            addMaintenance(this.form).then((response) => {
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -648,9 +751,9 @@ export default {
       this.$confirm("是否删除该选项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
-        .then(function() {
+        .then(function () {
           return delMaintenance(maintenanceIds);
         })
         .then(() => {
@@ -664,16 +767,16 @@ export default {
       this.$confirm("是否确认导出所有工单信息数据项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
-        .then(function() {
+        .then(function () {
           return exportMaintenance(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.download(response.msg);
         });
-    }
+    },
-  }
+  },
 };
 </script>
 <style lang="scss">

src/views/tenant/alarm/record.vue

@@ -307,19 +307,26 @@ export default {
     // 转工单处理
     handleWork(row) {
       console.log('addWork:', row)
-      let param = {
+      this.$confirm("是否创建告警工单?", "提示", {
-        "recordId": row.recordId,//告警记录id
+        confirmButtonText: "确定",
-        "deviceId": row.deviceId,
+        cancelButtonText: "取消",
-        "deviceName": row.deviceName,
+        type: "warning",
-        "faultType": "3",//固定
-        "maintenanceStatus": "-1",//固定（工单已生成）
-        "tenantId": null,
-        "faultTypeName": "告警工单"//固定
-      }
-      addAlarmRecord(param).then(res => {
-        this.msgSuccess("创建成功！");
-        this.$router.push('/power/maintenancet')
       })
+        .then(function () {
+          return addAlarmRecord({
+            recordId: row.recordId, //告警记录id
+            deviceId: row.deviceId,
+            deviceName: row.deviceName,
+            faultType: "3", //固定
+            maintenanceStatus: "-1", //固定（工单已生成）
+            tenantId: null,
+            faultTypeName: "告警工单", //固定
+          });
+        })
+        .then(() => {
+          this.msgSuccess("创建成功！");
+          this.$router.push("/power/maintenancet");
+        });
     },
     // 处理告警
     handleUpdate(row) {

src/views/tenant/alarm/warning.vue

@@ -124,7 +124,12 @@
         width="200px"
         prop="typeName"
       />
-      <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        width="200"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <!-- <el-button
             size="mini"
@@ -140,7 +145,8 @@
             icon="el-icon-edit"
             @click="handleWork(scope.row)"
             v-hasPermi="['iot:maintenance:add']"
-          >创建工单</el-button>
+            >创建工单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -192,7 +198,7 @@ import {
   exportRecord,
   updateRecord,
   delRecord,
-  addAlarmRecord
+  addAlarmRecord,
 } from "@/api/alarm/tenantAlarm";
 import Editor from "@/components/Editor";
 
@@ -299,20 +305,27 @@ export default {
     },
     // 转工单处理
     handleWork(row) {
-      console.log('addWork:', row)
+      console.log("addWork:", row);
-      let param = {
+      this.$confirm("是否创建预警工单?", "提示", {
-        "recordId": row.recordId,//告警记录id
+        confirmButtonText: "确定",
-        "deviceId": row.deviceId,
+        cancelButtonText: "取消",
-        "deviceName": row.deviceName,
+        type: "warning",
-        "faultType": "3",//固定
-        "maintenanceStatus": "-1",//固定（工单已生成）
-        "tenantId": null,
-        "faultTypeName": "告警工单"//固定
-      }
-      addAlarmRecord(param).then(res => {
-        this.msgSuccess("创建成功！");
-        this.$router.push('/power/maintenancet')
       })
+        .then(function () {
+          return addAlarmRecord({
+            recordId: row.recordId, //告警记录id
+            deviceId: row.deviceId,
+            deviceName: row.deviceName,
+            faultType: "4", //固定
+            maintenanceStatus: "-1", //固定（工单已生成）
+            tenantId: null,
+            faultTypeName: "预警工单", //固定
+          });
+        })
+        .then(() => {
+          this.msgSuccess("创建成功！");
+          this.$router.push("/power/maintenancet");
+        });
     },
     // 处理预警
     handleUpdate(row) {