修改

src/views/wind/wind/components/viewDialog.vue

@@ -10,12 +10,16 @@
         <el-row class="dialog-row">
           <div class="dialog-row-title">风场信息</div>
           <div class="dialog-row-content">
-            <span class="content-row"> <span class="name-item">风场名称: </span> <span>{{info.name}}</span> </span>
             <span class="content-row"> <span class="name-item">风场编号: </span> <span>{{info.number}}</span> </span>
+            <span class="content-row"> <span class="name-item">风场名称: </span> <span>{{info.name}}</span> </span>
             <span class="content-row"> <span class="name-item">所属部门: </span> <span>{{info.depart_name}}</span> </span>
-
-            <span class="content-row"> <span class="name-item">风场地址: </span> <span>{{info.address}}</span> </span>
-
+            <span class="content-row"> <span class="name-item">所属区域: </span> <span>浙江省杭州市滨江区</span> </span>
+            <span class="content-row"> <span class="name-item">详细地址: </span> <span>{{info.address}}</span> </span>
+            <span class="content-row"> <span class="name-item">风场类型: </span> <span>海上</span> </span>
+            <span class="content-row"> <span class="name-item">环境类型: </span> <span>潮间带</span> </span>
+            <span class="content-row"> <span class="name-item">海拔高度: </span> <span>100米</span> </span>
+            <span class="content-row"> <span class="name-item">主机制造商: </span> <span>上海电气</span> </span>
+            <span class="content-row"> <span class="name-item">风机台数: </span> <span>40</span> </span>
             <span class="content-row"> <span class="name-item">添加人员: </span> <span>{{info.creator}}</span> </span>
             <span class="content-row"> <span class="name-item">添加时间: </span> <span>{{info.created_at}}</span> </span>
             <span class="content-row"> <span class="name-item" v-html="'备       注: '"> </span> <span>{{info.remark}}</span> </span>

src/views/wind/wind/form/AddEditWind.vue

@@ -4,25 +4,20 @@
       <el-form-item label="风场名称" prop="name">
         <el-input v-model="form.name"></el-input>
       </el-form-item>
-      <el-form-item label="风场编号" prop="number">
+      <el-form-item label="风场编号" required prop="number">
         <el-input v-model="form.number"></el-input>
       </el-form-item>
-      <!-- <el-form-item label="风场类型" required prop="wind_shape">
-        <el-select
-          v-model="form.wind_shape"
-          disabled
-          filterable
-          placeholder="请选择风场类型"
-        >
+      <el-form-item label="风场类型" required prop="wind_type">
+        <el-select v-model="form.wind_type" filterable placeholder="请选择风场类型">
           <el-option
-            v-for="wind in windTypeData"
-            :key="wind.key"
-            :label="wind.name"
-            :value="wind.key"
-          ></el-option>
+            v-for="item in windTypeData"
+            :key="item.value"
+            :label="item.text"
+            :value="item.value">
+          </el-option>
         </el-select>
-      </el-form-item> -->
-      <el-form-item label="所属部门" required prop="department_id">
+      </el-form-item>
+       <el-form-item label="所属部门" required prop="department_id">
         <el-cascader
           class="filter-item form-search-input fl"
           placeholder="请选择所属部门"
@@ -33,8 +28,27 @@
           filterable
           clearable
         ></el-cascader>
+         </el-form-item>
+        <el-form-item label="风场类型" required prop="env_type">
+        <el-select v-model="form.env_type" filterable placeholder="请选择环境类型">
+          <el-option
+            v-for="item in EnvTypeData"
+            :key="item.value"
+            :label="item.text"
+            :value="item.value">
+          </el-option>
+        </el-select>
+       </el-form-item>
+      <el-form-item label="所属区域" required prop="area_id" placeholder="请选择所属区域">
+          <regionals style="width: 85%"
+              ref="regionals"
+              class="filter-item fl"
+              appendToBody
+              @checked="selectArea"
+              :defaultCheckedKeys="form.area_id"
+            />
       </el-form-item>
-      <el-form-item label="风场地址" prop="address">
+      <el-form-item label="详细地址" prop="address">
         <el-input v-model="form.address"></el-input>
       </el-form-item>
        <el-form-item label="风场边颜色" prop="side_color">
@@ -43,6 +57,19 @@
        <el-form-item label="风场内颜色" prop="inside_color">
         <el-color-picker v-model="form.inside_color"></el-color-picker>
       </el-form-item>
+       <el-form-item label="海拔高度" prop="altitude">
+        <el-input v-model="form.altitude"></el-input>
+      </el-form-item>
+      <el-form-item label="主机制造商" required prop="env_type">
+      <el-select v-model="form.host_firm" filterable placeholder="主机制造商">
+          <el-option
+            v-for="item in HostTypeData"
+            :key="item.value"
+            :label="item.text"
+            :value="item.value">
+          </el-option>
+        </el-select>
+       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input type="textarea" v-model="form.remark"></el-input>
       </el-form-item>
