误报、处理工单班组问题

.editorconfig

@@ -8,7 +8,7 @@ charset = utf-8
 # 缩进风格，可选space、tab
 indent_style = space
 # 缩进的空格数
-indent_size = 2
+indent_size = 4
 # 结尾换行符，可选lf、cr、crlf
 end_of_line = lf
 # 在文件结尾插入新行

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

@@ -53,6 +53,15 @@ export function workOrderOne(data) { //查看工单详情
     })
 }
 
+
+
+
+
+
+
+
+
+
 export function baCwInfoUpdate(data) { //ba厕位工单处理
     return request({
         url: "/baCwInfo/checkAlert",
@@ -67,14 +76,14 @@ export function maintianLogUpdate(data) { //维保工单处理
         data
     })
 }
-// export function tbAlarmUpdate(data) { //消防告警工单处理
-//     return request({
-//         url: "/tbAlarm/checkWorkOrder",
-//         method: 'put',
-//         data
-//     })
-// }
-export function tbAlarmId(data) { //消防告警工单处理
+export function tbAlarmUpdate(data) { //消防告警工单处理
+    return request({
+        url: "/tbAlarm/checkWorkOrder",
+        method: 'put',
+        data
+    })
+}
+export function tbAlarmId(data) { //消防告警工单查询
     return request({
         url: "/tbAlarm/" + data,
         method: 'get',

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

@@ -176,11 +176,6 @@
               <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">
             <el-form-item label="处理人：" prop="updateBy">
               <span>{{ form.updateBy  || "--"}}</span>
@@ -196,56 +191,15 @@
               <span>{{ form.checkContent  || "--"}}</span>
             </el-form-item>
           </el-col>
-        </el-row>
-      </el-form>
-    </el-dialog>
-    <!-- 修改、新增对话框 -->
-    <!-- <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="auto" >
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="单位名称" prop="companyName">
-              <el-input v-model="form.companyName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" >
-            <el-form-item label="设备名称" prop="deviceName">
-              <el-input v-model="form.deviceName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12" >
-            <el-form-item label="报告内容" prop="alarmContent">
-              <el-input v-model="form.alarmContent" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <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-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12" >
-            <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>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="处理内容" prop="checkContent">
-              <el-input  type="textarea" :rows="5" maxlength="50" show-word-limit  v-model.trim="form.checkContent" placeholder="请填写处理内容" @input="onInput()"/>
+            <el-col :span="12">
+            <el-form-item label="误报：" prop="isAlarm">
+              <span>{{ form.isAlarm }}</span>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel" plain>取 消</el-button>
-      </div>
-    </el-dialog> -->
+    </el-dialog>
+
     <pagination
       v-show="total > 0"
       :total="total"
@@ -374,11 +328,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.title = "处置";
-      if (row.isAlarm === true) {
-        row.isAlarm = true;
-      } else {
-        row.isAlarm = false;
-      }
+     this.form.isAlarm = row.isAlarm == false ? "否"  :  row.isAlarm == true ?  "是" : "--"
       this.form = JSON.parse(JSON.stringify(row));
       this.open = true;
     },
@@ -457,11 +407,7 @@ export default {
       this.title = "详情信息";
       this.form = JSON.parse(JSON.stringify(row));
 
-      if (row.isAlarm === true) {
-        this.form.isAlarm = "是";
-      } else {
-        this.form.isAlarm = "否";
-      }
+     this.form.isAlarm = row.isAlarm == false ? "否"  :  row.isAlarm == true ?  "是" : "--"
       if (row.alarmStatus == "0") {
         this.form.alarmStatus = "未处理";
       } else {

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

@@ -186,38 +186,28 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="报告数据：" prop="property">
-              <span>{{ form.property  || "--"}}</span>
+            <el-form-item label="报告内容：" prop="eventContent">
+              <span>{{ form.eventContent  || "--"}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="报告内容：" prop="deviceName">
-              <span>{{ form.deviceName  || "--"}}</span>
+            <el-form-item label="处理内容：" prop="clContent">
+              <span>{{ form.eventContent  || "--"}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="处理状态：" prop="alarmStatus">
-              <span>{{ form.alarmStatus  || "--"}}</span>
+            <el-form-item label="处理状态：" prop="clTiem">
+              <span>{{ form.clTiem ? "已处理" : "未处理" || "--"}}</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="clPeople">
+              <span>{{ form.clPeople }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="处理人：" prop="updateBy">
-              <span>{{ form.updateBy }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="处理时间：" prop="updateTime">
-              <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 label="处理时间：" prop="clTiem">
+              <span>{{ form.clTiem  || "--"}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -473,11 +463,7 @@ export default {
       this.title = "详情信息";
       this.form = JSON.parse(JSON.stringify(row));
 
-      if (row.isAlarm === true) {
-        this.form.isAlarm = "是";
-      } else {
-        this.form.isAlarm = "否";
-      }
+     this.form.isAlarm = row.isAlarm == false ? "否"  :  row.isAlarm == true ?  "是" : "--"
       if (row.alarmStatus == "0") {
         this.form.alarmStatus = "未处理";
       } else {

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

@@ -80,53 +80,6 @@
         </template>
       </el-table-column>
     </el-table>
-    <!-- 修改对话框 -->
-    <!-- <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="auto" >
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="单位名称" prop="companyName">
-              <el-input v-model="form.companyName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" >
-            <el-form-item label="设备名称" prop="deviceName">
-              <el-input v-model="form.deviceName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12" >
-            <el-form-item label="报告内容" prop="alarmContent">
-              <el-input v-model="form.alarmContent" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <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-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12" >
-            <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>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="处理内容" prop="checkContent">
-              <el-input  type="textarea" rows="5" maxlength="50" show-word-limit  v-model.trim="form.checkContent" placeholder="请填写处理内容" @input="onInput()"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel" plain>取 消</el-button>
-      </div>
-    </el-dialog> -->
     <!-- 详情对话框 -->
       <el-dialog
         :title="title"
@@ -169,11 +122,6 @@
               </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>
               </el-form-item>
@@ -188,6 +136,11 @@
                 <span>{{form.checkContent || "--"}}</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-row>
         </el-form>
       </el-dialog>
@@ -389,11 +342,8 @@ export default {
       this.title = "详情信息";
       this.form = JSON.parse(JSON.stringify(row));
 
-      if (row.isAlarm === true) {
-        this.form.isAlarm = '是';
-      } else {
-        this.form.isAlarm = '否';
-      }
+
+      this.form.isAlarm = row.isAlarm == false ? "否"  :  row.isAlarm == true ?  "是" : "--"
       if (row.alarmStatus  == '0') {
         this.form.alarmStatus  = '未处理';
       } else {

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

@@ -203,9 +203,37 @@
               <el-input v-model="form.addTime" :disabled="true" />
             </el-form-item>
           </el-col>
-           <el-col :span="12" >
-           <el-form-item label="执行班组" prop="teamId" >
-              <el-input v-model="form.teamId" :disabled="true" />
+           <el-col :span="12"  v-if="form.clnr">
+             <el-form-item label="执行班组" prop="teamId">
+              <el-select
+                v-model="form.teamId"
+                placeholder="请选择执行班组"
+                size="small"
+                :disabled="true"
+              >
+                <el-option
+                  v-for="dict in teamList"
+                  :key="dict.id"
+                  :label="dict.teamName"
+                  :value="dict.id"
+                />
+              </el-select>
+            </el-form-item>
+           </el-col>
+            <el-col :span="12" v-if="!form.clnr">
+            <el-form-item label="执行班组" prop="teamId">
+              <el-select
+                v-model="form.teamId"
+                placeholder="请选择执行班组"
+                size="small"
+              >
+                <el-option
+                  v-for="dict in teamList"
+                  :key="dict.id"
+                  :label="dict.teamName"
+                  :value="dict.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formRow.clzt =='1' || formRow.clzt =='2'">
@@ -265,7 +293,7 @@
 </template>
 <script>
 import { addWorkOrder, delWorkOrder, updateWorkOrder, getWorkOrder, exportWorkOrder,
- collectWorkOrder, workOrderOne, baCwInfoUpdate, maintianLogUpdate, tbAlarmId, tbAlarmDG, tbAlarmPL } from "@/api/business/OM/workMange";
+ collectWorkOrder, workOrderOne, baCwInfoUpdate, maintianLogUpdate, tbAlarmId, tbAlarmDG, tbAlarmPL,tbAlarmUpdate } from "@/api/business/OM/workMange";
 import { getDevopsTeam } from "@/api/business/OM/MochaITOM/crew";
 import { listChannel } from "@/api/system/product";
 import { BASEPATH } from "@/assets/js/common.js";
@@ -497,34 +525,38 @@ export default {
           this.loading = true
           if (this.form.id != undefined) {
             let type = this.formData.type
-            console.log(this.formData)
-            // if(type=="1"){
-            //   this.form.clzt = 1
-            //   updateWorkOrder(this.form).then(response => {
-            //     this.loading = false,
-            //     this.open2 = false;
-            //     this.collectWorkOrder()
-            //     this.getList();
-            //   })
+            console.log(this.formData,this.form)
+            if(type=="1"){
+              this.form.clzt = 1
+            //   this.form.workId = this.form.id
+            //   this.form.id = "882281"
+              //消防
+              updateWorkOrder(this.form).then(response => {
+            //   tbAlarmUpdate(this.form).then(response => {
+                this.loading = false,
+                this.open2 = false;
+                this.collectWorkOrder()
+                this.getList();
+              })
 
-            // }
-            // if(type=="2"){
-            //   this.form.workOrderContent = this.form.clnr
-            //   maintianLogUpdate(this.form).then(response => {
-            //      this.loading = false,
-            //     this.msgSuccess("处置成功");
-            //     this.open2 = false;
-            //     this.getList();
-            //   })
-            // }
-            // if(type=="3"){
-            //   baCwInfoUpdate(this.form).then(response => {
-            //      this.loading = false,
-            //     this.msgSuccess("处置成功");
-            //     this.open2 = false;
-            //     this.getList();
-            //   })
-            // }
+            }
+            if(type=="2"){ //维保
+              this.form.workOrderContent = this.form.clnr
+              maintianLogUpdate(this.form).then(response => {
+                 this.loading = false,
+                this.msgSuccess("处置成功");
+                this.open2 = false;
+                this.getList();
+              })
+            }
+            if(type=="3"){
+              baCwInfoUpdate(this.form).then(response => {
+                 this.loading = false,
+                this.msgSuccess("处置成功");
+                this.open2 = false;
+                this.getList();
+              })
+            }
           }else{
             this.form.clzt = 0
             addWorkOrder(this.form).then(response => {

src/views/business/deviceMange/devicePassageWay/index.vue

@@ -293,7 +293,6 @@ export default {
     getList() {
       getDeviceChannel(this.queryParams).then(response => {
         this.adminList = response.data.records;
-        console.log(response.data.records)
         for(let i = 0;i<this.adminList.length;i++){
           this.adminList[i].dwtype = String(this.adminList[i].dwtype)
           this.adminList[i].passagewayType = String(this.adminList[i].passagewayType)
@@ -396,13 +395,13 @@ export default {
     },
     dwtype(){
       //类型与系统联动
-      this.form.passagewayType = undefined
+      if(this.form.passagewayType){
+          this.form.passagewayType = null
+      }
+
     },
     selectPassagewayType(val){
-      // console.log(val)
-      // this.form.passagewayType = val
-      this.form.passagewayType = "2"
-      // console.log(this.form.dwtype )
+      this.form.passagewayType = val
     }
   }
 };

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

@@ -112,7 +112,7 @@
               <el-table-column label="序号" align="left" prop="id"  show-overflow-tooltip />
               <el-table-column label="单位名称" align="left" prop="companyName" show-overflow-tooltip />
               <el-table-column label="报告时间" align="left" prop="alarmTime" sortable  show-overflow-tooltip />
-              <el-table-column label="报告数据" align="left" prop="property"  show-overflow-tooltip />
+              <el-table-column label="报告数据" align="left" prop="alarmContent"  show-overflow-tooltip />
               <el-table-column label="报告内容" align="left" prop="deviceName"  show-overflow-tooltip />
               <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
@@ -199,11 +199,11 @@
                 <span>{{form.checkContent || "--"}}</span>
               </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-col> -->
           </el-row>
         </el-form>
       </el-dialog>
@@ -337,6 +337,7 @@ export default {
     },
     /** 跳转至工单 */
     jump(row){
+
       this.$router.push({
         path: '/OM/business/OM/workMange',
         query: {
@@ -385,7 +386,6 @@ export default {
           this.form.checkContent = data.clnr
           this.form.updateBy = data.czPeople
           this.form.updateTime = data.czTime
-          this.form.isAlarm = data.clzt == '1' ? '否' : '是'
           this.form.alarmStatus = data.clzt == '0' ? "未处理" : data.clzt == '1' ? "已处理:通过" : "已处理:未通过"
         }
         this.open = true;

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

@@ -113,7 +113,7 @@
               <el-table-column label="序号" align="left" prop="id"  show-overflow-tooltip />
               <el-table-column label="单位名称" align="left" prop="companyName" show-overflow-tooltip />
               <el-table-column label="报告时间" align="left" prop="alarmTime" sortable  show-overflow-tooltip />
-              <el-table-column label="报告数据" align="left" prop="alertValue"  show-overflow-tooltip />
+              <el-table-column label="报告数据" align="left" prop="alarmContent"  show-overflow-tooltip />
               <el-table-column label="报告内容" align="left" prop="alarmContent"  show-overflow-tooltip />
               <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
                 <template slot-scope="scope">
@@ -200,11 +200,6 @@
                 <span>{{form.checkContent || "--"}}</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-row>
         </el-form>
       </el-dialog>
@@ -389,7 +384,6 @@ export default {
           this.form.checkContent = data.clnr
           this.form.updateBy = data.czPeople
           this.form.updateTime = data.czTime
-          this.form.isAlarm = data.clzt == '1' ? '否' : '是'
           this.form.alarmStatus = data.clzt == '0' ? "未处理" : data.clzt == '1' ? "已处理:通过" : "已处理:未通过"
         }
         this.open = true;

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

@@ -483,7 +483,7 @@ export default {
           this.form.checkContent = data.clnr;
           this.form.updateBy = data.czPeople;
           this.form.updateTime = data.czTime;
-          this.form.isAlarm = data.clzt == "1" ? "否" : "是";
+          this.form.isAlarm = row.isAlarm == false ? "否"  :  row.isAlarm == true ?  "是" : "--"
           this.form.alarmStatus =
             data.clzt == "0"
               ? "未处理"

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

@@ -387,7 +387,7 @@ export default {
           this.form.checkContent = data.clnr
           this.form.updateBy = data.czPeople
           this.form.updateTime = data.czTime
-          this.form.isAlarm = data.clzt == '1' ? '否' : '是'
+          this.form.isAlarm = row.isAlarm == false ? "否"  :  row.isAlarm == true ?  "是" : "--"
           this.form.alarmStatus = data.clzt == '0' ? "未处理" : data.clzt == '1' ? "已处理:通过" : "已处理:未通过"
         }
         this.open = true;

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

@@ -387,7 +387,7 @@ export default {
           this.form.checkContent = data.clnr
           this.form.updateBy = data.czPeople
           this.form.updateTime = data.czTime
-          this.form.isAlarm = data.clzt == '1' ? '否' : '是'
+          this.form.isAlarm = row.isAlarm == false ? "否"  :  row.isAlarm == true ?  "是" : "--"
           this.form.alarmStatus = data.clzt == '0' ? "未处理" : data.clzt == '1' ? "已处理:通过" : "已处理:未通过"
         }
         this.open = true;

vue.config.js

@@ -33,8 +33,9 @@ module.exports = {
         proxy: {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
-                //target: `http://172.16.120.213:8084/`, //本地
-                //target: 'http://172.16.120.49/dmapi/', //49
+                // target: `http://172.16.120.213:8084/`, //本地
+                // target: `http://172.16.120.85:8084/`, //本地
+                // target: 'http://172.16.120.49/dmapi/', //49
                 target: 'https://smartpark.caih.com/dmapi/', //东信
                 changeOrigin: true,
                 pathRewrite: {
@@ -126,4 +127,4 @@ module.exports = {
                 }
             )
     }
-}
+}