工单管理逻辑调整

README.md

@@ -28,3 +28,8 @@ npm run build:stage
 # 构建生产环境
 npm run build:prod
 ```
+
+
+
+
+

src/api/business/OM/workMange/index.js

@@ -93,11 +93,4 @@ export function tbAlarmPL(data) { //消防告警批量工单处理
         method: 'put',
         data
     })
-}
-// export function workOrderOne(data) { //消防告警批量工单处理
-//     return request({
-//         url: "/workOrder/oneByType",
-//         method: 'put',
-//         data
-//     })
-// }
+}

src/views/business/OM/eventCenter/alarm/index.vue

@@ -112,41 +112,6 @@
         prop="createTime"
         show-overflow-tooltip
       />
-      <!-- <el-table-column label="是否误报" align="center" prop="isAlarm" >
-        <template slot-scope="scope">
-          <span :class="scope.row.isAlarm == true ? 'color3' : 'color4'">{{scope.row.isAlarm == true ? "是" : "否"}}</span>
-        </template>
-      </el-table-column> -->
-      <el-table-column
-        label="处理状态"
-        align="center"
-        prop="alarmStatus"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          <span :class="scope.row.alarmStatus == 0 ? 'color3' : 'color4'">{{
-            scope.row.alarmStatus == 0 ? "未处理" : "已处理"
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="处置内容"
-        align="center"
-        prop="checkContent"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        label="处理人"
-        align="center"
-        prop="updateBy"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        label="处理时间"
-        align="center"
-        prop="updateTime"
-        show-overflow-tooltip
-      />
       <el-table-column
         label="操作"
         align="center"
@@ -161,24 +126,14 @@
             >查看详情</el-button
           >
           <el-button
-            v-if="scope.row.alarmStatus == '0'"
-            size="mini"
-            type="text"
-            icon="el-icon-s-promotion"
-            @click="jump(scope.row)"
-            v-hasPermi="['system:admin:edit']"
-            >跳转至工单</el-button
-          >
-          <el-button
-            v-if="scope.row.alarmStatus == '1'"
             size="mini"
             type="text"
             icon="el-icon-s-promotion"
             @click="jump(scope.row)"
-            disabled
             v-hasPermi="['system:admin:edit']"
             >跳转至工单</el-button
           >
+
         </template>
       </el-table-column>
     </el-table>
@@ -210,12 +165,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="报告数据：" prop="property">
-              <span>{{ form.property }}</span>
+              <span>{{ form.property  || "--"}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="报告内容：" prop="deviceName">
-              <span>{{ form.deviceName }}</span>
+              <span>{{ form.deviceName  || "--"}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -224,23 +179,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="处理人：" prop="updateBy">
-              <span>{{ form.updateBy }}</span>
+            <el-form-item label="误报：" prop="isAlarm">
+              <span>{{ form.isAlarm }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="处理时间：" prop="updateTime">
-              <span>{{ form.updateTime }}</span>
+            <el-form-item label="处理人：" prop="updateBy">
+              <span>{{ form.updateBy  || "--"}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="处理内容：" prop="checkContent">
-              <span>{{ form.checkContent }}</span>
+            <el-form-item label="处理时间：" prop="updateTime">
+              <span>{{ form.updateTime  || "--"}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="误报：" prop="isAlarm">
-              <span>{{ form.isAlarm }}</span>
+            <el-form-item label="处理内容：" prop="checkContent">
+              <span>{{ form.checkContent  || "--"}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -525,7 +480,7 @@ export default {
       this.$router.push({
         path: "/OM/business/OM/workMange",
         query: {
-          id: row.id,
+          id: row.workId,
           type: 1,
         },
       });

src/views/business/OM/eventCenter/event/index.vue

@@ -138,31 +138,6 @@
         prop="reportingTime"
         show-overflow-tooltip
       />
-      <el-table-column label="处理状态" align="center" prop="clzt">
-        <template slot-scope="scope">
-          <span :class="scope.row.clzt == 0 ? 'color3' : 'color4'">{{
-            scope.row.clzt == 0 ? "未处理" : "已处理"
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="处置内容"
-        align="center"
-        prop="clContent"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        label="处理人"
-        align="center"
-        prop="clPeople"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        label="处理时间"
-        align="center"
-        prop="clTiem"
-        show-overflow-tooltip
-      />
       <el-table-column
         label="操作"
         align="center"
@@ -177,21 +152,10 @@
             >查看详情</el-button
           >
           <el-button
-            v-if="scope.row.alarmStatus == '0'"
-            size="mini"
-            type="text"
-            icon="el-icon-s-promotion"
-            @click="jump(scope.row)"
-            v-hasPermi="['system:admin:edit']"
-            >跳转至工单</el-button
-          >
-          <el-button
-            v-if="scope.row.alarmStatus == '1'"
             size="mini"
             type="text"
             icon="el-icon-s-promotion"
             @click="jump(scope.row)"
-            disabled
             v-hasPermi="['system:admin:edit']"
             >跳转至工单</el-button
           >
@@ -220,23 +184,28 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="报告时间：" prop="alarmTime">
-              <span>{{ form.alarmTime }}</span>
+            <el-form-item label="报告时间：" prop="reportingTime">
+              <span>{{ form.reportingTime }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="报告数据：" prop="property">
-              <span>{{ form.property }}</span>
+              <span>{{ form.property  || "--"}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="报告内容：" prop="deviceName">
-              <span>{{ form.deviceName }}</span>
+              <span>{{ form.deviceName  || "--"}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="处理状态：" prop="alarmStatus">
-              <span>{{ form.alarmStatus }}</span>
+              <span>{{ form.alarmStatus  || "--"}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="误报：" prop="isAlarm">
+              <span>{{ form.isAlarm }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -246,17 +215,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="处理时间：" prop="updateTime">
-              <span>{{ form.updateTime }}</span>
+              <span>{{ form.updateTime  || "--"}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="处理内容：" prop="checkContent">
-              <span>{{ form.checkContent }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="误报：" prop="isAlarm">
-              <span>{{ form.isAlarm }}</span>
+              <span>{{ form.checkContent  || "--"}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -533,7 +497,7 @@ export default {
       this.$router.push({
         path: "/OM/business/OM/workMange",
         query: {
-          id: row.id,
+          id: row.workId,
           type: 1,
         },
       });

src/views/business/OM/eventCenter/hiddenDanger/index.vue

@@ -61,19 +61,6 @@
       <el-table-column label="设备名称" align="center" prop="deviceName" show-overflow-tooltip />
       <el-table-column label="报告数据" align="center" prop="property" show-overflow-tooltip />
       <el-table-column label="上报时间" align="center" prop="createTime" show-overflow-tooltip />
-      <!-- <el-table-column label="是否误报" align="center" prop="isAlarm" >
-        <template slot-scope="scope">
-          <span :class="scope.row.isAlarm == true ? 'color3' : 'color4'">{{scope.row.isAlarm == true ? "是" : "否"}}</span>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="处理状态" align="center" prop="alarmStatus" show-overflow-tooltip >
-        <template slot-scope="scope">
-          <span :class="scope.row.alarmStatus == 0 ? 'color3' : 'color4'">{{scope.row.alarmStatus == 0 ? "未处理" : "已处理"}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="处理内容" align="center" prop="checkContent" show-overflow-tooltip />
-      <el-table-column label="处理人" align="center" prop="updateBy" show-overflow-tooltip />
-      <el-table-column label="处理时间" align="center" prop="updateTime" show-overflow-tooltip />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
@@ -84,7 +71,6 @@
                   >查看详情</el-button
                 >
                 <el-button
-                  v-if="scope.row.alarmStatus == '0'"
                   size="mini"
                   type="text"
                   icon="el-icon-s-promotion"
@@ -92,16 +78,6 @@
                   v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button
                 >
-                <el-button
-                  v-if="scope.row.alarmStatus == '1'"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-s-promotion"
-                  @click="jump(scope.row)"
-                  disabled
-                  v-hasPermi="['system:admin:edit']"
-                  >跳转至工单</el-button
-                >
         </template>
       </el-table-column>
     </el-table>
@@ -180,12 +156,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告数据：" prop="property">
-                <span>{{form.property}}</span>
+                <span>{{form.property || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告内容：" prop="deviceName">
-                <span>{{form.deviceName}}</span>
+                <span>{{form.deviceName || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -194,23 +170,23 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
+            <el-col :span="12">
+              <el-form-item label="误报：" prop="isAlarm">
+                <span>{{form.isAlarm}}</span>
+              </el-form-item>
+            </el-col>
               <el-form-item label="处理人：" prop="updateBy">
-                <span>{{form.updateBy}}</span>
+                <span>{{form.updateBy || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理时间：" prop="updateTime">
-                <span>{{form.updateTime}}</span>
+                <span>{{form.updateTime || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理内容：" prop="checkContent">
-                <span>{{form.checkContent}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="误报：" prop="isAlarm">
-                <span>{{form.isAlarm}}</span>
+                <span>{{form.checkContent || "--"}}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -435,7 +411,7 @@ export default {
       this.$router.push({
         path: "/OM/business/OM/workMange",
         query: {
-          id: row.id,
+          id: row.workId,
           type: 1,
         },
       });

src/views/business/OM/workMange/index.vue

@@ -83,33 +83,13 @@
     <el-table v-loading="loading" :data="adminList" style="margin-top:20px;" height="calc(100vh - 34vh)" >
       <el-table-column label="id" align="center" prop="id"  show-overflow-tooltip />
       <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
-      <el-table-column label="工单名称" align="center" prop="workOrderName" show-overflow-tooltip v-if="formData.type =='1'">
-        消防隐患
-      </el-table-column>
-      <el-table-column label="工单名称" align="center" prop="workOrderName" show-overflow-tooltip v-if="formData.type !='1' || !formData.type"/>
-      <el-table-column label="工单内容" align="center" prop="deviceName" show-overflow-tooltip v-if="formData.type =='1'" />
-      <el-table-column label="工单内容" align="center" prop="workOrderName" show-overflow-tooltip v-if="formData.type !='1' || !formData.type"/>
-      <el-table-column label="工单类型" align="center" prop="workOrderName" show-overflow-tooltip v-if="formData.type =='1'">
-        <template>
-          <span class="color3">消防告警</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="工单类型" align="center" prop="workOrderName" show-overflow-tooltip v-if="formData.type !='1' || !formData.type">
-        <template slot-scope="scope">
-          <span :class="scope.row.workOrderType == 1 ? 'color3' : scope.row.workOrderType == 2 ? 'color4' : 'color2'">{{scope.row.workOrderType == 1 ? "消防告警" : scope.row.clzt == 2 ? "巡检计划" : "ba厕位故障"}}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="上报时间" align="center" prop="alarmTime" show-overflow-tooltip v-if="formData.type =='1'"/>
-      <el-table-column label="上报时间" align="center" prop="addTime" show-overflow-tooltip v-if="formData.type !='1' || !formData.type"/>
-      <el-table-column label="处理状态" align="center" prop="" v-if="formData.type =='1'">
-        <template>
-          <span class="color3">未处理</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="处理状态" align="center" prop="clzt" v-if="formData.type !='1' || !formData.type">
+      <el-table-column label="工单名称" align="center" prop="workOrderName" show-overflow-tooltip />
+      <el-table-column label="工单内容" align="center" prop="workOrderName" show-overflow-tooltip />
+      <el-table-column label="工单类型" align="center" prop="workOrderName"  />
+      <el-table-column label="上报时间" align="center" prop="addTime" show-overflow-tooltip />
+      <el-table-column label="处理状态" align="center" prop="clzt" >
         <template slot-scope="scope">
-          <span :class="scope.row.clzt == 0 ? 'color3' : scope.row.clzt == 1 ? 'color4' : 'color2'">{{scope.row.clzt == 0 ? "未处理" : scope.row.clzt == 1 ? "已处理:通过" : "已处理:未通过"}}</span>
+          <span :class="scope.row.clzt == '0' ? 'color3' : scope.row.clzt == '1' ? 'color4' : 'color2'">{{scope.row.clzt == '0' ? "未处理" : scope.row.clzt == '1' ? "已处理:通过" : "已处理:未通过"}}</span>
         </template>
       </el-table-column>
       <el-table-column label="执行班组" align="center" prop="teamName" show-overflow-tooltip />
@@ -215,17 +195,11 @@
               <el-input v-model="form.workOrderName" :disabled="true" />
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="formData.type !='1'">
+          <el-col :span="12">
             <el-form-item label="上报时间" prop="addTime" >
               <el-input v-model="form.addTime" :disabled="true" />
             </el-form-item>
           </el-col>
-           <el-col :span="12" v-if="formData.type =='1'">
-            <el-form-item label="上报时间" prop="alarmTime">
-              <el-input v-model="form.alarmTime" :disabled="true" />
-            </el-form-item>
-          </el-col>
-
           <el-col :span="12">
             <el-form-item label="执行班组" prop="teamId">
               <el-select
@@ -243,29 +217,31 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" >
+          <el-col :span="12" v-if="formRow.clzt =='1' || formRow.clzt =='2'">
             <el-form-item label="处置内容" prop="clnr">
-              <el-input  type="textarea" maxlength="50" show-word-limit :rows="5" v-model="form.clnr" placeholder="请填写处理内容" @input="onInput()"/>
+              <el-input  type="textarea" maxlength="50" show-word-limit :rows="5" v-model="form.clnr" placeholder="请填写处理内容" @input="onInput()" disabled/>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="formData.type =='1'">
-            <el-form-item label="误报" prop="isAlarm">
-              <el-radio v-model="form.isAlarm" :label="false">否</el-radio>
-              <el-radio v-model="form.isAlarm" :label="true">是</el-radio>
+          <el-col :span="12" v-if="formRow.clzt =='0'">
+            <el-form-item label="处置内容" prop="clnr">
+              <el-input  type="textarea" maxlength="50" show-word-limit :rows="5" v-model="form.clnr" placeholder="请填写处理内容" @input="onInput()"/>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.type =='1'">
-            <el-form-item label="批量处理" >
-              <el-radio v-model="piliang" :label="false">否</el-radio>
-              <el-radio v-model="piliang" :label="true">是</el-radio>
+            <el-form-item label="误报" prop="isAlarm">
+              <el-radio v-model="form.isAlarm" :label="false" v-if="formRow.clzt =='1' || formRow.clzt =='2'" disabled>否</el-radio>
+              <el-radio v-model="form.isAlarm" :label="true" v-if="formRow.clzt =='1' || formRow.clzt =='2'" disabled>是</el-radio>
+              <el-radio v-model="form.isAlarm" :label="false" v-if="formRow.clzt =='0'">否</el-radio>
+              <el-radio v-model="form.isAlarm" :label="true" v-if="formRow.clzt =='0'">是</el-radio>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="24">
+          <el-col :span="24" v-if="formData.type !='1'">
             <el-form-item label="审批" prop="clzt">
               <el-select
                 v-model="form.clzt"
                 placeholder="请选择审批状态"
                 size="small"
+                :disabled="formRow.clzt =='1' || formRow.clzt =='2'"
               >
               <el-option
                   v-for="dict in clztList"
@@ -275,15 +251,16 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col> -->
+          </el-col>
         </el-row>
 
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" v-if="formRow.clzt == '0'">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -318,7 +295,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open1: false,
-      open2:false,
+      open2: false,
       // 查询参数
       queryParams: {
         current: 1,
@@ -370,6 +347,7 @@ export default {
       ],
       formData:[],
       piliang:false,
+      formRow:{}
     };
   },
   created() {
@@ -381,8 +359,6 @@ export default {
       this.formData = {}
       this.getList();//初始化table
     }
-    // this.company();//初始化单位选项
-    // this.facilityType();//初始化类别选项
   },
   methods: {
     //强制el-input刷新
@@ -445,26 +421,39 @@ export default {
     /** 工单详情查询 */
     workOrderOne(id,type){
       this.getDevopsTeam()
-      // if(this.formData.type == "1"){
-        // tbAlarmId(id).then(res=>{
-        //   this.handleUpdate(res.data)
-        //   this.adminList.push(res.data);
-        //   this.adminList[0].clzt = 0
-        //   this.loading = false;
-        // })
-      // }else{
+      if(this.formData.type == "1"){
+        getWorkOrder({id:id,size:1,current:1}).then(res=>{
+          if(res.data.records.length == 0){
+            alert("历史数据，未纳入匹配工单")
+            this.adminList = []
+            this.loading = false;
+          }else{
+            this.handleUpdate(res.data.records[0])
+            this.adminList.push(res.data.records[0]);
+            this.loading = false;
+          }
+
+        })
+      }else{
         workOrderOne({"businessId":id,"type":type}).then(res=>{
-          this.handleUpdate(res.data)
-          this.adminList.push(res.data);
-          this.loading = false;
+          if(JSON.stringify(res.data) == "{}"){
+            alert("历史数据，未纳入匹配工单")
+            this.adminList = []
+            this.loading = false;
+          }else{
+            this.handleUpdate(res.data)
+            this.adminList.push(res.data);
+            console.log(this.adminList)
+            this.loading = false;
+          }
+
         })
-      // }
+      }
 
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       console.log(row)
-      this.reset();
       if(row.isAlarm === true){
         row.isAlarm = true
       }else{
@@ -472,18 +461,28 @@ export default {
       }
       this.title = "处置";
       this.form = JSON.parse(JSON.stringify(row))
-      this.form.clzt = 1
+      this.formRow = JSON.parse(JSON.stringify(row))
+      console.log(this.formRow)
+      //this.form.clzt = 1 //默认处置通过
+
       if(this.formData.type == "1"){
-        console.log(1)
         this.form.workOrderName = "消防隐患"
         this.open2 = true;
       }else if(this.form.workOrderType == "1"){
-        console.log(2)
-        this.formData.type == "1"
+        this.formData.type = "1"
         this.workOrderOne(row.id,1)
         this.open2 = true;
+       }else if(this.form.workOrderType == "2"){
+        this.formData.type = "2"
+        this.form.clzt = 1
+        this.open2 = true;
+       }else if(this.form.workOrderType == "3"){
+        this.formData.type = "3"
+        this.form.clzt = 1
+        this.open2 = true;
       }else{
-        console.log(3)
+
+
       }
 
 
@@ -496,55 +495,39 @@ export default {
     },
     /** 提交按钮 */
     submitForm(row) {
+      console.log(this.form)
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.loading = true
           if (this.form.id != undefined) {
-            if(this.formData.type == "1"){
-              this.form.alarmStatus = 1
-              this.form.checkContent = this.form.clnr
-              if(this.piliang === true){
-                tbAlarmPL(this.form).then(response => {
-                  this.loading = false,
-                  this.open2 = false;
-                  this.getList();
-                })
-              }else{
-                tbAlarmDG(this.form).then(response => {
-                  this.loading = false,
-                  this.open2 = false;
-                  this.getList();
-                })
-              }
-
-
-            }else{
+            let type = this.formData.type
+            console.log(type)
+            if(type=="1"){
+              this.form.clzt = 1
               updateWorkOrder(this.form).then(response => {
                 this.loading = false,
-                this.msgSuccess("修改成功");
                 this.open2 = false;
-                if(this.formData.type){
-                  let type = this.formData.type
-
-                  if(type=="2"){
-                    maintianLogUpdate(this.form).then(response => {
-
-                    })
-                  }
-                  if(type=="3"){
-                    baCwInfoUpdate(this.form).then(response => {
+                this.getList();
+              })
 
-                    })
-                  }
-                }
+            }
+            if(type=="2"){
+              console.log(2,this.form)
+              maintianLogUpdate(this.form).then(response => {
+                 this.loading = false,
+                this.msgSuccess("修改成功");
+                this.open2 = false;
                 this.getList();
-              }).catch(()=>{
-                this.loading = false,
+              })
+            }
+            if(type=="3"){
+              baCwInfoUpdate(this.form).then(response => {
+                 this.loading = false,
+                this.msgSuccess("修改成功");
                 this.open2 = false;
+                this.getList();
               })
             }
-
-
           }else{
             this.form.clzt = 1
             addWorkOrder(this.form).then(response => {

src/views/business/fireInternet/deviceMonitoring/SSMonitoring/index.vue

@@ -116,18 +116,11 @@
             </div>
             <el-table  :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'createTime', order: 'descending'}">
               <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
-              <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip >
+              <!-- <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip >
                   {{companyList[0].dictLabel}}
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column label="报告时间" align="center" prop="createTime" sortable  show-overflow-tooltip />
               <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
-              <el-table-column label="处理状态" align="center"  show-overflow-tooltip >
-                <template slot-scope="scope">
-                  <span :class="scope.row.alarmStatus == 0 ? 'color-red' : 'color-green'">{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="处理人" align="center" prop="updateBy"  show-overflow-tooltip />
-              <el-table-column label="处理时间" align="center" prop="updateTime"  show-overflow-tooltip />
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
                   <el-button
@@ -137,19 +130,11 @@
                     @click="getOne(scope.row)"
                     >查看详情</el-button
                   >
-                  <el-button v-if="scope.row.alarmStatus == '0' "
-                    size="mini"
-                    type="text"
-                    icon="el-icon-s-promotion"
-                    @click="jump(scope.row)"
-                    v-hasPermi="['system:admin:edit']"
-                  >跳转至工单</el-button>
-                   <el-button v-if="scope.row.alarmStatus == '1'"
+                  <el-button
                     size="mini"
                     type="text"
                     icon="el-icon-s-promotion"
                     @click="jump(scope.row)"
-                    disabled
                     v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button>
                 </template>
@@ -181,11 +166,11 @@
                 <span>{{form.id}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
               <el-form-item label="单位名称：" prop="companyName">
                 <span>{{companyList[0].dictLabel}}</span>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="12">
               <el-form-item label="报告时间：" prop="createTime">
                 <span>{{form.createTime}}</span>
@@ -198,7 +183,7 @@
             </el-col> -->
             <el-col :span="12">
               <el-form-item label="报告内容：" prop="deviceName">
-                <span>{{form.deviceName}}</span>
+                <span>{{form.deviceName || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -208,17 +193,17 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理人：" prop="updateBy">
-                <span>{{form.updateBy}}</span>
+                <span>{{form.updateBy || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理时间：" prop="updateTime">
-                <span>{{form.updateTime}}</span>
+                <span>{{form.updateTime || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理内容：" prop="checkContent">
-                <span>{{form.checkContent}}</span>
+                <span>{{form.checkContent || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -267,14 +252,14 @@ export default {
       t:null,
       timeList:[],
       queryParams:{
-        type:3,
+        deviceType:3,
         current:1,
         size:10,
         companyCode:undefined,
         checkStatus:undefined,
       },
       queryParams2:{
-        type:3,
+        deviceType:3,
         current:1,
         size:10,
         startTime:getThisDateBeforMonth(),
@@ -338,6 +323,7 @@ export default {
                 address:val.ownerAddress,
               }
             })
+            console.log(this.companyList)
           }
         });
     },
@@ -354,7 +340,7 @@ export default {
       this.$router.push({
         path: '/OM/business/OM/workMange',
         query: {
-          id: row.id,
+          id: row.workId,
           type:1
         }
       })

src/views/business/fireInternet/deviceMonitoring/fireMonitoring/index.vue

@@ -120,13 +120,6 @@
               <el-table-column label="报告时间" align="center" prop="alarmTime" sortable  show-overflow-tooltip />
               <el-table-column label="报告数据" align="center" prop="property"  show-overflow-tooltip />
               <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
-              <el-table-column label="处理状态" align="center"  show-overflow-tooltip >
-                <template slot-scope="scope">
-                  <span :class="scope.row.alarmStatus == 0 ? 'color-red' : 'color-green'">{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="处理人" align="center" prop="updateBy"  show-overflow-tooltip />
-              <el-table-column label="处理时间" align="center" prop="updateTime"  show-overflow-tooltip />
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
                   <el-button
@@ -136,19 +129,11 @@
                     @click="getOne(scope.row)"
                     >查看详情</el-button
                   >
-                  <el-button v-if="scope.row.alarmStatus == '0' "
-                    size="mini"
-                    type="text"
-                    icon="el-icon-s-promotion"
-                    @click="jump(scope.row)"
-                    v-hasPermi="['system:admin:edit']"
-                  >跳转至工单</el-button>
-                   <el-button v-if="scope.row.alarmStatus == '1'"
+                  <el-button
                     size="mini"
                     type="text"
                     icon="el-icon-s-promotion"
                     @click="jump(scope.row)"
-                    disabled
                     v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button>
                 </template>
@@ -192,12 +177,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告数据：" prop="property">
-                <span>{{form.property}}</span>
+                <span>{{form.property || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告内容：" prop="deviceName">
-                <span>{{form.deviceName}}</span>
+                <span>{{form.deviceName || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -207,17 +192,17 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理人：" prop="updateBy">
-                <span>{{form.updateBy}}</span>
+                <span>{{form.updateBy || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理时间：" prop="updateTime">
-                <span>{{form.updateTime}}</span>
+                <span>{{form.updateTime || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理内容：" prop="checkContent">
-                <span>{{form.checkContent}}</span>
+                <span>{{form.checkContent || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -356,7 +341,7 @@ export default {
       this.$router.push({
         path: '/OM/business/OM/workMange',
         query: {
-          id: row.id,
+          id: row.workId,
           type:1
         }
       })

src/views/business/fireInternet/deviceMonitoring/waterMonitoring/device/index.vue

@@ -96,21 +96,13 @@
               <el-table-column label="报告时间" align="center" prop="createTime" sortable  show-overflow-tooltip />
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
-                  <el-button v-if="scope.row.alarmStatus == '0' "
+                  <el-button
                     size="mini"
                     type="text"
                     icon="el-icon-s-promotion"
                     @click="jump(scope.row)"
                     v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button>
-                   <el-button v-if="scope.row.alarmStatus == '1'"
-                    size="mini"
-                    type="text"
-                    icon="el-icon-s-promotion"
-                    @click="jump(scope.row)"
-                    disabled
-                    v-hasPermi="['system:admin:edit']"
-                  >跳转至工单</el-button>
                 </template>
               </el-table-column>
             </el-table>

src/views/business/fireInternet/deviceMonitoring/waterMonitoring/offLine/index.vue

@@ -120,13 +120,6 @@
               <el-table-column label="报告时间" align="center" prop="alarmTime" sortable  show-overflow-tooltip />
               <el-table-column label="报告数据" align="center" prop="alertValue"  show-overflow-tooltip />
               <el-table-column label="报告内容" align="center" prop="alarmContent"  show-overflow-tooltip />
-              <el-table-column label="处理状态" align="center" >
-                <template slot-scope="scope">
-                  <span>{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="处理人" align="center" prop="updateBy"  show-overflow-tooltip />
-              <el-table-column label="处理时间" align="center" prop="updateTime"  show-overflow-tooltip />
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
                   <el-button
@@ -136,19 +129,11 @@
                     @click="getOne(scope.row)"
                     >查看详情</el-button
                   >
-                  <el-button v-if="scope.row.alarmStatus == '0' "
-                    size="mini"
-                    type="text"
-                    icon="el-icon-s-promotion"
-                    @click="jump(scope.row)"
-                    v-hasPermi="['system:admin:edit']"
-                  >跳转至工单</el-button>
-                   <el-button v-if="scope.row.alarmStatus == '1'"
+                  <el-button
                     size="mini"
                     type="text"
                     icon="el-icon-s-promotion"
                     @click="jump(scope.row)"
-                    disabled
                     v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button>
                 </template>
@@ -192,12 +177,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告数据：" prop="property">
-                <span>{{form.property}}</span>
+                <span>{{form.property || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告内容：" prop="deviceName">
-                <span>{{form.deviceName}}</span>
+                <span>{{form.deviceName || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -207,17 +192,17 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理人：" prop="updateBy">
-                <span>{{form.updateBy}}</span>
+                <span>{{form.updateBy || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理时间：" prop="updateTime">
-                <span>{{form.updateTime}}</span>
+                <span>{{form.updateTime || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理内容：" prop="checkContent">
-                <span>{{form.checkContent}}</span>
+                <span>{{form.checkContent || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">

src/views/business/fireInternet/fireAlarm/fireMonitoring/index.vue

@@ -182,37 +182,6 @@
               prop="deviceName"
               show-overflow-tooltip
             />
-            <el-table-column
-              label="处理状态"
-              align="center"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span
-                  :class="
-                    scope.row.alarmStatus == '0' ? 'color-red' : 'color-green'
-                  "
-                  >{{
-                    scope.row.alarmStatus == "0"
-                      ? "未处理"
-                      : scope.row.alarmStatus == "1"
-                      ? "已处理"
-                      : "" }}</span
-                >
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="处理人"
-              align="center"
-              prop="updateBy"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              label="处理时间"
-              align="center"
-              prop="updateTime"
-              show-overflow-tooltip
-            />
             <el-table-column
               label="操作"
               align="center"
@@ -227,21 +196,10 @@
                   >查看详情</el-button
                 >
                 <el-button
-                  v-if="scope.row.alarmStatus == '0'"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-s-promotion"
-                  @click="jump(scope.row)"
-                  v-hasPermi="['system:admin:edit']"
-                  >跳转至工单</el-button
-                >
-                <el-button
-                  v-if="scope.row.alarmStatus == '1'"
                   size="mini"
                   type="text"
                   icon="el-icon-s-promotion"
                   @click="jump(scope.row)"
-                  disabled
                   v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button
                 >
@@ -278,12 +236,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告数据：" prop="property">
-                <span>{{form.property}}</span>
+                <span>{{form.property || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告内容：" prop="deviceName">
-                <span>{{form.deviceName}}</span>
+                <span>{{form.deviceName || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -293,17 +251,17 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理人：" prop="updateBy">
-                <span>{{form.updateBy}}</span>
+                <span>{{form.updateBy || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理时间：" prop="updateTime">
-                <span>{{form.updateTime}}</span>
+                <span>{{form.updateTime || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理内容：" prop="checkContent">
-                <span>{{form.checkContent}}</span>
+                <span>{{form.checkContent || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -471,7 +429,7 @@ export default {
       this.$router.push({
         path: "/OM/business/OM/workMange",
         query: {
-          id: row.id,
+          id: row.workId,
           type: 1,
         },
       });

src/views/business/fireInternet/fireAlarm/waterAlarm/index.vue

@@ -120,13 +120,6 @@
               <el-table-column label="报告时间" align="center" prop="alarmTime" sortable show-overflow-tooltip />
               <el-table-column label="报告数据" align="center" prop="property"  show-overflow-tooltip />
               <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
-              <el-table-column label="处理状态" align="center"  show-overflow-tooltip >
-                <template slot-scope="scope">
-                  <span :class="scope.row.alarmStatus == 0 ? 'color-red' : 'color-green'">{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="处理人" align="center" prop="updateBy"  show-overflow-tooltip />
-              <el-table-column label="处理时间" align="center" prop="updateTime"  show-overflow-tooltip />
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
                   <el-button
@@ -136,19 +129,11 @@
                     @click="getOne(scope.row)"
                     >查看详情</el-button
                   >
-                  <el-button v-if="scope.row.alarmStatus == '0' "
-                    size="mini"
-                    type="text"
-                    icon="el-icon-s-promotion"
-                    @click="jump(scope.row)"
-                    v-hasPermi="['system:admin:edit']"
-                  >跳转至工单</el-button>
-                   <el-button v-if="scope.row.alarmStatus == '1'"
+                  <el-button
                     size="mini"
                     type="text"
                     icon="el-icon-s-promotion"
                     @click="jump(scope.row)"
-                    disabled
                     v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button>
                 </template>
@@ -185,12 +170,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告数据：" prop="property">
-                <span>{{form.property}}</span>
+                <span>{{form.property || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告内容：" prop="deviceName">
-                <span>{{form.deviceName}}</span>
+                <span>{{form.deviceName || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -200,17 +185,17 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理人：" prop="updateBy">
-                <span>{{form.updateBy}}</span>
+                <span>{{form.updateBy || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理时间：" prop="updateTime">
-                <span>{{form.updateTime}}</span>
+                <span>{{form.updateTime || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理内容：" prop="checkContent">
-                <span>{{form.checkContent}}</span>
+                <span>{{form.checkContent || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -357,7 +342,7 @@ export default {
       this.$router.push({
         path: '/OM/business/OM/workMange',
         query: {
-          id: row.id,
+          id: row.workId,
           type:1
         }
       })

src/views/business/fireInternet/hiddenDanger/index.vue

@@ -120,13 +120,6 @@
               <el-table-column label="报告时间" align="center" prop="alarmTime" sortable show-overflow-tooltip />
               <el-table-column label="报告数据" align="center" prop="property"  show-overflow-tooltip />
               <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
-              <el-table-column label="处理状态" align="center"  show-overflow-tooltip >
-                <template slot-scope="scope">
-                  <span :class="scope.row.alarmStatus == 0 ? 'color-red' : 'color-green'">{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="处理人" align="center" prop="updateBy"  show-overflow-tooltip />
-              <el-table-column label="处理时间" align="center" prop="updateTime"  show-overflow-tooltip />
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
                   <el-button
@@ -136,19 +129,11 @@
                     @click="getOne(scope.row)"
                     >查看详情</el-button
                   >
-                  <el-button v-if="scope.row.alarmStatus == '0' "
-                    size="mini"
-                    type="text"
-                    icon="el-icon-s-promotion"
-                    @click="jump(scope.row)"
-                    v-hasPermi="['system:admin:edit']"
-                  >跳转至工单</el-button>
-                   <el-button v-if="scope.row.alarmStatus == '1'"
+                  <el-button
                     size="mini"
                     type="text"
                     icon="el-icon-s-promotion"
                     @click="jump(scope.row)"
-                    disabled
                     v-hasPermi="['system:admin:edit']"
                   >跳转至工单</el-button>
                 </template>
@@ -192,12 +177,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告数据：" prop="property">
-                <span>{{form.property}}</span>
+                <span>{{form.property || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="报告内容：" prop="deviceName">
-                <span>{{form.deviceName}}</span>
+                <span>{{form.deviceName || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -207,17 +192,17 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理人：" prop="updateBy">
-                <span>{{form.updateBy}}</span>
+                <span>{{form.updateBy || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理时间：" prop="updateTime">
-                <span>{{form.updateTime}}</span>
+                <span>{{form.updateTime || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="处理内容：" prop="checkContent">
-                <span>{{form.checkContent}}</span>
+                <span>{{form.checkContent || "--"}}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -357,7 +342,7 @@ export default {
       this.$router.push({
         path: '/OM/business/OM/workMange',
         query: {
-          id: row.id,
+          id: row.workId,
           type:1
         }
       })
@@ -368,8 +353,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.type = undefined;
       this.queryParams.current = 1;
-      this.queryParams.size = 1;
+      this.queryParams.size = 10;
       this.queryParams.status = undefined;
       this.queryParams.startTime = undefined;
       this.queryParams.endTime = undefined;

src/views/components/fireInternetInfo/index1 copy.vue

@@ -1,108 +0,0 @@
-<template>
-  <el-row>
-    <div id="index1" ref="echartD" style="width:100%;height:30vh;"></div>
-  </el-row>
-</template>
-<script>
-import * as echarts from "echarts";
-export default {
-  // props: ["resData"],
-  props: {
-    dataMap: { type: Number, default: () => 0 },
-    dataNumber: { type: Number, default: () => 0 },
-    color: { type: String, default: () => "#468EFD" },
-    size: { type: Number, default: () => 20 },
-    tick: { type: Boolean, default: () => true },
-    with: { type: Number, default: () => 200 },
-  },
-  data() {
-    return {};
-  },
-  watch: {
-    dataMap(val) {
-      this.getData(val);
-    },
-    dataNumber(val) {
-      this.getData(val);
-    },
-  },
-  mounted() {
-    this.getData();
-  },
-  methods: {
-    getData() {
-      echarts.init(this.$refs.echartD).setOption({
-        grid: {
-          // top: 0,
-          // bottom: 0,
-          // left: 0,
-          // right: 0,
-          // margi
-        },
-        series: [
-          // 进度条
-          {
-            name: "仪表盘",
-            type: "gauge",
-            radius: "65%", // 半径
-            startAngle: 270, //开始角度 左侧角度
-            endAngle: -89.999, //结束角度 右侧
-            splitNumber: 20,
-            axisLine: {
-              lineStyle: {
-                color: [
-                  [this.dataMap, this.color],
-                  [1, "#FF0087"],
-                ],
-                width: 30,
-              },
-            },
-            axisLabel: {
-              show: false,
-            },
-            axisTick: {
-              show: false,
-            },
-            splitLine: {
-              show: false,
-            },
-            itemStyle: {
-              show: false,
-            },
-            detail: {
-              formatter:  (value) => {
-                return this.dataNumber ? this.dataNumber  :`${(value * 100).toFixed(0)}%`;
-              },
-              offsetCenter: [0, "0%"],
-              textStyle: {
-                //fontSize: this.size,
-                fontSize: this.size,
-                fontWeight: "700",
-                color:this.color,
-                // color: "#FFF",
-                fontFamily: '"DS", "DS-B", "DS-BB", "DS-BS"',
-              },
-            },
-            title: {
-              offsetCenter: [0, "10%"],
-            },
-            pointer: {
-              show: false,
-            },
-            data: [
-                (this.dataNumber || this.dataMap),
-            ],
-          },
-        ],
-      });
-      window.addEventListener("resize", function() {
-        myChart.resize();
-      });
-
-    },
-
-  }
-};
-</script>
-
-<style lang="scss" scoped></style>

src/views/components/fireInternetInfo/index1.vue

@@ -39,7 +39,7 @@ export default {
 
         ],
         title: {
-          text: this.dataMap * 100 + '%',
+          text: (this.dataMap * 100).toFixed(2) + '%',
           y:'center',
           x:'center',
           textStyle: {