Merge remote-tracking branch 'origin/master'

gassafety-web/src/views/dataMonitoring/deviceAlarm/alarmdetail.vue

@@ -12,6 +12,51 @@
           </div>
         </div>
 
+
+        <div style="width: 100%;height: 200px;">
+          <!-- <div style="color: #31EAEA;width: 30%;height: 30px;">
+            <ul><li>详细信息</li></ul>
+          </div> -->
+          <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;">
+            <el-form-item label="设备类型:" prop="deviceType">
+              <font v-if="form.deviceType == 0">管道</font>
+              <font v-if="form.deviceType == 1">调压阀</font>
+              <font v-if="form.deviceType == 2">阀门井</font>
+              <font v-if="form.deviceType == 3">流量计</font>
+              <font v-if="form.deviceType == 4">压力表</font>
+            </el-form-item>
+            <el-form-item label="设备编号:" prop="deviceCode">
+              <font>{{form.deviceCode}}</font> 
+            </el-form-item>
+          </el-form>
+          <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;">
+            <el-form-item label="报警类型:" prop="alarmType">
+              <font>{{form.alarmType}}</font>
+            </el-form-item>
+            <el-form-item label="报警值:" prop="alarmValue">
+              <font>{{form.alarmValue}}</font> 
+            </el-form-item>
+          </el-form>
+          <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;">
+            <el-form-item label="报警开始时间:" prop="startTime">
+              <font>{{form.startTime}}</font> 
+            </el-form-item>
+            <el-form-item label="报警结束时间:" prop="updateTime">
+              <font>{{form.endTime}}</font> 
+            </el-form-item>
+          </el-form>
+          <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;">
+            <el-form-item label="处理状态:" prop="dealStatus">
+              <font v-if="form.dealStatus == 1">不需要处理</font>
+              <font v-if="form.dealStatus == 2">已处理完成</font>
+              <font v-if="form.dealStatus == 3">未处理完成</font>
+            </el-form-item>
+          </el-form>
+          
+          
+        </div>
+        <el-divider></el-divider>
+
         <div style="width: 100%;height: 350px;padding: 10px;height: 300px;">
             <div style="width: 66.6%;float: left;height: 100%;">
                 <el-table
@@ -69,7 +114,7 @@
                 </el-table-column>
                 </el-table>
             </div>
-          <div id="marbox" style="width: 33%;height: 350px; border: 1px solid rgb(218, 213, 213);float: right;margin-top: -45px;">
+          <div id="marbox" style="width: 33%;height: 304px; border: 1px solid rgb(218, 213, 213);float: right;">
             <div style="width: 100%;height: 100%" id="container"></div>
           </div>
         </div>
@@ -91,13 +136,13 @@
 
   <script>
 
-  import { listBasicsInfo, getBasicsInfo, delBasicsInfo, addBasicsInfo, updateBasicsInfo, exportBasicsInfo } from "@/api/workOrder/basicsInfo";
+import { listDeviceAlarm, getDeviceAlarm } from "@/api/dataMonitoring/deviceAlarm";
   import { deviceTree } from "@/api/device/deviceInfo";
   import gaodeMap from "utils/gaodeMap.js";
   import {map, DEVICE_TYPE} from "utils/gaodeMap.js";
   import { inspectorList } from "@/api/system/user";
   import echarts from 'echarts';
-//   Vue.prototype.$echarts = echarts;
+  import { addBasicsInfo } from "@/api/workOrder/basicsInfo";
 
 export default {
     name: "BasicsInfo",
@@ -111,70 +156,56 @@ export default {
             address: '上海市普陀区金沙江路 1518 弄'
           },],
         inspector: [],
