测风塔

wrdep-biz/src/main/java/com/jiayue/biz/domain/WindTowerInfo.java

@@ -120,7 +120,7 @@ public class WindTowerInfo implements Serializable {
     private String displayHeight;
 
     /**
-     *测风塔附属于
+     * 测风塔类型 1：传统塔，2：声雷达
      */
     private String type;
 

wrdep-ui/src/views/dataQuery/windTowerStatusInfo/index.vue

@@ -77,12 +77,12 @@
                 :data="tableAllData.slice((page.currentPage-1)*page.pageSize,page.currentPage*page.pageSize)">
         <el-table-column type="index" label="序号" width="55" align="center"/>
         <el-table-column label="名称" align="center" prop="name"/>
-<!--        <el-table-column label="所属项目" align="center" prop="projectId" :formatter="formatProjectId"/>-->
-<!--        <el-table-column label="型号" align="center" prop="modelNumber"/>-->
+        <!--        <el-table-column label="所属项目" align="center" prop="projectId" :formatter="formatProjectId"/>-->
+        <!--        <el-table-column label="型号" align="center" prop="modelNumber"/>-->
         <el-table-column label="设备编号" align="center" prop="equipmentNo"/>
         <el-table-column label="记录仪编号" align="center" prop="recorderNo"/>
         <!--<el-table-column label="测风塔层高" align="center" prop="heights"/>-->
-<!--        <el-table-column label="数据密码" align="center" prop="password"/>-->
+        <!--        <el-table-column label="数据密码" align="center" prop="password"/>-->
         <el-table-column label="安装时间" align="center" prop="installationTime" width="180">
           <template slot-scope="scope">
             <span>{{ dateFormat(scope.row.installationTime) }}</span>
@@ -91,10 +91,11 @@
         <el-table-column label="制造商" align="center" prop="manufacturer"/>
         <el-table-column label="经度" align="center" prop="longitude"/>
         <el-table-column label="纬度" align="center" prop="latitude"/>
-        <el-table-column label="状态" align="center" prop="status" :formatter="formatStatus"/>
-        <el-table-column label="首页展示层" align="center" prop="displayHeight" :formatter="formatHeight"/>
-        <el-table-column label="海拔" align="center" prop="altitude"/>
-        <el-table-column label="地形复杂程度" align="center" prop="terrainComplexity"/>
+        <el-table-column label="测风塔类型" align="center" prop="type" :formatter="formatType"/>
+        <!--        <el-table-column label="状态" align="center" prop="status" :formatter="formatStatus"/>-->
+        <!--        <el-table-column label="首页展示层" align="center" prop="displayHeight" :formatter="formatHeight"/>-->
+        <!--        <el-table-column label="海拔" align="center" prop="altitude"/>-->
+        <!--        <el-table-column label="地形复杂程度" align="center" prop="terrainComplexity"/>-->
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -152,25 +153,48 @@
           </el-col>
         </el-row>
         <el-row :gutter="20" class="mb8">
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="所属项目" prop="projectId">-->
-<!--              <el-select v-model="form.projectId" placeholder="请选择所属项目" style="width: 100%" clearable>-->
-<!--                <el-option-->
-<!--                  v-for="(item,index) in projectInfo"-->
-<!--                  :key="index"-->
-<!--                  :label="item.projectName"-->
-<!--                  :value="item.id">-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col> -->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="所属项目" prop="projectId">-->
+          <!--              <el-select v-model="form.projectId" placeholder="请选择所属项目" style="width: 100%" clearable>-->
+          <!--                <el-option-->
+          <!--                  v-for="(item,index) in projectInfo"-->
+          <!--                  :key="index"-->
+          <!--                  :label="item.projectName"-->
+          <!--                  :value="item.id">-->
+          <!--                </el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="测风塔类型" prop="type">
+              <el-select v-model="form.type" placeholder="请选择" style="width: 100%" clearable>
+                <el-option
+                  v-for="(item,index) in towerType"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="记录仪编号" prop="recorderNo">
               <el-input v-model="form.recorderNo" placeholder="请输入记录仪编号"/>
             </el-form-item>
           </el-col>
         </el-row>
-
+        <el-row :gutter="20" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="经度" prop="longitude">
+              <el-input v-model="form.longitude" placeholder="请输入经度"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="纬度" prop="latitude">
+              <el-input v-model="form.latitude" placeholder="请输入纬度"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20" class="mb8">
           <el-col :span="12">
             <el-form-item label="数据密码" prop="password">
@@ -201,63 +225,52 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="经度" prop="longitude">
-              <el-input v-model="form.longitude" placeholder="请输入经度"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="纬度" prop="latitude">
-              <el-input v-model="form.latitude" placeholder="请输入纬度"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="海拔" prop="altitude">
-              <el-input v-model="form.altitude" placeholder="请输入海拔"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="地形复杂程度" prop="terrainComplexity">
-              <el-select v-model="form.terrainComplexity" placeholder="请选择" style="width: 100%" clearable>
-                <el-option
-                  v-for="item in terrain"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="状态" prop="status">
-              <el-select v-model="form.status" placeholder="请选择" style="width: 100%" clearable>
-                <el-option
-                  v-for="item in statusOption"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="首页展示层高" prop="displayHeight">
-              <el-select v-model="form.displayHeight" placeholder="请选择" style="width: 100%" clearable>
-                <el-option
-                  v-for="(item,index) in heightOption"
-                  :key="index"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+
+        <!--        <el-row :gutter="20" class="mb8">-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="海拔" prop="altitude">-->
+        <!--              <el-input v-model="form.altitude" placeholder="请输入海拔"/>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="地形复杂程度" prop="terrainComplexity">-->
+        <!--              <el-select v-model="form.terrainComplexity" placeholder="请选择" style="width: 100%" clearable>-->
+        <!--                <el-option-->
+        <!--                  v-for="item in terrain"-->
+        <!--                  :key="item.value"-->
+        <!--                  :label="item.value"-->
+        <!--                  :value="item.value">-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+        <!--        <el-row :gutter="20" class="mb8">-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="状态" prop="status">-->
+        <!--              <el-select v-model="form.status" placeholder="请选择" style="width: 100%" clearable>-->
+        <!--                <el-option-->
+        <!--                  v-for="item in statusOption"-->
+        <!--                  :key="item.value"-->
+        <!--                  :label="item.label"-->
+        <!--                  :value="item.value">-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="首页展示层高" prop="displayHeight">-->
+        <!--              <el-select v-model="form.displayHeight" placeholder="请选择" style="width: 100%" clearable>-->
+        <!--                <el-option-->
+        <!--                  v-for="(item,index) in heightOption"-->
+        <!--                  :key="index"-->
+        <!--                  :label="item.label"-->
+        <!--                  :value="item.value">-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -279,6 +292,7 @@ import {
 } from "@/api/biz/dataQuery/windTowerStatusInfo";
 import defaultOption from "@/api/biz/dataQuery/defaultOption";
 import {listAll} from "@/api/biz/dataQuery/project";
+
 export default {
   name: "WindTowerStatusInfo",
   data() {
@@ -413,11 +427,12 @@ export default {
       rules: {
         name: [{required: true, validator: checkName, trigger: 'blur'}],
         equipmentNo: [{required: true, validator: checkEquipmentNo, trigger: 'blur'}],
-        recorderNo: [{required: true, validator: checkRecorderNo, trigger: 'blur'}],
+        type: [{required: true, message: '请选择测风塔类型', trigger: 'blur'}],
+        // recorderNo: [{required: true, validator: checkRecorderNo, trigger: 'blur'}],
         // modelNumber: [{required: true,  message:'请输入型号', trigger: 'blur'}],
         longitude: [{required: true, validator: checkLongitude, trigger: 'blur'}],
         latitude: [{required: true, validator: checkLatitude, trigger: 'blur'}],
-        password: [{required: true, message: '请输入数据密码', trigger: 'blur'}],
+        // password: [{required: true, message: '请输入数据密码', trigger: 'blur'}],
       },
       modId: '',
       cftData: [],
@@ -427,31 +442,33 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 10 // 每页显示多少条
       },
+      towerType: [{label: "传统塔", value: "1"},
+        {label: "声雷达", value: "2"}],
       terrain: [{label: "平坦地形", value: "平坦地形"},
         {label: "隆升地形", value: "隆升地形"},
         {label: "低凹地形", value: "低凹地形"}],
-      statusOption:[{label: "停机", value: "0"},
+      statusOption: [{label: "停机", value: "0"},
         {label: "运行", value: "1"}],
-      heightOption:[],
-      projectInfo:[]
+      heightOption: [],
+      projectInfo: []
     };
   },
   created() {
     this.getList();
-    this.heightOption=defaultOption.allHeightOptions
+    this.heightOption = defaultOption.allHeightOptions
   },
   mounted() {
     this.getProjectInfo()
   },
   methods: {
     /*项目信息*/
-    getProjectInfo(){
-      listAll().then(res=>{
+    getProjectInfo() {
+      listAll().then(res => {
         this.projectInfo = res.rows
         this.getAllWindTowerInfo()
-      }).catch(err=>{
-        console.log('获取项目信息异常：'+err)
-        this.$message.error('获取项目信息异常：'+err)
+      }).catch(err => {
+        console.log('获取项目信息异常：' + err)
+        this.$message.error('获取项目信息异常：' + err)
       })
     },
     /*获取所有的测风塔*/
@@ -494,7 +511,7 @@ export default {
       // });
     },
     /*条件查询*/
-    listWindTowerStatusInfo(){
+    listWindTowerStatusInfo() {
 
     },
     // 取消按钮
@@ -518,8 +535,9 @@ export default {
         altitude: null,
         terrainComplexity: null,
         projectId: null,
-        status:'1',
-        displayHeight:""
+        status: '1',
+        displayHeight: "",
+        type: "1",
       };
       this.resetForm("form");
     },
@@ -567,21 +585,22 @@ export default {
         latitude: row.latitude,
         altitude: row.altitude,
         terrainComplexity: row.terrainComplexity,
-        status:row.status,
-        displayHeight:row.displayHeight,
-        projectId:row.projectId
+        status: row.status,
+        displayHeight: row.displayHeight,
+        projectId: row.projectId,
+        type: row.type
       };
       /*动态显示层高*/
       // console.log(row.heights)
-      if(row.heights !== null){
-        let heights = row.heights.split(',')
-        this.heightOption = []
-        for(let height of heights){
-          this.heightOption.push({value:height,label:height+'m'})
-        }
-      }else{
-        this.heightOption=defaultOption.allHeightOptions
-      }
+      // if (row.heights !== null) {
+      //   let heights = row.heights.split(',')
+      //   this.heightOption = []
+      //   for (let height of heights) {
+      //     this.heightOption.push({value: height, label: height + 'm'})
+      //   }
+      // } else {
+      //   this.heightOption = defaultOption.allHeightOptions
+      // }
       this.open = true;
       this.title = "修改测风塔信息";
     },
@@ -665,17 +684,21 @@ export default {
       }
 
     },
-    formatStatus(row){
-      let option = this.statusOption.find(w=>w.value === row.status)
-      return option !==undefined?option.label:row.status
+    formatType(row) {
+      let option = this.towerType.find(w => w.value === row.type)
+      return option !== undefined ? option.label : row.type
+    },
+    formatStatus(row) {
+      let option = this.statusOption.find(w => w.value === row.status)
+      return option !== undefined ? option.label : row.status
     },
-    formatHeight(row){
-      let option = this.heightOption.find(w=>w.value === row.displayHeight)
-      return option !==undefined?option.label:row.displayHeight
+    formatHeight(row) {
+      let option = this.heightOption.find(w => w.value === row.displayHeight)
+      return option !== undefined ? option.label : row.displayHeight
     },
-    formatProjectId(row){
-      let option = this.projectInfo.find(w=>w.id === row.projectId)
-      return option !==undefined?option.projectName:row.projectName
+    formatProjectId(row) {
+      let option = this.projectInfo.find(w => w.id === row.projectId)
+      return option !== undefined ? option.projectName : row.projectName
     }
   }
 };