Merge remote-tracking branch 'origin/master'

src/views/basic/station/index.vue

@@ -73,7 +73,9 @@
       <el-table-column label="保证水位" align="center" prop="bzsw" />
       <el-table-column label="测站状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="stationStatusList" :value="scope.row.status"/>
+          <el-tag  v-if="scope.row.status == '0'">正常</el-tag>
+          <el-tag type="warning" v-if="scope.row.status == '1'">信道故障</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '5'">站点关闭</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -116,7 +118,7 @@
         <el-form-item label="纬度" prop="latitude">
           <el-input v-model="form.latitude" placeholder="请输入纬度" />
         </el-form-item>
-        <el-form-item label="测站状态">
+        <el-form-item label="测站状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择测站状态">
             <el-option
               v-for="dict in stationStatusList"
@@ -148,7 +150,7 @@
           <el-input v-model="form.bzsw" placeholder="请输入保证水位" />
         </el-form-item>
         <el-form-item label="摄像头">
-          <el-select v-model="form.cameraSn" placeholder="请选择摄像头">
+          <el-select v-model="form.cameraSn" placeholder="请选择摄像头" clearable>
             <el-option
               v-for="dict in cameraList"
               :key="dict.id"
@@ -186,7 +188,8 @@ export default {
       // 水尺-测站信息表格数据
       infoList: [],
       //摄像头列表
-      cameraList:[],
+      cameraList:[
+      ],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -227,7 +230,6 @@ export default {
   },
   created() {
     this.getList();
-    this.getCameraList();
   },
   methods: {
     /**
@@ -295,6 +297,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getCameraList();
       this.open = true;
       this.title = "添加水尺-测站信息";
     },
@@ -302,6 +305,14 @@ export default {
     async handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
+      // 查询所有未使用的摄像头
+      this.getCameraList();
+      // 在查询该站点所属的摄像头
+      let response = await this.$axiosGet('/web/camera/cameraBySid/'+id);
+      if(response.code === 0){
+        this.cameraList.push(response.data)
+      }
+
       let res = await this.$axiosGet('/system/info/info/'+id);
       if(res.code === 0){
         this.form = res.data;