-        isDisplay:false,
-        dialogImageUrl: '',
-        dialogVisible: false,
-        disabled: false,
-        imageUrl: '',
-        // 遮罩层
-        loading: true,
-        // 导出遮罩层
-        exportLoading: false,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
+         // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      rules:{},
+      // 报警信息表格数据
+      deviceAlarmList: [],
+      // 报警类型字典
+      typeOptions: [],
+      // 设备级联
+      options: [],
+
+      props: {
         multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 工单基础信息表格数据
-        basicsInfoList: [],
-        // feedbackList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 工单状态字典
-        typeOptions: [],
-        pickerOptions:[],
-        // 工单类型字典
-        ordertypeOptions: [],
-        // 设备树选项
-        deviceOptions: [
-          {
-            label: "设备列表",
-            childList: []
-          }
-        ],
-        defaultProps: {
-          children: "childList",
-          label: "label"
-        },
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          orderType: null,
-          orderName: null,
-          orderStatus: null,
-          appointInspector: null,
-          allotTime: null,
-          actualInspector: null,
-          actualTime: null,
-          remarks: null
-        },
-        // 表单参数
-        form: {},
-        activity: {},
-        // 表单校验
-        rules: {
-        },
-        active : 0,
-        orderId : "",
-        showAndHide : false
+        value: "id",
+        label: "name",
+        level: "level",
+        children: "childList",
+      },
+      devices: null,
+      // 巡检员列表
+      inspector: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceId: null,
+        orderId: null,
+        alarmType: null,
+        alarmValue: null,
+        startTime: null,
+        endTime: null,
+        dealStatus: null
+      },
+      // 表单参数
+      form: { },
       };
     },
     
@@ -189,12 +220,12 @@ export default {
       this.getDicts("t_order_type").then(response => {
         this.ordertypeOptions = response.data;
       });
-      this.getBasicsInfo();
+      this.getDeviceAlarm();
     },
     mounted(){
       let gaoMap =  new gaodeMap("石家庄");
       this.gaoMap = gaoMap;
-      this.getBasicsInfo();
+      this.getDeviceAlarm();
       this.initData();
       this.drawPieChart();
       this.main3();
@@ -751,15 +782,15 @@ export default {
       },
       /** 查询工单基础信息列表 */
       getList() {
-        this.loading = true;
-        listBasicsInfo(this.queryParams).then(response => {
-          this.basicsInfoList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      getBasicsInfo (){
-        getBasicsInfo(this.orderId).then(response =>{
+      this.loading = true;
+      listDeviceAlarm(this.queryParams).then(response => {
+        this.deviceAlarmList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getDeviceAlarm (){
+      getDeviceAlarm(this.orderId).then(response =>{
           this.form = response.data;
           this.active = parseInt(response.data.orderStatus) + 1;
           if(this.form.deviceInfoList.length>0){
@@ -837,7 +868,7 @@ export default {
       /** 归档按钮操作 */
     handleFinish(res) {
       // this.reset();
-      getBasicsInfo(res).then(response => {
+      getDeviceAlarm(res).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "工单信息归档";
@@ -847,7 +878,7 @@ export default {
       handleUpdate(res) {
       // this.reset();
       this.getInspectorList();
-      getBasicsInfo(this.orderId).then(response => {
+      getInspectorList(this.orderId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "工单信息修改";

gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue

@@ -243,6 +243,7 @@ export default {
         this.deviceAlarmList = response.rows;
         this.total = response.total;
         this.loading = false;
+        console.log("this.deviceAlarmList",this.deviceAlarmList)
       });
     },
     getInspectorList(){

gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue

@@ -283,7 +283,7 @@
         // 表单校验
         rules: {
           planName: [
-            { required: true, message: "计划名称不能为空", trigger: "blur" }
+            { required: true, message: " 计划名称不能为空", trigger: "blur" }
           ],
           orderName: [
             { required: true, message: "工单名称不能为空", trigger: "blur" }
@@ -321,6 +321,7 @@
           this.inspectionPlanList = response.rows;
           this.total = response.total;
           this.loading = false;
+          console.log("this.inspectionPlanList",this.inspectionPlanList)
         });
       },
       /** 详细信息跳转 */
@@ -328,7 +329,7 @@
         this.$router.push({
           path: '/inspectionPlan/inspectiondetail',
           query:{
-            orderId : row.orderId
+            planId : row.planId
           }
         }) //带参跳转
       },