告警测点id问题

operationSupport/src/views/alarmManagement/popups/addoreditalarm.vue

@@ -46,7 +46,12 @@
             </template>
             <template slot="deviceId">
                 <el-select v-model="data.deviceId" placeholder="请选择设备" clearable @change="deviceSelect">
-                    <el-option v-for="item in deviceOptions" :key="item.id" :value="item.id" :label="item.deviceName"></el-option>
+                    <el-option
+                        v-for="item in deviceOptions"
+                        :key="item.id"
+                        :value="item.id"
+                        :label="`${item.deviceName}(${item.deviceNo})`"
+                    ></el-option>
                 </el-select>
             </template>
 
@@ -82,7 +87,7 @@
                     <div class="lixian_class" v-if="alarmCategory == 1">
                         <el-form-item slot="row" class="tip-info" label="测点" prop="measuringCode">
                             <el-select v-model="measuringCode" placeholder="请选择测点" clearable @change="measureSelect">
-                                <el-option v-for="item in measureOptions" :key="item.id" :value="item.id" :label="item.name"></el-option>
+                                <el-option v-for="item in measureOptions" :key="item.id" :value="item.identifier" :label="item.name"></el-option>
                             </el-select>
                         </el-form-item>
                         <el-table class="avg_table" :data="data.rules" stripe="true">
@@ -312,7 +317,7 @@ export default {
             measureOptions: [],
             dictList: [],
             rules: {
-                communityId:this.$valid.selectRequired('社区'),
+                communityId: this.$valid.selectRequired('社区'),
                 productId: this.$valid.selectRequired('产品'),
                 name: [this.$valid.inputRequired('告警名称'), this.$valid.lengthRange(0, 30)],
                 // measuringCode: this.$valid.selectRequired('测点'),
@@ -588,7 +593,7 @@ export default {
             });
         },
         productChange(e) {
-            let  lat = _.last(e)
+            let lat = _.last(e);
             this.measuringOptions = [];
             this.data.productId = e;
             this.data.deviceId = '';