Merge branch 'baiyanting1' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into new-power

src/views/IntegratedAlarm/safe/customWarning/index.vue

@@ -108,7 +108,7 @@
               <el-option
                 v-for="item in componentList"
                 :key="item.id"
-                :value="item.id"
+                :value="item.nemCode"
                 :label="item.name"
               >
               </el-option>
@@ -523,9 +523,7 @@ const modelList = computed(() => {
   if (state.stationId == "") {
     return [];
   } else {
-    state.modelId = route.query.deviceId
-      ? route.query.modelId
-      : state.modelListAll[state.stationId]?.[0]?.id || "";
+    state.modelId = route.query.deviceId ? route.query.modelId : "";
     return state.modelListAll[state.stationId];
   }
 });

src/views/IntegratedAlarm/safe/historyWarning/index.vue

@@ -103,7 +103,7 @@
               <el-option
                 v-for="item in componentList"
                 :key="item.id"
-                :value="item.id"
+                :value="item.nemCode"
                 :label="item.name"
               >
               </el-option>
@@ -541,9 +541,7 @@ const modelList = computed(() => {
     if (state.stationId == "") {
       return [];
     } else {
-      state.modelId = route.query.deviceId
-        ? route.query.modelId
-        : state.modelListAll[state.stationId]?.[0]?.id || "";
+      state.modelId = route.query.deviceId ? route.query.modelId : "";
       return state.modelListAll[state.stationId];
     }
   } else {