@@ -56,9 +83,10 @@
 </template>
 <script>
 import { deepClone } from "@/utils/index";
-
+import Regionals from "@/components/Cascader/Regionals";
 export default {
   name: "AddEditWind",
+  components: { Regionals },
   props: {
     formName: {
       type: String,
@@ -80,10 +108,9 @@ export default {
         value: "id",
         checkStrictly: true,
       },
-      windTypeData: [
-        { key: "circle", name: "圆形风场" },
-        { key: "polygon", name: "多边形风场" },
-      ],
+      windTypeData: [],
+      EnvTypeData:[],
+      HostTypeData:[],
       rules: {
         name: [
           { required: true, message: "请输入风场名称", trigger: "blur" },
@@ -99,6 +126,11 @@ export default {
           { required: true, message: "请选择所属部门", trigger: "blur" },
           { required: true, message: "请选择所属部门", trigger: "change" },
         ],
+        area_id:[
+          { required: true, message: "请选择所属区域", trigger: "blur" },
+          { required: true, message: "请选择所属区域", trigger: "change" },
+          ],
+
         address: [
           { required: true, message: "请输入风场地址", trigger: "blur" },
           { required: true, message: "请输入风场地址", trigger: "change" },
@@ -109,6 +141,17 @@ export default {
   },
   created() {
     this.getDepartmentData();
+    this.$http.post("sysDictData/getOptions", { type: "WindType" }).then(resp => {
+        this.windTypeData = resp.data
+    });
+    this.$http.post("sysDictData/getOptions", { type: "EnvironmentType" }).then(resp => {
+        this.EnvTypeData = resp.data
+    });
+    this.$http.post("sysDictData/getOptions", { type: "HostManufacturer" }).then(resp => {
+        this.HostTypeData = resp.data
+    });
+    
+    
   },
   computed: {
     form: {
@@ -126,14 +169,11 @@ export default {
   methods: {
     // 获取部门数据
     getDepartmentData() {
-      this.$http
-        .get("departments")
-        .then((resp) => {
+      this.$http.get("departments").then((resp) => {
           if (resp.code === 10000) {
             this.departmentData = resp.data || [];
           }
-        })
-        .catch(() => {});
+        }).catch(() => {});
     },
     submitForm() {
       // 检测
@@ -180,6 +220,11 @@ export default {
     closeDialog() {
       this.$parent.handleClose();
     },
+    selectArea(val) {
+          console.log('selectArea',val)
+          this.form.area_id = val
+          console.log(this.formFieldsData)
+    },
   },
 };
 </script>

src/views/wind/wind/index.scss

@@ -3,7 +3,9 @@
     margin: 5px;
     padding: 5px;
     // display: flex;
-
+    ::v-deep .el-dialog{
+        margin-top:5vh !important;
+    }
     .bm-view {
         display: inline-block;
         width: calc(100% - 500px);

src/views/wind/wind/index.vue

@@ -59,7 +59,7 @@
             </bm-control>
         </baidu-map>
         <!-- 风场表单 -->
-        <el-dialog title="风场信息" :visible.sync="visibleWindDialog" destroy-on-close width="600px">
+        <el-dialog title="风场信息" :visible.sync="visibleWindDialog"  v-dialogDrag destroy-on-close width="600px">
             <add-edit-wind @result="addEditWindResult"  :formData="windFormData"  />
         </el-dialog>
         <div id="rightPanel">

src/views/wind/wind/table/WindTable.vue

@@ -1,15 +1,16 @@
 <template>
     <div class="app-container">
-        <el-input
-            v-model="queryParam.name"
-            placeholder="风场名称"
-            clearable
-            class="filter-item form-search-input fl"
-            @keyup.enter.native="handleSearch"
-          />
+
+              <regionals
+                class="fl"
+                ref="regionals"
+                style="width:40%;margin-right:10px;"
+                @checked="selectArea"
+                :defaultCheckedKeys="queryParam.citys"
+              />
         <el-input
             v-model="queryParam.number"
-            placeholder="风场编号"
+            placeholder="风场编号/名称"
             clearable
             class="filter-item form-search-input fl"
             @keyup.enter.native="handleSearch"
@@ -106,13 +107,13 @@
 import rlListOperate from '@/layout/rl-list-operate/rlListOperate';
 import FloorTable from '../floor/index';
 // import AlarmReportTable from '@/views/alarm/alarmReport';
-
+import Regionals from "@/components/Cascader/Regionals";
 export default {
     name: 'FenceTable',
     mixins: [ rlListOperate ],
     components: { 
             FloorTable,
-            // AlarmReportTable
+            Regionals
          },
     props: {
     },
@@ -163,6 +164,9 @@ export default {
 
             }).catch(() => {});
         },
+        selectArea(val) {
+            this.queryParam.citys = val;
+        },
         // alarmTable(id){
         //     this.showAlarmDialog = true
         //     this.currentFenceId = id