diff --git a/src/api/iot/deviceOta.js b/src/api/iot/deviceOta.js
new file mode 100644
index 00000000..8e193a38
--- /dev/null
+++ b/src/api/iot/deviceOta.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询固件版本列表
+export function listOta(query) {
+    return request({
+        url: '/iot/ota/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询固件版本详细
+export function getOta(otaId) {
+    return request({
+        url: '/iot/ota/' + otaId,
+        method: 'get'
+    })
+}
+
+// 新增固件版本
+export function addOta(data) {
+    return request({
+        url: '/iot/ota',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改固件版本
+export function updateOta(data) {
+    return request({
+        url: '/iot/ota',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除固件版本
+export function delOta(otaId) {
+    return request({
+        url: '/iot/ota/' + otaId,
+        method: 'delete'
+    })
+}
+
+// 导出固件版本
+export function exportOta(query) {
+    return request({
+        url: '/iot/ota/export',
+        method: 'get',
+        params: query
+    })
+}
+
+// 新增固件版本
+export function upgradeOta(data) {
+  return request({
+      url: '/iot/ota/upgrade',
+      method: 'post',
+      data: data
+  })
+}
diff --git a/src/api/iot/library.js b/src/api/iot/library.js
index e872af3f..e985f804 100644
--- a/src/api/iot/library.js
+++ b/src/api/iot/library.js
@@ -52,6 +52,16 @@ export function exportLibrary(query) {
     })
 }
 
+// 导出硬件数据库 /csv
+export function exportLibraryCsv(query) {
+  return request({
+      url: '/iot/library/export/csv',
+      method: 'get',
+      params: query
+  })
+}
+
+
 // 下载用户导入模板
 export function importTemplate() {
   return request({
diff --git a/src/api/power/maintenance.js b/src/api/power/maintenance.js
index 4119a69b..3996534a 100644
--- a/src/api/power/maintenance.js
+++ b/src/api/power/maintenance.js
@@ -9,6 +9,15 @@ export function listMaintenance(query) {
     })
 }
 
+// 查询工单信息列表
+export function myListMaintenance(query) {
+  return request({
+      url: '/iot/maintenance/my-list',
+      method: 'get',
+      params: query
+  })
+}
+
 // 查询工单信息详细
 export function getMaintenance(maintenanceId) {
     return request({
diff --git a/src/api/tenant/projectUser.js b/src/api/tenant/projectUser.js
index e014f0aa..5acf3a79 100644
--- a/src/api/tenant/projectUser.js
+++ b/src/api/tenant/projectUser.js
@@ -21,7 +21,7 @@ export function listProjectNotUsed(query) {
 // 新增项目用户
 export function addProjectUser(data) {
   return request({
-    url: "/tenant/project_user",
+    url: "/iot/project_user",
     method: "post",
     data: data
   });
diff --git a/src/config/env.js b/src/config/env.js
index 58e6bcb6..7dd81821 100644
--- a/src/config/env.js
+++ b/src/config/env.js
@@ -8,8 +8,10 @@ let iotWebSocketBaseUrl = ''
 let devLiveWebSocketBaseUrl = ''
 let sysWebSocket = 'ws://'
 let prodApi = '/prod-api';
+let wsProtocol = 'ws://';
 var hrefHost = window.location.host;
 let iotWebSocketAlarmBaseUrl = '';
+let httpProtocol = window.location.protocol;
 
 
 if (env.NODE_ENV == 'development') {
@@ -20,6 +22,9 @@ if (env.NODE_ENV == 'development') {
   // if (hrefHost.indexOf('.gkiiot.com') >= 0) {
   //   iotHost = 'iot.gkiiot.com'
   // }
+  if(httpProtocol.indexOf("https") > -1){
+    sysWebSocket = 'wss://';
+  }
 } else if(env.NODE_ENV == 'test') {
 }
 iotWebSocketAlarmBaseUrl = sysWebSocket + hrefHost  + ':8899/ws/alarm/live'
diff --git a/src/utils/hciot.js b/src/utils/hciot.js
index 865a2255..3693c9f7 100644
--- a/src/utils/hciot.js
+++ b/src/utils/hciot.js
@@ -159,6 +159,7 @@ export function getIotFileUrl(importUrl) {
 	if (importUrl.indexOf('http') === 0 || importUrl.indexOf('https') === 0) {
 		return importUrl;
 	} else if (importUrl.indexOf('/profile/upload/') === 0 || importUrl.indexOf('/profile/avatar/') === 0) {
+    console.log('baseUrl:', baseURL + importUrl);
 		return baseURL + importUrl;
 	} else if (importUrl.indexOf('data:image/') === 0 || importUrl.indexOf('/static/') === 0) {
 		return importUrl;
@@ -202,7 +203,7 @@ export const preventRepeatFu = (res) => {
 	if (res) {
 		loading = Loading.service({
 			lock: true,
-			text: '请求中。。。',
+			text: '请求中...',
 			spinner: 'el-icon-loading',
 			background: 'rgba(0, 0, 0, 0.7)'
 		});
@@ -231,3 +232,30 @@ export const pluginsCope = (value, _this) => {
 	);
 }
 
+/**
+ ** 文件流下载
+  ** data 文件流，fileName:文件名
+  ** 文件名从请求头headers获取,文件名这里按实际情况获取
+  */
+export const  downloadFile = (data, fileName) => {
+  if (!data) {
+    return;
+  }
+  let blob = new Blob([data], {
+    type:
+      "application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=utf-8"
+  });
+  let url = window.URL.createObjectURL(blob);
+  if ("download" in document.createElement("a")) {
+  const a = document.createElement("a");
+    a.href = url;
+    a.download = fileName;
+    a.style.display = "none";
+    document.body.appendChild(a);
+    a.click();
+    URL.revokeObjectURL(a.href);
+  document.body.removeChild(a);
+  } else {
+    navigator.msSaveBlob(blob, fileName);
+  }
+}
diff --git a/src/views/alarm/record/index.vue b/src/views/alarm/record/index.vue
index 29feb354..b71545f9 100644
--- a/src/views/alarm/record/index.vue
+++ b/src/views/alarm/record/index.vue
@@ -57,7 +57,11 @@
           <span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="处理状态" width="100px" align="center" prop="processState" :formatter="stateFormatter"/>
+      <el-table-column label="处理状态" width="100px" align="center" prop="processStatus">
+        <template slot-scope="scope">
+          <span>{{ stateFormatter(scope.row) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="处理结果" align="left" width="150px" prop="processResult" />
       <el-table-column label="处理时间" align="center" prop="processTime" width="120">
         <template slot-scope="scope">
@@ -65,7 +69,7 @@
         </template>
       </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="类型编码" align="left" width="150px" prop="typeCode" /> -->
     </el-table>
 
     <pagination
@@ -131,7 +135,19 @@ export default {
   },
   methods: {
     stateFormatter(val) {
-      return  val === '2' ? '已处理' : '未处理'
+      switch (val.processStatus) {
+        case '1':
+          return  '已处理';
+
+        case '0':
+          return  '未处理11';
+
+        case '2':
+          return  '误报';
+
+        default:
+          return '未处理'
+      }
     },
     indexFormatter(val) {
       return (
diff --git a/src/views/alarm/waringRecord/index.vue b/src/views/alarm/waringRecord/index.vue
index 318bf872..f522641f 100644
--- a/src/views/alarm/waringRecord/index.vue
+++ b/src/views/alarm/waringRecord/index.vue
@@ -71,7 +71,7 @@
         </template>
       </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="类型编码" align="left" width="150px" prop="typeCode" /> -->
     </el-table>
 
     <pagination
@@ -129,7 +129,19 @@ export default {
   },
   methods: {
     stateFormatter(val) {
-      return val === "2" ? "已处理" : "未处理";
+      switch (val.processStatus) {
+        case '1':
+          return  '已处理';
+
+        case '0':
+          return  '未处理';
+
+        case '2':
+          return  '误报';
+
+        default:
+          return '未处理'
+      }
     },
     indexFormatter(val) {
       return (
diff --git a/src/views/bashboardcom/newDestail.vue b/src/views/bashboardcom/newDestail.vue
index 3fbff657..dbe68768 100644
--- a/src/views/bashboardcom/newDestail.vue
+++ b/src/views/bashboardcom/newDestail.vue
@@ -18,7 +18,7 @@
     font: 13px/1.6 Arial,sans-serif,Tahoma,Roboto,'Source Code Pro';
 		"
     >发布时间：{{info.updateTime}}</span>
-    <span @click="toNowsTable(info.noticeId)" class="gd-news">更多新闻。。。</span>
+    <span @click="toNowsTable(info.noticeId)" class="gd-news">更多新闻...</span>
     <el-divider></el-divider>
     <div v-html="info.noticeContent" style="padding: 20px;"></div>
 
diff --git a/src/views/bigScreen/v3/index.vue b/src/views/bigScreen/v3/index.vue
index 416dfa02..1dcdd0b6 100644
--- a/src/views/bigScreen/v3/index.vue
+++ b/src/views/bigScreen/v3/index.vue
@@ -111,6 +111,7 @@ export default {
       userLoginType: "",
       stompClient: null,
       socket_flag: true,
+      setIntervalGetCountOpt: null
     };
   },
   mounted() {
@@ -211,6 +212,14 @@ export default {
     },
     // 查询警情信息
     homeCount() {
+      if (this.setIntervalGetCountOpt) {
+        clearInterval(this.setIntervalGetCountOpt);
+      }
+      this.setIntervalGetCount();
+      this.setIntervalGetCountOpt = setInterval(this.setIntervalGetCount, 1000 * 60 * 30)
+    },
+    // 定时执行 请求
+    setIntervalGetCount() {
       homeCount({
         alarmDivide: "ALARM",
         projectId: this.projectId,
@@ -232,6 +241,9 @@ export default {
     document.getElementById("con_lf_top_div").style.background = "#fff";
     document.getElementById("con_lf_top_div").style.overflow = "auto";
     document.getElementById("con_lf_top_div").scrollTop = this.thisScrollTopY;
+    if (this.setIntervalGetCountOpt) {
+      clearInterval(this.setIntervalGetCountOpt);
+    }
   },
 };
 </script>
diff --git a/src/views/iot/alarm/record/index.vue b/src/views/iot/alarm/record/index.vue
index c24660b0..5840f4a9 100644
--- a/src/views/iot/alarm/record/index.vue
+++ b/src/views/iot/alarm/record/index.vue
@@ -31,8 +31,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>
 
@@ -45,23 +53,49 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['iot:record: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="recordList">
-      <el-table-column type="index" label="序号" align="center" :index="indexFormatter" width="80px"></el-table-column>
-      <el-table-column label="设备名称" align="left" width="200px" prop="deviceName" />
+    <el-table
+      v-loading="loading"
+      :data="recordList"
+      :default-sort="{ prop: 'alarmTime', 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"
+        width="200px"
+        prop="deviceName"
+      />
       <!-- <el-table-column label="设备当前值" align="left" prop="currentValue" >
         <template slot-scope="scope">
           <span style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">{{scope.row.currentValue}}</span>
         </template>
       </el-table-column>-->
       <el-table-column label="推送内容" align="left" prop="alarmContent" />
-      <el-table-column label="报警时间" align="center" prop="alarmTime" width="120">
+      <el-table-column
+        label="报警时间"
+        align="center"
+        sortable="custom"
+        prop="alarmTime"
+        width="150"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.alarmTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -71,18 +105,34 @@
         prop="processState"
         :formatter="stateFormatter"
       />
-      <el-table-column label="处理结果" align="left" width="150px" prop="processResult" />
-      <el-table-column label="处理时间" align="center" prop="processTime" width="120">
+      <el-table-column
+        label="处理结果"
+        align="left"
+        width="150px"
+        prop="processResult"
+      />
+      <el-table-column
+        label="处理时间"
+        align="center"
+        prop="processTime"
+        sortable="custom"
+        width="150"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.processTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.processTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
         </template>
       </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="告警类型"
+        align="left"
+        width="150px"
+        prop="typeName"
+      />
+      <!-- <el-table-column label="类型编码" align="left" width="150px" prop="typeCode" /> -->
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -98,7 +148,7 @@ import Editor from "@/components/Editor";
 export default {
   name: "Record",
   components: {
-    Editor
+    Editor,
   },
   data() {
     return {
@@ -128,19 +178,27 @@ export default {
         typeCode: null,
         beginTime: null,
         endTime: null,
-        alarmDivide: "ALARM"
+        alarmDivide: "ALARM",
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {},
-      time: []
+      time: [],
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
     queryTimeChange(val) {
       if (val) {
         this.queryParams.beginTime = this.parseTime(
@@ -157,7 +215,19 @@ export default {
       }
     },
     stateFormatter(val) {
-      return val === "2" ? "已处理" : "未处理";
+      switch (val.processStatus) {
+        case "1":
+          return "已处理";
+
+        case "0":
+          return "未处理";
+
+        case "2":
+          return "误报";
+
+        default:
+          return "未处理";
+      }
     },
     indexFormatter(val) {
       return (
@@ -167,7 +237,7 @@ export default {
     /** 查询报警记录列表 */
     getList() {
       this.loading = true;
-      listRecord(this.queryParams).then(response => {
+      listRecord(this.queryParams).then((response) => {
         this.recordList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -180,7 +250,7 @@ export default {
     },
     // 根据id获取记录详情
     getRecordInfo(id) {
-      getRecord(id).then(res => {
+      getRecord(id).then((res) => {
         this.form = res.data;
         this.open = true;
         this.title = `告警记录详情`;
@@ -205,15 +275,15 @@ export default {
       this.$confirm("是否确认导出所有报警记录数据项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
-        .then(function() {
+        .then(function () {
           return exportRecord(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.download(response.msg);
         });
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/iot/alarm/type/index.vue b/src/views/iot/alarm/type/index.vue
index c991429a..eeac970c 100644
--- a/src/views/iot/alarm/type/index.vue
+++ b/src/views/iot/alarm/type/index.vue
@@ -186,7 +186,7 @@
 
         <el-form-item label="报警划分" prop="alarmDivide">
           <el-radio-group v-model="form.alarmDivide">
-            <el-radio :label="vals" v-for="(keys, vals) in alarmDivideType">{{keys}}</el-radio>
+            <el-radio :label="vals" v-for="(keys, vals) in alarmDivideType" :key="vals">{{keys}}</el-radio>
           </el-radio-group>
         </el-form-item>
 
@@ -195,8 +195,8 @@
             v-model="form.status"
             active-color="#13ce66"
             inactive-color="#dad5d5"
-            active-value="1"
-            inactive-value="0"
+            active-value="0"
+            inactive-value="1"
           ></el-switch>
         </el-form-item>
       </el-form>
diff --git a/src/views/iot/alarm/waringRecord/index.vue b/src/views/iot/alarm/waringRecord/index.vue
index 6994cf4c..6be4b79f 100644
--- a/src/views/iot/alarm/waringRecord/index.vue
+++ b/src/views/iot/alarm/waringRecord/index.vue
@@ -50,7 +50,8 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="recordList">
+    <el-table v-loading="loading" :data="recordList" :default-sort="{ prop: 'alarmTime', 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" width="200px" prop="deviceName" />
       <!-- <el-table-column label="设备当前值" align="left" width="200px" prop="currentValue" >
@@ -59,9 +60,9 @@
         </template>
       </el-table-column> -->
       <el-table-column label="推送内容" align="left" prop="alarmContent" />
-      <el-table-column label="预警时间" align="center" prop="alarmTime" width="120">
+      <el-table-column label="预警时间" align="center" sortable="custom" prop="alarmTime" width="150">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -71,14 +72,14 @@
         prop="processState"
         :formatter="stateFormatter"
       />
-      <el-table-column label="处理结果" align="left" width="150px" prop="processResult" />
-      <el-table-column label="处理时间" align="center" prop="processTime" width="120">
+      <el-table-column label="处理结果" align="left" sortable="custom" width="150px" prop="processResult" />
+      <el-table-column label="处理时间" align="center" prop="processTime" width="150">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.processTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.processTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </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="类型编码" align="left" width="150px" prop="typeCode" /> -->
     </el-table>
 
     <pagination
@@ -138,6 +139,14 @@ export default {
     this.getList();
   },
   methods: {
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
     queryTimeChange(val) {
       if (val) {
         this.queryParams.beginTime = this.parseTime(val[0], '{y}-{m}-{d} {h}:{i}:{s}')
@@ -148,7 +157,19 @@ export default {
       }
     },
     stateFormatter(val) {
-      return val === "2" ? "已处理" : "未处理";
+      switch (val.processStatus) {
+        case '1':
+          return  '已处理';
+
+        case '0':
+          return  '未处理';
+
+        case '2':
+          return  '误报';
+
+        default:
+          return '未处理'
+      }
     },
     indexFormatter(val) {
       return (
diff --git a/src/views/iot/batch/index.vue b/src/views/iot/batch/index.vue
index d31b2b2c..dc994072 100644
--- a/src/views/iot/batch/index.vue
+++ b/src/views/iot/batch/index.vue
@@ -16,7 +16,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="区别编码" prop="differentCode">
+      <!-- <el-form-item label="区别编码" prop="differentCode">
         <el-select
           v-model="queryParams.differentCode"
           style="width: 100%"
@@ -29,7 +29,7 @@
             :value="dict.dictValue"
           ></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="厂商" prop="vendorId">
         <el-select
           v-model="queryParams.vendorId"
@@ -112,23 +112,26 @@
       v-loading="loading"
       :data="batchList"
       @selection-change="handleSelectionChange"
+      :default-sort="{ prop: 'createTime', order: 'descending' }"
+      @sort-change="sortChange"
     >
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column type="index" label="序号" align="center" :index="indexFormatter" width="80px"></el-table-column>
       <!-- <el-table-column label="序号" align="center" prop="index" width="50" /> -->
       <el-table-column label="批次号" align="center" prop="batchNumber" />
-      <el-table-column
+      <!-- <el-table-column
         label="区别编码"
         align="left"
         prop="differentCode"
         :formatter="statusFormat"
-      />
+      /> -->
       <el-table-column label="厂商" align="left" prop="vendorName" />
       <el-table-column label="批次编码" align="left" prop="batchCode" />
       <el-table-column
         label=" 创建时间"
         align="center"
         prop="createTime"
+        sortable="custom"
         width="150px"
       />
       <el-table-column
@@ -179,7 +182,7 @@
           <el-form-item label="批次号" prop="batchNumber">
             <el-input v-model="form.batchNumber" placeholder="请输入批次号" />
           </el-form-item>
-          <el-form-item label="区别编码" prop="differentCode">
+          <!-- <el-form-item label="区别编码" prop="differentCode">
             <el-select
               v-model="form.differentCode"
               style="width: 100%"
@@ -192,7 +195,7 @@
                 :value="dict.dictValue"
               ></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="厂商" prop="vendorId">
             <el-input
               v-model="form.vendorName"
@@ -323,6 +326,14 @@ export default {
     this.getList();
   },
   methods: {
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
     indexFormatter(val) {
       return val + 1 + ((this.queryParams.pageNum - 1) * this.queryParams.pageSize);
     },
@@ -514,7 +525,7 @@ export default {
         batchId: null,
         batchNumber: null,
         createId: null,
-        differentCode: null,
+        differentCode: '1',
         createTime: null,
         vendorId: null,
         updateId: null,
diff --git a/src/views/iot/library/index.vue b/src/views/iot/library/index.vue
index 1ad616bd..a54b36d3 100644
--- a/src/views/iot/library/index.vue
+++ b/src/views/iot/library/index.vue
@@ -72,7 +72,7 @@
           >修改</el-button
         >
       </el-col> -->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -83,7 +83,7 @@
           v-hasPermi="['iot:library:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -95,6 +95,17 @@
           >导出</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExportCSV"
+          v-hasPermi="['iot:library:export']"
+          >导出CSV</el-button
+        >
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -114,9 +125,10 @@
     <el-table
       v-loading="loading"
       :data="libraryList"
-      @selection-change="handleSelectionChange"
+      :default-sort="{ prop: 'createTime', order: 'descending' }"
+      @sort-change="sortChange"
     >
-      <el-table-column type="selection" width="50" align="center" />
+      <!-- <el-table-column type="selection" width="50" align="center" /> -->
       <el-table-column
         type="index"
         label="序号"
@@ -131,6 +143,7 @@
         label=" 创建时间"
         align="center"
         prop="createTime"
+        sortable="custom"
         width="150px"
       />
       <el-table-column
@@ -300,12 +313,14 @@ import {
   addLibrary,
   updateLibrary,
   exportLibrary,
+  exportLibraryCsv,
   importTemplate,
 } from "@/api/iot/library";
 import { listBatch } from "@/api/iot/batch";
 import DialogTemplate from "@/components/DialogTemplate";
 import SelectTableWrap from "@/components/SelectTable/index";
 import { getToken } from "@/utils/auth";
+import { downloadFile } from '@/utils/hciot'
 
 export default {
   name: "Library",
@@ -388,6 +403,14 @@ export default {
     this.getList();
   },
   methods: {
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;
@@ -662,6 +685,21 @@ export default {
         });
     },
     /** 导出按钮操作 */
+    handleExportCSV() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有硬件数据库数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return exportLibraryCsv(queryParams);
+        })
+        .then((response) => {
+          downloadFile(response, '硬件设备数据.csv');
+        });
+    },
+    /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm("是否确认导出所有硬件数据库数据项?", "警告", {
diff --git a/src/views/iot/ota/index.vue b/src/views/iot/ota/index.vue
new file mode 100644
index 00000000..a478df11
--- /dev/null
+++ b/src/views/iot/ota/index.vue
@@ -0,0 +1,736 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="固件版本" prop="otaVersion">
+        <el-input
+          v-model="queryParams.otaVersion"
+          placeholder="请输入固件版本"
+          clearable
+          size="small"
+          @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
+        >
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:ota:add']"
+          >新增</el-button
+        >
+      </el-form-item>
+    </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="['system:ota:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:ota:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row> -->
+
+    <el-table
+      v-loading="loading"
+      :data="otaList"
+      :default-sort="{ prop: 'createTime', order: 'descending' }"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        align="center"
+        :index="indexFormatter"
+        width="80px"
+      ></el-table-column>
+      <el-table-column label="型号" align="laft" width="200" prop="modelName" />
+      <el-table-column
+        label="固件版本"
+        align="center"
+        width="160"
+        prop="otaVersion"
+      />
+      <el-table-column
+        label="固件大小"
+        align="center"
+        width="160"
+        prop="otaSize"
+      />
+      <el-table-column label="升级地址" align="left" prop="otaUrl">
+        <template slot-scope="scope">
+          <span
+            style="
+              width: calc(100% - 60px);
+              white-space: nowrap;
+              display: inline-block;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              line-height: 30px;
+              height: 20px;
+            "
+            >{{ scope.row.otaUrl }}</span
+          >
+          <span
+            style="
+              cursor: default;
+              position: relative;
+              right: -10px;
+              color: #3a8ee6;
+            "
+            @click="copyOnClick(scope.row.otaUrl)"
+            >复制</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="文件地址" align="left" prop="txtUrl">
+        <template slot-scope="scope">
+          <span
+            style="
+              width: calc(100% - 60px);
+              white-space: nowrap;
+              display: inline-block;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              height: 20px;
+              line-height: 30px;
+            "
+            >{{ scope.row.txtUrl }}</span
+          >
+          <span
+            style="
+              cursor: default;
+              position: relative;
+              right: -10px;
+              color: #3a8ee6;
+            "
+            @click="copyOnClick(scope.row.txtUrl)"
+            >复制</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="升级信息"
+        align="left"
+        prop="otaInfo"
+      ></el-table-column>
+      <el-table-column
+        label=" 创建时间"
+        align="center"
+        prop="createTime"
+        sortable="custom"
+        width="150px"
+      />
+      <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"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:ota:edit']"
+            >修改</el-button
+          >
+          <!-- <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:ota:remove']"
+            >删除</el-button
+          > -->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改固件版本对话框 -->
+    <div>
+      <dialog-template :title="title" :visible="open" width="500px">
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          slot="dialog-center"
+          label-width="100px"
+        >
+          <el-form-item label="型号:" prop="modelName">
+            <el-input
+              v-model="form.modelName"
+              placeholder="点击选择型号"
+              @focus="openModelTableSelectDialog()"
+            />
+          </el-form-item>
+          <el-form-item label="固件版本:" prop="otaVersion">
+            <el-input v-model="form.otaVersion" placeholder="请输入固件版本" />
+          </el-form-item>
+
+          <el-form-item label="升级地址:" prop="otaUrl">
+            <el-input v-model="form.otaUrl" placeholder="请输入固件升级地址" />
+          </el-form-item>
+
+          <el-form-item label="文件地址:" prop="txtUrl">
+            <el-tabs v-model="isFileUpload">
+              <el-tab-pane label="文本输入" name="input">
+                <el-input
+                  v-show="isFileUpload === 'input'"
+                  v-model="form.txtUrl"
+                  placeholder="请输入文件地址"
+                />
+              </el-tab-pane>
+              <el-tab-pane label="文件上传" name="fileUpload">
+                <el-upload
+                  ref="upload"
+                  :show-file-list="false"
+                  :http-request="uploud"
+                  action
+                  drag
+                >
+                  <i class="el-icon-upload"></i>
+                  <div class="el-upload__text">
+                    将文件拖到此处，或
+                    <em>点击上传</em>
+                  </div>
+                  <!-- <div class="el-upload__tip" slot="tip">
+                    只能上传jpg/png文件，且不超过500kb
+                  </div> -->
+                </el-upload>
+              </el-tab-pane>
+            </el-tabs>
+          </el-form-item>
+
+          <el-form-item label="固件大小:" prop="otaSize">
+            <el-input v-model="form.otaSize" placeholder="请输入固件大小" />
+          </el-form-item>
+
+          <el-form-item label="升级信息:" prop="otaInfo">
+            <el-input
+              v-model="form.otaInfo"
+              type="textarea"
+              :rows="4"
+              placeholder="请输入固件升级信息"
+            />
+          </el-form-item>
+        </el-form>
+
+        <div slot="dialog-footer">
+          <el-button type="primary" size="mini" @click="submitForm"
+            >确 定</el-button
+          >
+          <el-button size="mini" @click="cancel">取 消</el-button>
+        </div>
+      </dialog-template>
+
+      <el-dialog
+        title="选择"
+        :visible.sync="selectTableShow"
+        width="75%"
+        top="10vh"
+        class="select-table-dialog"
+        :close-on-click-modal="false"
+      >
+        <select-table-wrap
+          v-if="selectTableShow"
+          :tableOption="tableSelectOption.tableOpt"
+          :queryOption="tableSelectOption.queryOpt"
+          :tableList="tableSelectOption.tableList"
+          @parentGetList="childGetList($event)"
+          :otherOption="tableSelectOption.otherOption"
+          @returnEvent="returnEvent($event)"
+        />
+
+        <div slot="footer" class="dialog-footer">
+          <el-button size="mini" type="primary" @click="resuleClick"
+            >确 定</el-button
+          >
+          <el-button
+            size="mini"
+            @click="
+              () => {
+                selectTableShow = false;
+              }
+            "
+            >取 消</el-button
+          >
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  listOta,
+  getOta,
+  delOta,
+  addOta,
+  updateOta,
+  exportOta,
+} from "@/api/iot/deviceOta";
+import DialogTemplate from "@/components/DialogTemplate";
+import SelectTableWrap from "@/components/SelectTable/index";
+import { listModel, getModel } from "@/api/iot/model";
+import { getToken } from "@/utils/auth";
+import { uploadFile } from "@/api/file";
+
+export default {
+  name: "Ota",
+  components: {
+    DialogTemplate,
+    SelectTableWrap,
+  },
+  data() {
+    return {
+      isFileUpload: "input",
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 固件版本表格数据
+      otaList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        modelId: null,
+        otaVersion: null,
+        otaSize: null,
+        otaUrl: null,
+        txtUrl: null,
+        otaInfo: null,
+      },
+      selectTableShow: false,
+      tableSelectOption: {},
+      selectResult: {},
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        modelName: [
+          {
+            required: true,
+            validator: this.chenking_modelName,
+            trigger: "blur",
+          },
+        ],
+        otaVersion: [
+          { required: true, message: "版本不能为空", trigger: "blur" },
+        ],
+        otaUrl: [
+          { required: true, message: " 升级地址不能为空", trigger: "blur" },
+        ],
+        txtUrl: [
+          { required: true, message: " 文件地址不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    copyOnClick(val) {
+      let self = this;
+      this.$copyText(val).then(
+        function () {
+          self.$message({
+            message: "复制成功",
+            type: "success",
+          });
+        },
+        function () {
+          self.$message.error("复制失败");
+        }
+      );
+    },
+    chenking_modelName(rule, value, callback) {
+      if (!this.form.modelId) {
+        callback(new Error("型号不能为空，请选择！"));
+      } else {
+        callback();
+      }
+    },
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
+    uploud(file) {
+      console.log(file);
+      var formData = new FormData();
+      var that = this;
+      formData.append("file", file.file);
+      uploadFile(formData)
+        .then((response) => {
+          if (response.code === 200) {
+            that.form.otaSize = file.file.size;
+            that.form.txtUrl = response.url;
+            that.isFileUpload = "input";
+            that.$forceUpdate();
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = this.fileType.indexOf(file.type) >= 0;
+      const isLt2M = file.size < this.fileSize;
+
+      if (!isJPG) {
+        this.$message.error("上传头像图片只能是 JPG 格式!");
+      }
+      if (!isLt2M) {
+        this.$message.error("上传头像图片大小不能超过 2MB!");
+      }
+      return isLt2M;
+    },
+    // 打开厂商选择窗口 ——表格
+    openModelTableSelectDialog() {
+      this.selectResult = {};
+      this.tableSelectOption = {
+        otherOption: {
+          tableType: "model",
+        },
+        queryOpt: {
+          disable: false,
+          labelWidth: "68px",
+          params: {
+            protocolType: "",
+            modelName: "",
+          },
+          page: {
+            pageSize: 10,
+            pageNum: 1,
+            total: 0,
+          },
+          inline: true,
+          queryChilds: [
+            {
+              style: "",
+              placeholder: "型号名称",
+              clearable: true,
+              label: "型号名称",
+              type: "input",
+              key: "modelName",
+              size: "small",
+              value: "",
+            },
+            {
+              style: "",
+              placeholder: "协议类型",
+              clearable: true,
+              label: "协议类型",
+              type: "select",
+              key: "protocolType",
+              size: "small",
+              value: "",
+              options: [
+                {
+                  key: "IOTOS",
+                  label: "iot平台",
+                  value: "IOTOS",
+                },
+                {
+                  key: "ONENET",
+                  label: "ONENET",
+                  value: "ONENET",
+                },
+                {
+                  key: "OFFICIAL",
+                  label: "官方平台",
+                  value: "OFFICIAL",
+                },
+              ],
+              optionKey: {
+                key: "key",
+                label: "label",
+                value: "value",
+              },
+            },
+          ],
+        },
+        tableOpt: {
+          loading: false,
+          rowKey: "deviceId",
+          selection: false,
+          maxHeight: "45vh",
+          childs: [
+            {
+              style: "",
+              label: "厂商名称",
+              type: "",
+              prop: "vendorName",
+              align: "left",
+              width: "200",
+              "show-overflow-tooltip": false,
+              tempType: "span",
+            },
+            {
+              style: "",
+              label: "型号名称",
+              type: "",
+              prop: "modelName",
+              align: "left",
+              width: "200",
+              "show-overflow-tooltip": false,
+              tempType: "span",
+            },
+            {
+              style: "",
+              label: "设备类型",
+              type: "",
+              prop: "deviceTypeName",
+              align: "left",
+              width: "120",
+              "show-overflow-tooltip": false,
+              tempType: "span",
+            },
+            {
+              style: "",
+              label: "产品PK",
+              type: "",
+              prop: "prodKey",
+              align: "left",
+              width: "",
+              "show-overflow-tooltip": false,
+              tempType: "span",
+            },
+            {
+              style: "",
+              label: "产品密钥",
+              type: "",
+              prop: "prodSecret",
+              align: "left",
+              width: "",
+              "show-overflow-tooltip": false,
+              tempType: "span",
+            },
+          ],
+          tableList: {
+            type: Array,
+          },
+        },
+        tableList: [],
+      };
+      this.selectTableShow = true;
+    },
+    childGetList(data) {
+      this.modelChildList(data);
+    },
+    modelChildList(data) {
+      listModel(Object.assign(data.page, data.param, { selected: 1 })).then(
+        (response) => {
+          this.tableSelectOption.tableList = response.rows;
+          this.tableSelectOption.queryOpt.page.total = Number(response.total);
+        }
+      );
+    },
+    // 点击或者双击数据回调
+    returnEvent(data) {
+      if (data.type === "dblclick") {
+        this.form.modelId = data.value.modelId;
+        this.form.modelName = data.value.modelName;
+        this.selectTableShow = false;
+      } else if (data.type === "click") {
+        this.selectResult = {};
+        this.selectResult.modelId = data.value.modelId;
+        this.selectResult.modelName = data.value.modelName;
+      }
+    },
+    // 点击确定按钮
+    resuleClick() {
+      this.form.modelId = this.selectResult.modelId;
+      this.form.modelName = this.selectResult.modelName;
+      this.selectTableShow = false;
+    },
+
+    indexFormatter(val) {
+      return (
+        val + 1 + (this.queryParams.pageNum - 1) * this.queryParams.pageSize
+      );
+    },
+    /** 查询固件版本列表 */
+    getList() {
+      this.loading = true;
+      listOta(this.queryParams).then((response) => {
+        this.otaList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        otaId: null,
+        modelId: null,
+        otaVersion: null,
+        otaSize: null,
+        otaUrl: null,
+        txtUrl: null,
+        otaInfo: null,
+        createId: null,
+        createTime: null,
+        updateId: null,
+        updateTime: null,
+        modelName: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.otaId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加固件版本";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const otaId = row.otaId || this.ids;
+      getOta(otaId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改固件版本";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.otaId != null) {
+            updateOta(this.form).then((response) => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOta(this.form).then((response) => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const otaIds = row.otaId || this.ids;
+      this.$confirm("是否删除该选项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return delOta(otaIds);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有固件版本数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return exportOta(queryParams);
+        })
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+  },
+};
+</script>
diff --git a/src/views/iot/trigger/index.vue b/src/views/iot/trigger/index.vue
index 1704839d..f8c1a928 100644
--- a/src/views/iot/trigger/index.vue
+++ b/src/views/iot/trigger/index.vue
@@ -32,7 +32,7 @@
 
       <el-table
         v-loading="listLoading"
-        :default-sort="{prop: 'updateTime', order: 'descending'}"
+        :default-sort="{prop: 'createTime', order: 'descending'}"
         @sort-change="sortChange"
         :data="tableList"
       >
diff --git a/src/views/personal/alarm/index.vue b/src/views/personal/alarm/index.vue
index c3ccbe9a..74f798d5 100644
--- a/src/views/personal/alarm/index.vue
+++ b/src/views/personal/alarm/index.vue
@@ -50,7 +50,8 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="recordList">
+    <el-table v-loading="loading" :data="recordList" :default-sort="{ prop: 'alarmTime', 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" width="200px" prop="deviceName" />
       <!-- <el-table-column label="设备当前值" align="left"  width="200px" prop="currentValue" >
@@ -59,20 +60,20 @@
         </template>
       </el-table-column> -->
       <el-table-column label="推送内容" align="left" prop="alarmContent" />
-      <el-table-column label="报警时间" align="center" prop="alarmTime" width="120">
+      <el-table-column label="报警时间" align="center" prop="alarmTime" width="150" sortable="custom">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="处理状态" width="100px" align="center" prop="processState" :formatter="stateFormatter"/>
       <el-table-column label="处理结果" align="left" width="150px" prop="processResult" />
-      <el-table-column label="处理时间" align="center" prop="processTime" width="120">
+      <el-table-column label="处理时间" align="center" prop="processTime" width="150" sortable="custom">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.processTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.processTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </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="类型编码" align="left" width="150px" prop="typeCode" /> -->
     </el-table>
 
     <pagination
@@ -139,6 +140,14 @@ export default {
     this.getList();
   },
   methods: {
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
     queryTimeChange(val) {
       if (val) {
         this.queryParams.beginTime = this.parseTime(val[0], '{y}-{m}-{d} {h}:{i}:{s}')
@@ -149,7 +158,19 @@ export default {
       }
     },
     stateFormatter(val) {
-      return  val === '2' ? '已处理' : '未处理'
+      switch (val.processStatus) {
+        case '1':
+          return  '已处理';
+
+        case '0':
+          return  '未处理';
+
+        case '2':
+          return  '误报';
+
+        default:
+          return '未处理'
+      }
     },
     indexFormatter(val) {
       return (
diff --git a/src/views/personal/waring/index.vue b/src/views/personal/waring/index.vue
index 1a1ede75..42aa3b10 100644
--- a/src/views/personal/waring/index.vue
+++ b/src/views/personal/waring/index.vue
@@ -50,7 +50,8 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="recordList">
+    <el-table v-loading="loading" :data="recordList" :default-sort="{ prop: 'alarmTime', 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" width="200px" prop="deviceName" />
       <!-- <el-table-column label="设备当前值" align="left" width="200px" prop="currentValue" >
@@ -59,9 +60,9 @@
         </template>
       </el-table-column> -->
       <el-table-column label="推送内容" align="left" prop="alarmContent" />
-      <el-table-column label="预警时间" align="center" prop="alarmTime" width="120">
+      <el-table-column label="预警时间" align="center" prop="alarmTime" width="150" sortable="custom">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -72,13 +73,13 @@
         :formatter="stateFormatter"
       />
       <el-table-column label="处理结果" align="left" width="150px" prop="processResult" />
-      <el-table-column label="处理时间" align="center" prop="processTime" width="120">
+      <el-table-column label="处理时间" align="center" prop="processTime" width="150" sortable="custom">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.processTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.processTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </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="类型编码" align="left" width="150px" prop="typeCode" /> -->
     </el-table>
 
     <pagination
@@ -138,6 +139,14 @@ export default {
     this.getList();
   },
   methods: {
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
     queryTimeChange(val) {
       if (val) {
         this.queryParams.beginTime = this.parseTime(val[0], '{y}-{m}-{d} {h}:{i}:{s}')
@@ -148,7 +157,19 @@ export default {
       }
     },
     stateFormatter(val) {
-      return val === "2" ? "已处理" : "未处理";
+      switch (val.processStatus) {
+        case '1':
+          return  '已处理';
+
+        case '0':
+          return  '未处理';
+
+        case '2':
+          return  '误报';
+
+        default:
+          return '未处理'
+      }
     },
     indexFormatter(val) {
       return (
diff --git a/src/views/power/examine/index.vue b/src/views/power/examine/index.vue
index f7fe109a..9834b62a 100644
--- a/src/views/power/examine/index.vue
+++ b/src/views/power/examine/index.vue
@@ -27,6 +27,27 @@
           />
         </el-select>
       </el-form-item>
+
+       <el-form-item label="上报人" prop="reporterName">
+        <el-input
+          v-model="queryParams.reporterName"
+          placeholder="请输入上报人名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="处理人" prop="handlerName">
+        <el-input
+          v-model="queryParams.handlerName"
+          placeholder="请输入处理人名称"
+          clearable
+          size="small"
+          @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>
@@ -47,11 +68,13 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>-->
 
-    <el-table v-loading="loading" :data="nodeList">
+    <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="deviceName" />
       <el-table-column
+        sortable="custom"
         label="故障类型"
         align="center"
         width="150"
@@ -61,7 +84,7 @@
       <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" prop="handleTime" width="120">
+      <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>
@@ -230,6 +253,14 @@ export default {
     this.getList();
   },
   methods: {
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
     auditResultChange(val) {
       if (val === "通过") {
         this.form.maintenanceStatus = "5";
diff --git a/src/views/power/maintenance/index.vue b/src/views/power/maintenance/index.vue
index b16be0d5..07b09fc4 100644
--- a/src/views/power/maintenance/index.vue
+++ b/src/views/power/maintenance/index.vue
@@ -32,6 +32,26 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="上报人" prop="reporterName">
+        <el-input
+          v-model="queryParams.reporterName"
+          placeholder="请输入上报人名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="处理人" prop="handlerName">
+        <el-input
+          v-model="queryParams.handlerName"
+          placeholder="请输入处理人名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="处理时间" prop="handleTime">
         <el-date-picker
           clearable
@@ -102,7 +122,8 @@
       ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="maintenanceList">
+    <el-table v-loading="loading" :data="maintenanceList" :default-sort="{ prop: 'handleTime', order: 'descending' }"
+      @sort-change="sortChange">
       <el-table-column
         type="index"
         label="序号"
@@ -114,6 +135,7 @@
       <el-table-column
         label="故障类型"
         align="center"
+        sortable="custom"
         width="150"
         prop="faultType"
         :formatter="statusFormat"
@@ -129,6 +151,7 @@
         label="处理时间"
         align="center"
         prop="handleTime"
+        sortable="custom"
         width="120"
       >
         <template slot-scope="scope">
@@ -143,7 +166,26 @@
         prop="maintenanceStatus"
       >
         <template slot-scope="scope">
-          <span>{{ workStateList[scope.row.workOrderStatus] }}</span>
+          <el-tag v-if="scope.row.maintenanceStatus === '0'" type="info">{{
+            workStateList[scope.row.maintenanceStatus]
+          }}</el-tag>
+          <el-tag v-if="scope.row.maintenanceStatus === '5'" type="success">{{
+            workStateList[scope.row.maintenanceStatus]
+          }}</el-tag>
+          <el-tag v-if="scope.row.maintenanceStatus === '3'">{{
+            workStateList[scope.row.maintenanceStatus]
+          }}</el-tag>
+          <el-tag type="warning" v-if="scope.row.maintenanceStatus === '2'">{{
+            workStateList[scope.row.maintenanceStatus]
+          }}</el-tag>
+          <el-tag
+            type="danger"
+            v-if="
+              scope.row.maintenanceStatus === '1' ||
+              scope.row.maintenanceStatus === '4'
+            "
+            >{{ workStateList[scope.row.maintenanceStatus] }}</el-tag
+          >
         </template>
       </el-table-column>
       <el-table-column
@@ -203,6 +245,7 @@
             v-model="form.faultType"
             style="width: 100%"
             placeholder="请选择故障类型"
+            @change="faultTypeChange"
           >
             <el-option
               v-for="dict in faultTypeOptions"
@@ -240,10 +283,10 @@
             placeholder="请选择处理人"
           >
             <el-option
-              v-for="dict in gdUserList"
-              :key="dict.userId"
-              :label="dict.nickName"
-              :value="dict.userId"
+              v-for="item in gdUserList"
+              :key="item.userId"
+              :label="item.nickName"
+              :value="item.userId"
             />
           </el-select>
         </el-form-item>
@@ -386,6 +429,7 @@ export default {
         deviceId: null,
         deviceName: null,
         faultType: null,
+        faultTypeName: null,
         reporterId: null,
         reporterName: null,
         maintenanceContext: null,
@@ -414,9 +458,20 @@ export default {
     // this.getTreeselect();
   },
   methods: {
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
     dialogCloes() {
       this.getList();
     },
+    faultTypeChange(val) {
+      this.form["faultTypeName"] = this.statusFormat({ faultType: val }, null);
+    },
     // 查看详情
     handleDetails(row) {
       this.workDetails = row;
@@ -436,7 +491,8 @@ export default {
             deviceName: "",
             modelId: "",
             parentId: 0,
-            deviceType: "GATEWAY_CONTROLLER",
+            // deviceType: "GATEWAY_CONTROLLER",
+            deviceType: "",
           },
           page: {
             pageSize: 10,
@@ -541,7 +597,7 @@ export default {
     },
     // 获取 工单 处理人列表
     gdListUser() {
-      gdListUser().then((response) => {
+      gdListUser().then(response => {
         this.gdUserList = response.data;
       });
     },
@@ -550,6 +606,7 @@ export default {
       var userList = [];
       var _this = this;
       listUser().then((response) => {
+        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 2d90bccd..e38d4f22 100644
--- a/src/views/power/mywork/details.vue
+++ b/src/views/power/mywork/details.vue
@@ -6,13 +6,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>
@@ -21,13 +21,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] }}</span>
           </div>
         </el-col>
       </el-row>
@@ -35,24 +35,29 @@
         <el-col :span="12">
           <div class="item-block">
             <span>上报人员：</span>
-            <span>{{workDetails.reporterName}}</span>
+            <span>{{ workDetails.reporterName }}</span>
           </div>
         </el-col>
         <el-col :span="12">
           <div class="item-block">
             <span>上报时间：</span>
-            <span>{{workDetails.createTime}}</span>
+            <span>{{ workDetails.createTime }}</span>
           </div>
         </el-col>
       </el-row>
       <el-row
         :gutter="20"
-        v-if="!(workDetails.reporterId === logUser && workDetails.maintenanceStatus === '1')"
+        v-if="
+          !(
+            workDetails.reporterId === logUser &&
+            workDetails.maintenanceStatus === '1'
+          )
+        "
       >
         <el-col :span="24">
           <div class="item-block">
             <span>工单内容：</span>
-            <span>{{workDetails.maintenanceContext}}</span>
+            <span>{{ workDetails.maintenanceContext }}</span>
           </div>
         </el-col>
       </el-row>
@@ -60,75 +65,83 @@
 
     <el-divider
       content-position="left"
-      v-if="showForm === '0' && (
-        (workDetails.handlerId === logUser && workDetails.maintenanceStatus === '1') ||
-        (workDetails.reporterId === logUser && workDetails.maintenanceStatus === '1') ||
-        (workDetails.maintenanceStatus === '3' &&　showForm === '0') ||
-        ( workDetails.maintenanceStatus === '4' && showForm === '0') || ( workDetails.maintenanceStatus === '5' && showForm === '0')
-      )"
-    >处理反馈信息</el-divider>
+      v-if="
+        showForm === '0' &&
+        ((workDetails.handlerId === logUser &&
+          workDetails.maintenanceStatus === '1') ||
+          (workDetails.reporterId === logUser &&
+            workDetails.maintenanceStatus === '1') ||
+          (workDetails.maintenanceStatus === '3' && showForm === '0') ||
+          (workDetails.maintenanceStatus === '4' && showForm === '0') ||
+          (workDetails.maintenanceStatus === '5' && showForm === '0'))
+      "
+      >处理反馈信息</el-divider
+    >
     <div
       class="info-wrap feedback-wrap"
-      v-if="showForm === '0' && (
-        (workDetails.handlerId === logUser && workDetails.maintenanceStatus === '1') ||
-        (workDetails.reporterId === logUser && workDetails.maintenanceStatus === '1') ||
-        (workDetails.maintenanceStatus === '3' &&　showForm === '0')||
-        ( workDetails.maintenanceStatus === '4' && showForm === '0') || ( workDetails.maintenanceStatus === '5' && showForm === '0')
-      )"
+      v-if="
+        showForm === '0' &&
+        ((workDetails.handlerId === logUser &&
+          workDetails.maintenanceStatus === '1') ||
+          (workDetails.reporterId === logUser &&
+            workDetails.maintenanceStatus === '1') ||
+          (workDetails.maintenanceStatus === '3' && showForm === '0') ||
+          (workDetails.maintenanceStatus === '4' && showForm === '0') ||
+          (workDetails.maintenanceStatus === '5' && showForm === '0'))
+      "
     >
       <el-row :gutter="20">
         <el-col :span="12">
           <div class="item-block">
             <span>处理人员：</span>
-            <span>{{workDetails.handlerName}}</span>
+            <span>{{ workDetails.handlerName }}</span>
           </div>
         </el-col>
         <el-col :span="12">
           <div class="item-block">
             <span>处理时间：</span>
-            <span>{{workDetails.handleTime}}</span>
+            <span>{{ workDetails.handleTime }}</span>
           </div>
         </el-col>
       </el-row>
 
-      <el-row :gutter="20" v-show="!(workDetails.handlerId === logUser && showForm === '3')">
+      <el-row
+        :gutter="20"
+        v-show="!(workDetails.handlerId === logUser && showForm === '3')"
+      >
         <el-col :span="12">
           <div class="item-block">
             <span>处理反馈：</span>
-            <span class="value-span">{{workDetails.feedbackInformation}}</span>
+            <span class="value-span">{{
+              workDetails.feedbackInformation
+            }}</span>
           </div>
         </el-col>
         <el-col :span="12">
           <div class="item-block">
             <span>处理意见：</span>
-            <span class="value-span">{{workDetails.advice}}</span>
+            <span class="value-span">{{ workDetails.advice }}</span>
           </div>
         </el-col>
       </el-row>
 
-      <el-row :gutter="20" v-show="!(workDetails.handlerId === logUser && showForm === '3')">
+      <el-row
+        :gutter="20"
+        v-show="!(workDetails.handlerId === logUser && showForm === '3')"
+      >
         <el-col :span="24">
           <div
             class="item-block"
-            style="
-            width: 100%;
-            display: flex;
-            height: 100px;
-          "
+            style="width: 100%; display: flex; height: 100px"
           >
             <span>现场图片：</span>
-            <div
-              style="
-    			  	width: calc(100% - 85px);
-              display: flex;
-            "
-            >
+            <div style="width: calc(100% - 85px); display: flex">
               <img
                 style="
-                width: 100px;
-                height: 100px;
-                margin-right: 10px;
-                border: 1px solid #cfcece;
+                  width: 100px;
+                  height: 100px;
+                  margin-right: 10px;
+                  border: 1px solid #cfcece;
                   border-radius: 3px;
                 "
                 :src="getIotFileUrl(val)"
@@ -143,72 +156,86 @@
 
     <el-divider
       content-position="left"
-      v-if="( workDetails.maintenanceStatus === '1' && workDetails.maintenanceNodeList )"
-    >退回意见</el-divider>
-    <div
-      v-if="( workDetails.maintenanceStatus === '1' && workDetails.maintenanceNodeList )"
+      v-if="
+        workDetails.maintenanceStatus === '1' && workDetails.maintenanceNodeList.length > 0
+      "
+      >退回意见</el-divider
     >
-          <el-card>
-            <div class="info-block-sh">
-              <div class="item-block">
-                <span>审核人员：</span>
-                <span>{{workDetails.maintenanceNodeList[0].auditorName}}</span>
-              </div>
-              <div class="item-block">
-                <span>审核时间：</span>
-                <span>{{workDetails.maintenanceNodeList[0].auditTime}}</span>
-              </div>
+    <div
+      v-if="
+        workDetails.maintenanceStatus === '1' && workDetails.maintenanceNodeList.length > 0
+      "
+    >
+      <el-card>
+        <div class="info-block-sh">
+          <div class="item-block">
+            <span>审核人员：</span>
+            <span>{{ workDetails.maintenanceNodeList[0]["auditorName"] }}</span>
+          </div>
+          <div class="item-block">
+            <span>审核时间：</span>
+            <span>{{ workDetails.maintenanceNodeList[0]["auditTime"] }}</span>
+          </div>
 
-              <div class="item-block text">
-                <span>审核结果：</span>
-                <span>{{workDetails.maintenanceNodeList[0].auditResult}}</span>
-              </div>
+          <div class="item-block text">
+            <span>审核结果：</span>
+            <span>{{ workDetails.maintenanceNodeList[0]["auditResult"] }}</span>
+          </div>
 
-              <div class="item-block text">
-                <span>审核意见：</span>
-                <span>{{workDetails.maintenanceNodeList[0].auditOpinion}}</span>
-              </div>
-            </div>
-          </el-card>
+          <div class="item-block text">
+            <span>审核意见：</span>
+            <span>{{
+              workDetails.maintenanceNodeList[0]["auditOpinion"]
+            }}</span>
+          </div>
+        </div>
+      </el-card>
     </div>
 
     <el-divider
       content-position="left"
-      v-if=" ( workDetails.maintenanceStatus === '4' || workDetails.maintenanceStatus === '5')"
-    >审核结果</el-divider>
-    <div
-      v-if=" ( workDetails.maintenanceStatus === '4' || workDetails.maintenanceStatus === '5')"
+      v-if="
+        workDetails.maintenanceStatus === '4' ||
+        workDetails.maintenanceStatus === '5'
+      "
+      >审核结果</el-divider
     >
-      <el-timeline style="margin-top: 20px;">
+    <div
+      v-if="
+        workDetails.maintenanceStatus === '4' ||
+        workDetails.maintenanceStatus === '5'
+      "
+    >
+      <el-timeline style="margin-top: 20px">
         <el-timeline-item
           v-for="item in workDetails.maintenanceNodeList"
           reverse
           :hide-timestamp="true"
           :key="item.auditResult"
-          :icon=" item.auditResult === '通过'? 'el-icon-trophy': 'el-icon-aim'"
+          :icon="item.auditResult === '通过' ? 'el-icon-trophy' : 'el-icon-aim'"
           type="large"
-          :color="item.auditResult === '通过'? '#52ce90': '#328ff0'"
+          :color="item.auditResult === '通过' ? '#52ce90' : '#328ff0'"
           :timestamp="item.auditTime"
         >
           <el-card>
             <div class="info-block-sh">
               <div class="item-block">
                 <span>审核人员：</span>
-                <span>{{item.auditorName}}</span>
+                <span>{{ item["auditorName"] }}</span>
               </div>
               <div class="item-block">
                 <span>审核时间：</span>
-                <span>{{item.auditTime}}</span>
+                <span>{{ item["auditTime"] }}</span>
               </div>
 
               <div class="item-block text">
                 <span>审核结果：</span>
-                <span>{{item.auditResult}}</span>
+                <span>{{ item["auditResult"] }}</span>
               </div>
 
               <div class="item-block text">
                 <span>审核意见：</span>
-                <span>{{item.auditOpinion}}</span>
+                <span>{{ item["auditOpinion"] }}</span>
               </div>
             </div>
           </el-card>
@@ -218,46 +245,74 @@
 
     <el-divider
       content-position="left"
-      v-if="tempType !== 'examine' && (showForm === '0' && (
-          (workDetails.handlerId !== logUser && ( workDetails.maintenanceStatus === '2' || workDetails.maintenanceStatus === '0')) ||
-          (workDetails.reporterId !== logUser && workDetails.maintenanceStatus === '1') || ( workDetails.maintenanceStatus === '3' &&　showForm === '0') ||
-          ( workDetails.handlerId !== logUser &&  workDetails.maintenanceStatus === '4')
-        ))"
-    >订单进程</el-divider>
+      v-if="
+        tempType !== 'examine' &&
+        showForm === '0' &&
+        ((workDetails.handlerId !== logUser &&
+          (workDetails.maintenanceStatus === '2' ||
+            workDetails.maintenanceStatus === '0')) ||
+          (workDetails.reporterId !== logUser &&
+            workDetails.maintenanceStatus === '1') ||
+          (workDetails.maintenanceStatus === '3' && showForm === '0') ||
+          (workDetails.handlerId !== logUser &&
+            workDetails.maintenanceStatus === '4'))
+      "
+      >订单进程</el-divider
+    >
     <div
-      v-if="tempType !== 'examine' && (showForm === '0' && (
-          (workDetails.handlerId !== logUser && ( workDetails.maintenanceStatus === '2' || workDetails.maintenanceStatus === '0' )) ||
-          ( workDetails.reporterId !== logUser && workDetails.maintenanceStatus === '1') || ( workDetails.maintenanceStatus === '3' &&　showForm === '0') ||
-          ( workDetails.handlerId !== logUser &&  workDetails.maintenanceStatus === '4')
-        ))"
+      v-if="
+        tempType !== 'examine' &&
+        showForm === '0' &&
+        ((workDetails.handlerId !== logUser &&
+          (workDetails.maintenanceStatus === '2' ||
+            workDetails.maintenanceStatus === '0')) ||
+          (workDetails.reporterId !== logUser &&
+            workDetails.maintenanceStatus === '1') ||
+          (workDetails.maintenanceStatus === '3' && showForm === '0') ||
+          (workDetails.handlerId !== logUser &&
+            workDetails.maintenanceStatus === '4'))
+      "
     >
       <span
-        style=" margin-left: 20px; height: 50px; display: block;"
+        style="margin-left: 20px; height: 50px; display: block"
         v-show="workDetails.maintenanceStatus === '4' && showForm === '0'"
-        v-text="'工单审核被退回，正在重新处理中。。。'"
+        v-text="'工单审核被退回，正在重新处理中...'"
       ></span>
       <span
-        style=" margin-left: 20px; height: 50px; display: block;"
-        v-show="workDetails.handlerId !== logUser && workDetails.maintenanceStatus === '2'"
-        v-text="'工单已经确认，正在处理中。。。'"
+        style="margin-left: 20px; height: 50px; display: block"
+        v-show="
+          workDetails.handlerId !== logUser &&
+          workDetails.maintenanceStatus === '2'
+        "
+        v-text="'工单已经确认，正在处理中...'"
       ></span>
       <span
-        style=" margin-left: 20px; height: 50px; display: block;"
-        v-show="workDetails.maintenanceStatus === '3' &&　showForm === '0'"
-        v-text="' 订单已经处理完成，等待审核。。。'"
+        style="margin-left: 20px; height: 50px; display: block"
+        v-show="workDetails.maintenanceStatus === '3' && showForm === '0'"
+        v-text="' 订单已经处理完成，等待审核...'"
       ></span>
       <span
-        style=" margin-left: 20px; height: 50px; display: block;"
-        v-show="workDetails.handlerId !== logUser && workDetails.maintenanceStatus === '0'"
-        v-text="'工单正在等待处理人确认。。。'"
+        style="margin-left: 20px; height: 50px; display: block"
+        v-show="
+          workDetails.handlerId !== logUser &&
+          workDetails.maintenanceStatus === '0'
+        "
+        v-text="'工单正在等待处理人确认...'"
       ></span>
       <span
-        style=" margin-left: 20px; height: 50px; display: block;"
-        v-show="workDetails.reporterId !== logUser && workDetails.maintenanceStatus === '1'"
-        v-text="'此工单已经退回，等待处理。。。'"
+        style="margin-left: 20px; height: 50px; display: block"
+        v-show="
+          workDetails.reporterId !== logUser &&
+          workDetails.maintenanceStatus === '1'
+        "
+        v-text="'此工单已经退回，等待处理...'"
       ></span>
     </div>
-    <el-divider content-position="left" v-if="tempType === 'myWork' && expFromShow(workDetails)">操作</el-divider>
+    <el-divider
+      content-position="left"
+      v-if="tempType === 'myWork' && expFromShow(workDetails)"
+      >操作</el-divider
+    >
     <el-form
       :model="form"
       :rules="rules"
@@ -268,38 +323,54 @@
     >
       <el-form-item
         label="工单内容："
-        v-if="workDetails.reporterId === logUser && workDetails.maintenanceStatus === '1'"
+        v-if="
+          workDetails.reporterId === logUser &&
+          workDetails.maintenanceStatus === '1'
+        "
         prop="name"
       >
         <el-input
           type="textarea"
-          :autosize="{ minRows: 2, maxRows: 5}"
+          :autosize="{ minRows: 2, maxRows: 5 }"
           placeholder
           v-model="form.maintenanceContext"
         ></el-input>
       </el-form-item>
 
       <span
-        v-if="workDetails.handlerId === logUser && workDetails.maintenanceStatus === '0'"
-        v-text="'您是此工单处理人，您可做如下操作。。。'"
+        v-if="
+          workDetails.handlerId === logUser &&
+          workDetails.maintenanceStatus === '0'
+        "
+        v-text="'您是此工单处理人，您可做如下操作...'"
       ></span>
 
-      <span v-else-if="workDetails.maintenanceStatus === '2'" v-text="'订单已经确认，正在处理中。。。'"></span>
+      <span
+        v-else-if="workDetails.maintenanceStatus === '2'"
+        v-text="'订单已经确认，正在处理中...'"
+      ></span>
 
       <span
-        v-else-if="workDetails.handlerId === logUser && workDetails.maintenanceStatus === '4'"
-        v-text="'工单审核被退回，请重新处理。。。'"
+        v-else-if="
+          workDetails.handlerId === logUser &&
+          workDetails.maintenanceStatus === '4'
+        "
+        v-text="'工单审核被退回，请重新处理...'"
       ></span>
 
       <el-row
         :gutter="20"
-        v-if="workDetails.handlerId === logUser && ( workDetails.maintenanceStatus === '3'|| workDetails.maintenanceStatus === '1' )"
+        v-if="
+          workDetails.handlerId === logUser &&
+          (workDetails.maintenanceStatus === '3' ||
+            workDetails.maintenanceStatus === '1')
+        "
       >
         <el-col :span="24">
           <el-form-item label="处理反馈：" prop="name">
             <el-input
               type="textarea"
-              :autosize="{ minRows: 2, maxRows: 5}"
+              :autosize="{ minRows: 2, maxRows: 5 }"
               placeholder
               v-model="form.feedbackInformation"
             ></el-input>
@@ -310,7 +381,7 @@
           <el-form-item label="处理意见：" prop="name">
             <el-input
               type="textarea"
-              :autosize="{ minRows: 2, maxRows: 5}"
+              :autosize="{ minRows: 2, maxRows: 5 }"
               placeholder
               v-model="form.advice"
             ></el-input>
@@ -318,7 +389,11 @@
         </el-col>
       </el-row>
       <div
-        v-show="workDetails.handlerId === logUser && ( workDetails.maintenanceStatus === '3' || workDetails.maintenanceStatus === '1' )"
+        v-show="
+          workDetails.handlerId === logUser &&
+          (workDetails.maintenanceStatus === '3' ||
+            workDetails.maintenanceStatus === '1')
+        "
         class="item-block-img"
       >
         <span class="label-wrap">现场图片：</span>
@@ -326,17 +401,41 @@
           <div class="img-show" v-for="(val, index) in pictures" :key="val">
             <img
               :src="getIotFileUrl(val)"
-              @mouseout="() => { showIndex = null }"
-              @mouseenter="() => { showIndex = index }"
+              @mouseout="
+                () => {
+                  showIndex = null;
+                }
+              "
+              @mouseenter="
+                () => {
+                  showIndex = index;
+                }
+              "
             />
             <div
               class="img-option-wrap"
-              @mouseout="() => { showIndex = null }"
-              @mouseover="() => { showIndex = index }"
+              @mouseout="
+                () => {
+                  showIndex = null;
+                }
+              "
+              @mouseover="
+                () => {
+                  showIndex = index;
+                }
+              "
               v-show="showIndex === index"
             >
-              <i class="el-icon-search" title="查看图片" @click="handlePictureCardPreview(val)"></i>
-              <i class="el-icon-delete" title="删除图片" @click="handelDelFile(val)"></i>
+              <i
+                class="el-icon-search"
+                title="查看图片"
+                @click="handlePictureCardPreview(val)"
+              ></i>
+              <i
+                class="el-icon-delete"
+                title="删除图片"
+                @click="handelDelFile(val)"
+              ></i>
             </div>
           </div>
           <el-upload
@@ -354,41 +453,61 @@
       <div class="form-submit-div">
         <el-button
           type="primary"
-          v-show="workDetails.reporterId === logUser && workDetails.maintenanceStatus === '1'"
+          v-show="
+            workDetails.reporterId === logUser &&
+            workDetails.maintenanceStatus === '1'
+          "
           size="mini"
           @click="repSrouSubmit()"
-        >确定订单</el-button>
+          >确定订单</el-button
+        >
 
         <el-button
           size="mini"
           type="primary"
           v-if="workDetails.maintenanceStatus === '0' && showForm === '0'"
           @click="handelReject()"
-        >退回</el-button>
+          >退回</el-button
+        >
         <el-button
           size="mini"
           type="primary"
-          v-if="( workDetails.maintenanceStatus === '0'  ||  workDetails.maintenanceStatus === '4') && showForm === '0'"
+          v-if="
+            (workDetails.maintenanceStatus === '0' ||
+              workDetails.maintenanceStatus === '4') &&
+            showForm === '0'
+          "
           @click="handelConfirm()"
-        >确认工单</el-button>
+          >确认工单</el-button
+        >
         <el-button
           size="mini"
           type="primary"
-          v-if="workDetails.handlerId === logUser && ( workDetails.maintenanceStatus === '2' )"
+          v-if="
+            workDetails.handlerId === logUser &&
+            workDetails.maintenanceStatus === '2'
+          "
           @click="handelComplete()"
-        >处理完成</el-button>
+          >处理完成</el-button
+        >
         <el-button
           size="mini"
           type="primary"
-          v-if="showForm === '1' && workDetails.maintenanceStatus === '1' && workDetails.handlerId === logUser"
+          v-if="
+            showForm === '1' &&
+            workDetails.maintenanceStatus === '1' &&
+            workDetails.handlerId === logUser
+          "
           @click="RejectSubmitForm()"
-        >提交0</el-button>
+          >提交</el-button
+        >
         <el-button
           size="mini"
           type="primary"
           v-if="showForm === '1' && workDetails.maintenanceStatus === '3'"
           @click="submitForm('3')"
-        >提交3</el-button>
+          >提交</el-button
+        >
       </div>
     </el-form>
 
@@ -403,17 +522,17 @@ import { uploadFile } from "@/api/file";
 import { getIotFileUrl } from "@/utils/hciot";
 // 工单状态(0:工单已创建 1:工单执行中 2:工单审核失败 3:工单审核成功)
 const workStateList = {
-  "0": "工单已创建",
-  "1": "退回工单",
-  "2": "确认工单",
-  "3": "处理完成",
-  "4": "退回处理",
-  "5": "审核通过"
+  0: "工单已创建",
+  1: "退回工单",
+  2: "确认工单",
+  3: "处理完成",
+  4: "退回处理",
+  5: "审核通过",
 };
 // 故障类型(0:设备离线 1:设备超警)
 const fanltTypeList = {
-  "0": "设备离线",
-  "1": "设备超警"
+  0: "设备离线",
+  1: "设备超警",
 };
 export default {
   name: "DetailsWrap",
@@ -434,13 +553,13 @@ export default {
         handelTime: "",
         feedbackInformation: "",
         maintenanceStatus: "",
-        pictures: []
+        pictures: [],
       },
       showForm: "0",
       workDetails: {},
       pictures: [],
       dialogVisible: false,
-      dialogImageUrl: ""
+      dialogImageUrl: "",
     };
   },
   created() {
@@ -475,13 +594,13 @@ export default {
       var formData = new FormData();
       formData.append("file", file.file);
       uploadFile(formData)
-        .then(response => {
+        .then((response) => {
           if (response.code === 200) {
             // this.temp.pictures.push(response.data.filePath)
             this.pictures.push(response.url);
           }
         })
-        .catch(e => {
+        .catch((e) => {
           console.log(e);
         });
     },
@@ -509,7 +628,7 @@ export default {
       //     auditOpinion: '不合格通过！'
       //   }
       // ]
-      getMaintenance(this.maintenanceId).then(response => {
+      getMaintenance(this.maintenanceId).then((response) => {
         this.workDetails = response.data;
         this.newTemp();
         this.pictures = this.workDetails.scenePictures
@@ -523,7 +642,7 @@ export default {
     repSrouSubmit() {
       this.showForm = "0";
       this.form.maintenanceStatus = "0";
-      updateMaintenance(this.form).then(res => {
+      updateMaintenance(this.form).then((res) => {
         if (res.code === 200) {
           this.workDetails = Object.assign(this.workDetails, this.form);
         }
@@ -545,7 +664,7 @@ export default {
       } else {
         this.form.scenePictures = "";
       }
-      updateMaintenance(this.form).then(res => {
+      updateMaintenance(this.form).then((res) => {
         if (res.code === 200) {
           this.workDetails = Object.assign(this.workDetails, this.form);
         }
@@ -556,7 +675,7 @@ export default {
       this.newTemp();
       this.showForm = "1";
       this.form.maintenanceStatus = "2";
-      updateMaintenance(this.form).then(res => {
+      updateMaintenance(this.form).then((res) => {
         if (res.code === 200) {
           this.workDetails = Object.assign(this.workDetails, this.form);
         }
@@ -578,7 +697,7 @@ export default {
       } else {
         this.form.scenePictures = "";
       }
-      updateMaintenance(this.form).then(res => {
+      updateMaintenance(this.form).then((res) => {
         if (res.code === 200) {
           this.workDetails = Object.assign(this.workDetails, this.form);
         }
@@ -616,10 +735,10 @@ export default {
     newTemp() {
       this.form = {
         maintenanceId: this.workDetails.maintenanceId,
-        maintenanceStatus: this.workDetails.maintenanceStatus
+        maintenanceStatus: this.workDetails.maintenanceStatus,
       };
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss">
diff --git a/src/views/power/mywork/index.vue b/src/views/power/mywork/index.vue
index 3fc8dd15..b0d08b8b 100644
--- a/src/views/power/mywork/index.vue
+++ b/src/views/power/mywork/index.vue
@@ -79,11 +79,13 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="maintenanceList">
+    <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="deviceName" />
       <el-table-column
         label="故障类型"
+        sortable="custom"
         align="center"
         width="150"
         prop="faultType"
@@ -92,7 +94,7 @@
       <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" prop="handleTime" width="120">
+      <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>
@@ -100,7 +102,26 @@
 
       <el-table-column label="工单状态" align="center" width="120" prop="maintenanceStatus">
         <template slot-scope="scope">
-          <span>{{ workStateList[scope.row.maintenanceStatus] }}</span>
+          <el-tag v-if="scope.row.maintenanceStatus === '0'" type="info">{{
+            workStateList[scope.row.maintenanceStatus]
+          }}</el-tag>
+          <el-tag v-if="scope.row.maintenanceStatus === '5'" type="success">{{
+            workStateList[scope.row.maintenanceStatus]
+          }}</el-tag>
+          <el-tag v-if="scope.row.maintenanceStatus === '3'">{{
+            workStateList[scope.row.maintenanceStatus]
+          }}</el-tag>
+          <el-tag type="warning" v-if="scope.row.maintenanceStatus === '2'">{{
+            workStateList[scope.row.maintenanceStatus]
+          }}</el-tag>
+          <el-tag
+            type="danger"
+            v-if="
+              scope.row.maintenanceStatus === '1' ||
+              scope.row.maintenanceStatus === '4'
+            "
+            >{{ workStateList[scope.row.maintenanceStatus] }}</el-tag
+          >
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
@@ -148,16 +169,16 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="工单状态">
+        <!-- <el-form-item label="工单状态">
           <el-input v-model="form.maintenanceStatus"></el-input>
         </el-form-item>
 
         <el-form-item label="上报人" prop="reporterName">
           <el-input v-model="form.reporterName" disabled placeholder="请输入上报人昵称" />
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item label="处理人" prop="handlerId">
-          <treeselect
+          <!-- <treeselect
             ref="treeselect"
             @select="treeselect"
             noChildrenText="暂无"
@@ -168,7 +189,19 @@
             :disable-branch-nodes="true"
             :show-count="true"
             placeholder="请选择处理人"
-          />
+          /> -->
+          <el-select
+            v-model="form.handlerId"
+            style="width: 100%"
+            placeholder="请选择处理人"
+          >
+            <el-option
+              v-for="item in gdUserList"
+              :key="item.userId"
+              :label="item.nickName"
+              :value="item.userId"
+            />
+          </el-select>
         </el-form-item>
 
         <el-form-item label="工作内容" prop="maintenanceContext">
@@ -227,7 +260,7 @@
 
 <script>
 import {
-  listMaintenance,
+  myListMaintenance,
   getMaintenance,
   delMaintenance,
   addMaintenance,
@@ -235,7 +268,7 @@ import {
   exportMaintenance
 } from "@/api/power/maintenance";
 import { listDevice } from "@/api/iot/device";
-import { listUser } from "@/api/system/user";
+import { listUser, gdListUser } from "@/api/system/user";
 import { listDept } from "@/api/system/dept";
 import DetailsWrap from "./details";
 import Treeselect from "@riophae/vue-treeselect";
@@ -309,7 +342,8 @@ export default {
       form: {},
       // 表单校验
       rules: {},
-      deptOptions: []
+      deptOptions: [],
+      gdUserList: []
     };
   },
   created() {
@@ -321,6 +355,20 @@ export default {
     this.getTreeselect();
   },
   methods: {
+    // 获取 工单 处理人列表
+    gdListUser() {
+      gdListUser().then(response => {
+        this.gdUserList = response.data;
+      });
+    },
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
     dialogCloes() {
       this.getList();
     },
@@ -496,7 +544,7 @@ export default {
     /** 查询工单信息列表 */
     getList() {
       this.loading = true;
-      listMaintenance(this.queryParams).then(response => {
+      myListMaintenance(this.queryParams).then(response => {
         this.maintenanceList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -553,6 +601,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.gdListUser()
       this.form.reporterName = this.$store.getters.name;
       this.form.reporterId = this.$store.getters.userId;
       this.open = true;
@@ -563,6 +612,7 @@ export default {
       this.reset();
       const maintenanceId = row.maintenanceId || this.ids;
       getMaintenance(maintenanceId).then(response => {
+        this.gdListUser();
         this.form = response.data;
         this.open = true;
         // this.form.reporterName = this.$store.getters.name;
diff --git a/src/views/profile/Contract/index.vue b/src/views/profile/Contract/index.vue
index 9e3645be..7864ee76 100644
--- a/src/views/profile/Contract/index.vue
+++ b/src/views/profile/Contract/index.vue
@@ -43,7 +43,7 @@
           v-hasPermi="['iot:contract:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -52,7 +52,7 @@
           @click="handleExport"
           v-hasPermi="['iot:contract:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -79,6 +79,12 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleDestail(scope.row)"
+          >详情</el-button>
           <el-button
             size="mini"
             type="text"
@@ -114,7 +120,7 @@
       :close-on-click-modal="false"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :disabled="tempType === 'destail'" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="合同名称:" prop="contractName">
           <el-input v-model="form.contractName" placeholder="请输入合同名称" />
         </el-form-item>
@@ -166,7 +172,7 @@
         </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" v-show="tempType !== 'destail'" @click="submitForm">确 定</el-button>
         <el-button size="mini" @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -234,7 +240,8 @@ export default {
         contractType: [
           { required: true, message: "请选择合同类型", trigger: "blur" }
         ]
-      }
+      },
+      tempType: ''
     };
   },
   created() {
@@ -364,6 +371,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加电价合同";
+      this.tempType = 'add'
       this.form.priceContractRuleList.push({
         maxTime: "",
         maxVal: "",
@@ -387,9 +395,25 @@ export default {
         });
         this.form.priceContractRuleList = arr || [];
         this.open = true;
+        this.tempType = 'update'
         this.title = "修改电价合同";
       });
     },
+    handleDestail(row) {
+      this.reset();
+      const contractId = row.contractId || this.ids;
+      getContract(contractId).then(response => {
+        this.form = response.data;
+        var arr = [];
+        response.data.priceContractRuleList.forEach(v => {
+          arr.push(Object.assign(v, { guid: this.getGuid() }));
+        });
+        this.form.priceContractRuleList = arr || [];
+        this.tempType = 'destail'
+        this.open = true;
+        this.title = "电价合同详情";
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
diff --git a/src/views/profile/DeviceDetailsView/deviceSelectNav.vue b/src/views/profile/DeviceDetailsView/deviceSelectNav.vue
index 081ca11e..2182922a 100644
--- a/src/views/profile/DeviceDetailsView/deviceSelectNav.vue
+++ b/src/views/profile/DeviceDetailsView/deviceSelectNav.vue
@@ -169,7 +169,7 @@
             >
             <el-button
               size="mini"
-              v-else-if="item.switch === '0'"
+              v-else
               :disabled="item.deviceId !== checkobxDeviceId"
               @click="submitChildStatus('true', item)"
               type="danger"
@@ -351,15 +351,15 @@ export default {
       const _this = this;
       this.timingPingWs_flag = setInterval(function () {
         _this.extenSubmit(row)
-      }, 5000);
+      }, 110000);
     },
     extenSubmit(row) {
       let params = {
           data: {
             cmd: "set_live_time",
             params: {
-              ltime: 10,
-              dtime: 1200,
+              ltime: 15, // 上报间隔(0.1秒)
+              dtime: 1200, //上报时长(0.1秒)
             },
           },
           deviceId: row.deviceId,
diff --git a/src/views/profile/DeviceDetailsView/index.vue b/src/views/profile/DeviceDetailsView/index.vue
index e7a1ea69..40a65363 100644
--- a/src/views/profile/DeviceDetailsView/index.vue
+++ b/src/views/profile/DeviceDetailsView/index.vue
@@ -29,11 +29,17 @@
             <info-wrap :infoData="infoData" @updateInfo="updateInfo($event)" />
           </div>
         </el-tab-pane>
-         <el-tab-pane label="触发器" name="trigger">
+        <el-tab-pane label="触发器" name="trigger">
           <div class="tabs-body protocol-wrap">
             <trigger-wrap :sourceId="infoData.deviceId" :deviceInfo="infoData"></trigger-wrap>
           </div>
         </el-tab-pane>
+        <el-tab-pane label="固件" name="oat">
+          <div class="tabs-body protocol-wrap">
+
+            <model-oat v-if="activeName === 'oat'" :deviceInfo="infoData" @updateInfo="updateInfo($event)" ></model-oat>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -44,6 +50,7 @@ import InfoWrap from "./info";
 import StateManagement from "./stateManagement";
 import TriggerWrap from "@/views/profile/DeviceTrigger/index";
 import DeviceSelect from './deviceSelectNav'
+import ModelOat from './modelOat'
 export default {
   name: "DetailsWrap",
   props: ["sourceId"],
@@ -51,7 +58,8 @@ export default {
     InfoWrap,
     StateManagement,
     TriggerWrap,
-    DeviceSelect
+    DeviceSelect,
+    ModelOat
   },
   data() {
     return {
diff --git a/src/views/profile/DeviceDetailsView/modelOat.vue b/src/views/profile/DeviceDetailsView/modelOat.vue
new file mode 100644
index 00000000..e7cd4b8f
--- /dev/null
+++ b/src/views/profile/DeviceDetailsView/modelOat.vue
@@ -0,0 +1,384 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="固件版本" prop="otaVersion">
+        <el-input
+          v-model="queryParams.otaVersion"
+          placeholder="请输入固件版本"
+          clearable
+          size="small"
+          @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
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      v-loading="loading"
+      :data="otaList"
+      :default-sort="{ prop: 'createTime', order: 'descending' }"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        align="center"
+        :index="indexFormatter"
+        width="80px"
+      ></el-table-column>
+      <el-table-column label="型号" align="laft" width="200" prop="modelName" />
+      <el-table-column
+        label="固件版本"
+        align="center"
+        width="160"
+        prop="otaVersion"
+      />
+      <el-table-column
+        label="固件大小"
+        align="center"
+        width="160"
+        prop="otaSize"
+      />
+      <el-table-column label="升级地址" align="left" prop="otaUrl">
+        <template slot-scope="scope">
+          <span
+            style="
+              width: calc(100% - 60px);
+              white-space: nowrap;
+              display: inline-block;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              line-height: 30px;
+              height: 20px;
+            "
+            >{{ scope.row.otaUrl }}</span
+          >
+          <!-- <span
+            style="
+              cursor: default;
+              position: relative;
+              right: -10px;
+              color: #3a8ee6;
+            "
+            @click="copyOnClick(scope.row.otaUrl)"
+            >复制</span
+          > -->
+        </template>
+      </el-table-column>
+      <el-table-column label="文件地址" align="left" prop="txtUrl">
+        <template slot-scope="scope">
+          <span
+            style="
+              width: calc(100% - 60px);
+              white-space: nowrap;
+              display: inline-block;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              height: 20px;
+              line-height: 30px;
+            "
+            >{{ scope.row.txtUrl }}</span
+          >
+          <!-- <span
+            style="
+              cursor: default;
+              position: relative;
+              right: -10px;
+              color: #3a8ee6;
+            "
+            @click="copyOnClick(scope.row.txtUrl)"
+            >复制</span
+          > -->
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="升级信息"
+        align="left"
+        prop="otaInfo"
+      ></el-table-column>
+      <el-table-column
+        label=" 创建时间"
+        align="center"
+        prop="createTime"
+        sortable="custom"
+        width="150px"
+      />
+      <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"
+            @click="handleUpdate(scope.row)"
+            v-show="deviceInfo['otaVersion'] !== scope.row.otaVersion"
+            >升级固件</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import {
+  listOta,
+  upgradeOta
+} from "@/api/iot/deviceOta";
+import DialogTemplate from "@/components/DialogTemplate";
+import { listModel, getModel } from "@/api/iot/model";
+import { uploadFile } from "@/api/file";
+
+export default {
+  name: "Ota",
+  props: {
+    deviceInfo: {
+      type: Object,
+      default: {}
+    }
+  },
+  components: {
+    DialogTemplate,
+  },
+  data() {
+    return {
+      isFileUpload: "input",
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 固件版本表格数据
+      otaList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        modelId: null,
+        otaVersion: null,
+        otaSize: null,
+        otaUrl: null,
+        txtUrl: null,
+        otaInfo: null,
+      },
+      selectTableShow: false,
+      tableSelectOption: {},
+      selectResult: {},
+      // 表单参数
+      form: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    copyOnClick(val) {
+      let self = this;
+      this.$copyText(val).then(
+        function () {
+          self.$message({
+            message: "复制成功",
+            type: "success",
+          });
+        },
+        function () {
+          self.$message.error("复制失败");
+        }
+      );
+    },
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = this.fileType.indexOf(file.type) >= 0;
+      const isLt2M = file.size < this.fileSize;
+
+      if (!isJPG) {
+        this.$message.error("上传头像图片只能是 JPG 格式!");
+      }
+      if (!isLt2M) {
+        this.$message.error("上传头像图片大小不能超过 2MB!");
+      }
+      return isLt2M;
+    },
+
+    indexFormatter(val) {
+      return (
+        val + 1 + (this.queryParams.pageNum - 1) * this.queryParams.pageSize
+      );
+    },
+    /** 查询固件版本列表 */
+    getList() {
+      this.loading = true;
+      listOta(Object.assign(this.queryParams, {
+          modelId: this.deviceInfo.modelId
+      })).then((response) => {
+        this.otaList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        otaId: null,
+        modelId: null,
+        otaVersion: null,
+        otaSize: null,
+        otaUrl: null,
+        txtUrl: null,
+        otaInfo: null,
+        createId: null,
+        createTime: null,
+        updateId: null,
+        updateTime: null,
+        modelName: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.otaId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      let that = this
+      this.$confirm("升级固件操作执行中，可能由 设备异常 等问题导致升级不成功，是否升级该固件?", "升级固件", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "success",
+      })
+        .then(function () {
+          return upgradeOta({
+            'otaId': row.otaId,
+            'deviceId': that.deviceInfo.deviceId
+          });
+        })
+        .then(() => {
+          this.$emit('updateInfo')
+          this.getList();
+          // this.msgSuccess("固件升级成功");
+          this.$message({
+            message: '升级固件已经提交，固件正在升级中（过程中有可能由 异常 等问题导致升级不成功！）',
+            type: 'success'
+          });
+        });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.otaId != null) {
+            updateOta(this.form).then((response) => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOta(this.form).then((response) => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const otaIds = row.otaId || this.ids;
+      this.$confirm("是否删除该选项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return delOta(otaIds);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有固件版本数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return exportOta(queryParams);
+        })
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+  },
+};
+</script>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 9a923642..79ca423c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -163,7 +163,7 @@
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
         </el-form-item>
         <el-form-item label="权限字符:" prop="roleKey">
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
+          <el-input v-model="form.roleKey" :disabled="form.roleId !== undefined && form.roleId !== null"  placeholder="请输入权限字符" />
         </el-form-item>
         <el-form-item label="角色顺序:" prop="roleSort">
           <el-input-number
diff --git a/src/views/system/tenant/profile/disRole.vue b/src/views/system/tenant/profile/disRole.vue
index fc11d37e..c1a75b1f 100644
--- a/src/views/system/tenant/profile/disRole.vue
+++ b/src/views/system/tenant/profile/disRole.vue
@@ -185,7 +185,7 @@
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
         </el-form-item>
         <el-form-item label="权限字符" prop="roleKey">
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
+          <el-input v-model="form.roleKey" :disabled="form.roleId !== undefined || form.roleId !== null" placeholder="请输入权限字符" />
         </el-form-item>
         <el-form-item label="角色顺序" prop="roleSort">
           <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
diff --git a/src/views/tenant/alarm/record.vue b/src/views/tenant/alarm/record.vue
index 769e6d20..1a1b2f45 100644
--- a/src/views/tenant/alarm/record.vue
+++ b/src/views/tenant/alarm/record.vue
@@ -18,7 +18,8 @@
           :default-time="['00:00:00', '23:59:59']"
           range-separator="至"
           start-placeholder="开始日期"
-          end-placeholder="结束日期">
+          end-placeholder="结束日期"
+        >
         </el-date-picker>
       </el-form-item>
 
@@ -32,8 +33,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>
 
@@ -46,30 +55,77 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['tenant:record: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="recordList">
-      <el-table-column type="index" label="序号" align="center" :index="indexFormatter" width="80px"></el-table-column>
-      <el-table-column label="设备名称" align="left" width="200px" prop="deviceName" />
+    <el-table
+      v-loading="loading"
+      :data="recordList"
+      :default-sort="{ prop: 'alarmTime', 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"
+        width="200px"
+        prop="deviceName"
+      />
       <!-- <el-table-column label="设备当前值" align="left"  width="200px" prop="currentValue" /> -->
       <el-table-column label="推送内容" align="left" prop="alarmContent" />
-      <el-table-column label="报警时间" align="center" prop="alarmTime" width="150">
+      <el-table-column
+        label="报警时间"
+        align="center"
+        prop="alarmTime"
+        sortable="custom"
+        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 label="处理状态" width="100px" align="center" prop="processStatus" :formatter="stateFormatter"/>
-      <el-table-column label="处理结果" align="left"  prop="processResult" />
-      <el-table-column label="处理时间" align="center" prop="processTime" width="150">
+      <el-table-column
+        label="处理状态"
+        width="100px"
+        align="center"
+        prop="processStatus"
+        :formatter="stateFormatter"
+      />
+      <el-table-column label="处理结果" align="left" prop="processResult" />
+      <el-table-column
+        label="处理时间"
+        align="center"
+        prop="processTime"
+        sortable="custom"
+        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 label="告警类型" align="left" width="130px" prop="typeName" />
-      <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="告警类型"
+        align="left"
+        width="200px"
+        prop="typeName"
+      />
+      <!-- <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -77,7 +133,7 @@
             icon="el-icon-edit"
             v-show="scope.row.processStatus === '1'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['tenant:record:edit']"
+            v-hasPermi="['iot:record:edit']"
           >处理</el-button>
           <el-button
             size="mini"
@@ -85,39 +141,49 @@
             icon="el-icon-edit"
             v-show="scope.row.processStatus === '1'"
             @click="handleWork(scope.row)"
-            v-hasPermi="['tenant:record:edit']"
+            v-hasPermi="['iot:record:edit']"
           >创建工单</el-button>
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['tenant:record:edit']"
-          >删除</el-button> -->
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
 
-    <el-dialog class="eldialog-wrap" :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px">
-      <el-form ref="dialogForm" :model="form" :rules="rules" label-width="100px">
+    <el-dialog
+      class="eldialog-wrap"
+      :close-on-click-modal="false"
+      :title="title"
+      :visible.sync="open"
+      width="600px"
+    >
+      <el-form
+        ref="dialogForm"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+      >
         <el-form-item label="处理结果:" prop="processResult">
-          <el-input type="textarea" :rows="2" v-model="form.processResult" placeholder="请输入处理结果" />
+          <el-input
+            type="textarea"
+            :rows="2"
+            v-model="form.processResult"
+            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="open = false">取 消</el-button>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
@@ -127,14 +193,14 @@ import {
   getRecord,
   exportRecord,
   updateRecord,
-  delRecord
+  delRecord,
 } from "@/api/alarm/tenantAlarm";
 import Editor from "@/components/Editor";
 
 export default {
   name: "Record",
   components: {
-    Editor
+    Editor,
   },
   data() {
     return {
@@ -164,13 +230,13 @@ export default {
         typeCode: null,
         beginTime: null,
         endTime: null,
-        alarmDivide: 'ALARM'
+        alarmDivide: "ALARM",
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {},
-      time: []
+      time: [],
     };
   },
   created() {
@@ -178,18 +244,32 @@ export default {
     this.getList();
   },
   methods: {
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
     queryTimeChange(val) {
       if (val) {
-        this.queryParams.beginTime = this.parseTime(val[0], '{y}-{m}-{d} {h}:{i}:{s}')
-        this.queryParams.endTime = this.parseTime(val[1], '{y}-{m}-{d} {h}:{i}:{s}')
+        this.queryParams.beginTime = this.parseTime(
+          val[0],
+          "{y}-{m}-{d} {h}:{i}:{s}"
+        );
+        this.queryParams.endTime = this.parseTime(
+          val[1],
+          "{y}-{m}-{d} {h}:{i}:{s}"
+        );
       } else {
         this.queryParams.beginTime = null;
         this.queryParams.endTime = null;
       }
     },
     newTime() {
-      const startTime = this.parseTime(new Date(), '{y}-{m}-{d} 00:00:00');
-      const endTime = this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}');
+      const startTime = this.parseTime(new Date(), "{y}-{m}-{d} 00:00:00");
+      const endTime = this.parseTime(new Date(), "{y}-{m}-{d} {h}:{i}:{s}");
       this.time = [startTime, endTime];
     },
     /** 删除按钮操作 */
@@ -198,9 +278,9 @@ export default {
       this.$confirm("是否删除该选项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
-        .then(function() {
+        .then(function () {
           return delRecord(recordId);
         })
         .then(() => {
@@ -209,39 +289,54 @@ export default {
         });
     },
     submitForm() {
-      this.$refs['dialogForm'].validate((v) => {
+      this.$refs["dialogForm"].validate((v) => {
         if (v) {
-          this.form.processTime = this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}');
-          this.form.processStatus = '2'
-          updateRecord(this.form).then(response => {
+          this.form.processTime = this.parseTime(
+            new Date(),
+            "{y}-{m}-{d} {h}:{i}:{s}"
+          );
+          this.form.processStatus = "2";
+          updateRecord(this.form).then((response) => {
             this.msgSuccess("修改成功");
             this.open = false;
             this.getList();
-          })
+          });
         }
-      })
+      });
     },
     // 转工单处理
     handleWork() {},
     // 处理告警
     handleUpdate(row) {
       this.resetFomr();
-      getRecord(row.recordId).then(res => {
+      getRecord(row.recordId).then((res) => {
         this.form = res.data;
         this.open = true;
-        this.title = '告警处理';
-      })
+        this.title = "告警处理";
+      });
     },
     resetFomr() {
       this.form = {
-        processResult: '',
-        processStatus: '',
-        processTime: '',
-        recordId: ''
-      }
+        processResult: "",
+        processStatus: "",
+        processTime: "",
+        recordId: "",
+      };
     },
     stateFormatter(val) {
-      return  val.processStatus === '2' ? '已处理' : '未处理'
+      switch (val.processStatus) {
+        case "1":
+          return "已处理";
+
+        case "0":
+          return "未处理";
+
+        case "2":
+          return "误报";
+
+        default:
+          return "未处理";
+      }
     },
     indexFormatter(val) {
       return (
@@ -251,7 +346,7 @@ export default {
     /** 查询报警记录列表 */
     getList() {
       this.loading = true;
-      listRecord(this.queryParams).then(response => {
+      listRecord(this.queryParams).then((response) => {
         this.recordList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -264,11 +359,11 @@ export default {
     },
     // 根据id获取记录详情
     getRecordInfo(id) {
-      getRecord(id).then(res => {
+      getRecord(id).then((res) => {
         this.form = res.data;
         this.open = true;
         this.title = `告警记录详情`;
-      })
+      });
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -289,15 +384,15 @@ export default {
       this.$confirm("是否确认导出所有报警记录数据项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
-        .then(function() {
+        .then(function () {
           return exportRecord(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.download(response.msg);
         });
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/tenant/alarm/warning.vue b/src/views/tenant/alarm/warning.vue
index 4fd11ebe..296112d3 100644
--- a/src/views/tenant/alarm/warning.vue
+++ b/src/views/tenant/alarm/warning.vue
@@ -18,7 +18,8 @@
           :default-time="['00:00:00', '23:59:59']"
           range-separator="至"
           start-placeholder="开始日期"
-          end-placeholder="结束日期">
+          end-placeholder="结束日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="预警类型" prop="typeName">
@@ -31,8 +32,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>
 
@@ -45,30 +54,77 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['tenant:record: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="recordList">
-      <el-table-column type="index" label="序号" align="center" :index="indexFormatter" width="80px"></el-table-column>
-      <el-table-column label="设备名称" align="left" width="200px" prop="deviceName" />
+    <el-table
+      v-loading="loading"
+      :data="recordList"
+      :default-sort="{ prop: 'alarmTime', 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"
+        width="200px"
+        prop="deviceName"
+      />
       <!-- <el-table-column label="设备当前值" align="left"  width="200px" prop="currentValue" /> -->
       <el-table-column label="推送内容" align="left" prop="alarmContent" />
-      <el-table-column label="预警时间" align="center" prop="alarmTime" width="150">
+      <el-table-column
+        label="预警时间"
+        align="center"
+        prop="alarmTime"
+        width="150"
+        sortable="custom"
+      >
         <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 label="处理状态" width="100px" align="center" prop="processStatus" :formatter="stateFormatter"/>
-      <el-table-column label="处理结果" align="left"  prop="processResult" />
-      <el-table-column label="处理时间" align="center" prop="processTime" width="150">
+      <el-table-column
+        label="处理状态"
+        width="100px"
+        align="center"
+        prop="processStatus"
+        :formatter="stateFormatter"
+      />
+      <el-table-column label="处理结果" align="left" prop="processResult" />
+      <el-table-column
+        label="处理时间"
+        align="center"
+        sortable="custom"
+        prop="processTime"
+        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 label="预警类型" align="left" width="130px" prop="typeName" />
-      <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="预警类型"
+        align="left"
+        width="200px"
+        prop="typeName"
+      />
+      <!-- <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -76,7 +132,7 @@
             icon="el-icon-edit"
             v-show="scope.row.processStatus === '1'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['tenant:record:edit']"
+            v-hasPermi="['iot:record:edit']"
           >处理</el-button>
           <el-button
             size="mini"
@@ -84,39 +140,49 @@
             icon="el-icon-edit"
             v-show="scope.row.processStatus === '1'"
             @click="handleWork(scope.row)"
-            v-hasPermi="['tenant:record:edit']"
+            v-hasPermi="['iot:record:edit']"
           >创建工单</el-button>
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['tenant:record:edit']"
-          >删除</el-button> -->
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
 
-    <el-dialog class="eldialog-wrap" :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px">
-      <el-form ref="dialogForm" :model="form" :rules="rules" label-width="100px">
+    <el-dialog
+      class="eldialog-wrap"
+      :close-on-click-modal="false"
+      :title="title"
+      :visible.sync="open"
+      width="600px"
+    >
+      <el-form
+        ref="dialogForm"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+      >
         <el-form-item label="处理结果:" prop="processResult">
-          <el-input type="textarea" :rows="2" v-model="form.processResult" placeholder="请输入处理结果" />
+          <el-input
+            type="textarea"
+            :rows="2"
+            v-model="form.processResult"
+            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="open = false">取 消</el-button>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
@@ -126,14 +192,14 @@ import {
   getRecord,
   exportRecord,
   updateRecord,
-  delRecord
+  delRecord,
 } from "@/api/alarm/tenantAlarm";
 import Editor from "@/components/Editor";
 
 export default {
   name: "Warning",
   components: {
-    Editor
+    Editor,
   },
   data() {
     return {
@@ -163,23 +229,37 @@ export default {
         typeCode: null,
         beginTime: null,
         endTime: null,
-        alarmDivide: 'WARNING'
+        alarmDivide: "WARNING",
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {},
-      time: []
+      time: [],
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    sortChange(column) {
+      const sort = {
+        isAsc: column.order === "descending" ? "desc" : "asc",
+        orderByColumn: column.prop,
+      };
+      this.queryParams = Object.assign(this.queryParams, sort);
+      this.handleQuery();
+    },
     queryTimeChange(val) {
       if (val) {
-        this.queryParams.beginTime = this.parseTime(val[0], '{y}-{m}-{d} {h}:{i}:{s}')
-        this.queryParams.endTime = this.parseTime(val[1], '{y}-{m}-{d} {h}:{i}:{s}')
+        this.queryParams.beginTime = this.parseTime(
+          val[0],
+          "{y}-{m}-{d} {h}:{i}:{s}"
+        );
+        this.queryParams.endTime = this.parseTime(
+          val[1],
+          "{y}-{m}-{d} {h}:{i}:{s}"
+        );
       } else {
         this.queryParams.beginTime = null;
         this.queryParams.endTime = null;
@@ -191,9 +271,9 @@ export default {
       this.$confirm("是否删除该选项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
-        .then(function() {
+        .then(function () {
           return delRecord(recordId);
         })
         .then(() => {
@@ -202,39 +282,55 @@ export default {
         });
     },
     submitForm() {
-      this.$refs['dialogForm'].validate((v) => {
+      this.$refs["dialogForm"].validate((v) => {
         if (v) {
-          this.form.processTime = this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}');
-          this.form.processStatus = '2'
-          updateRecord(this.form).then(response => {
+          this.form.processTime = this.parseTime(
+            new Date(),
+            "{y}-{m}-{d} {h}:{i}:{s}"
+          );
+          this.form.processStatus = "2";
+          updateRecord(this.form).then((response) => {
             this.msgSuccess("修改成功");
             this.open = false;
             this.getList();
-          })
+          });
         }
-      })
+      });
     },
     // 转工单处理
     handleWork() {},
     // 处理预警
     handleUpdate(row) {
       this.resetFomr();
-      getRecord(row.recordId).then(res => {
+      getRecord(row.recordId).then((res) => {
         this.form = res.data;
         this.open = true;
-        this.title = '预警处理';
-      })
+        this.title = "预警处理";
+      });
     },
     resetFomr() {
       this.form = {
-        processResult: '',
-        processStatus: '',
-        processTime: '',
-        recordId: ''
-      }
+        processResult: "",
+        processStatus: "",
+        processTime: "",
+        recordId: "",
+      };
     },
     stateFormatter(val) {
-      return  val.processStatus === '2' ? '已处理' : '未处理'
+      console.log(val);
+      switch (val.processStatus) {
+        case "1":
+          return "已处理";
+
+        case "0":
+          return "未处理";
+
+        case "2":
+          return "误报";
+
+        default:
+          return "未处理";
+      }
     },
     indexFormatter(val) {
       return (
@@ -244,7 +340,7 @@ export default {
     /** 查询预警记录列表 */
     getList() {
       this.loading = true;
-      listRecord(this.queryParams).then(response => {
+      listRecord(this.queryParams).then((response) => {
         this.recordList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -257,11 +353,11 @@ export default {
     },
     // 根据id获取记录详情
     getRecordInfo(id) {
-      getRecord(id).then(res => {
+      getRecord(id).then((res) => {
         this.form = res.data;
         this.open = true;
         this.title = `预警记录详情`;
-      })
+      });
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -282,15 +378,15 @@ export default {
       this.$confirm("是否确认导出所有预警记录数据项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
-        .then(function() {
+        .then(function () {
           return exportRecord(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.download(response.msg);
         });
-    }
-  }
+    },
+  },
 };
 </script>