Browse Source

Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-ui

likang 2 years ago
parent
commit
8d8c1ee286

+ 3 - 3
src/views/report/alarmDeviceCount/index.vue

@@ -6,7 +6,7 @@
               <el-cascader
                 class="filter-item fl form-search-input"
                 @change="handleSearch"
-                placeholder="请选择所属单位"
+                placeholder="请选择所属部门"
                 :options="departments"
                 v-model="queryParam.depart_id"
                 :props="departProps"
@@ -14,13 +14,13 @@
                 clearable>
               </el-cascader>
         
-              <el-input
+              <!-- <el-input
                 v-model="queryParam.creator"
                 placeholder="安装人员"
                 clearable
                 @change="handleSearch"
                 class="filter-item form-search-input fl"
-              />
+              /> -->
             
               <el-button class="filter-item fl" icon="el-icon-search" @click="handleSearch">
                 搜索

+ 2 - 2
src/views/report/companyCount/index.vue

@@ -14,13 +14,13 @@
                 clearable>
               </el-cascader>
         
-              <el-input
+              <!-- <el-input
                 v-model="queryParam.creator"
                 placeholder="安装人员"
                 clearable
                 @change="handleSearch"
                 class="filter-item form-search-input fl"
-              />
+              /> -->
             
               <el-button class="filter-item fl" icon="el-icon-search" @click="handleSearch">
                 搜索

+ 3 - 3
src/views/report/hydraulicCount/index.vue

@@ -6,7 +6,7 @@
               <el-cascader
                 class="filter-item fl form-search-input"
                 @change="handleSearch"
-                placeholder="请选择所属单位"
+                placeholder="请选择所属部门"
                 :options="departments"
                 v-model="queryParam.depart_id"
                 :props="departProps"
@@ -14,13 +14,13 @@
                 clearable>
               </el-cascader>
         
-              <el-input
+              <!-- <el-input
                 v-model="queryParam.creator"
                 placeholder="安装人员"
                 clearable
                 @change="handleSearch"
                 class="filter-item form-search-input fl"
-              />
+              /> -->
             
               <el-button class="filter-item fl" icon="el-icon-search" @click="handleSearch">
                 搜索

+ 20 - 6
src/views/report/windCount/index.vue

@@ -6,21 +6,33 @@
               <el-cascader
                 class="filter-item fl form-search-input"
                 @change="handleSearch"
-                placeholder="请选择所属单位"
+                placeholder="请选择所属部门"
                 :options="departments"
                 v-model="queryParam.depart_id"
                 :props="departProps"
                 filterable
                 clearable>
               </el-cascader>
-        
-              <el-input
+               <el-select
+                  v-model="queryParam.wind_id"
+                  placeholder="所属风场"
+                  class="filter-item form-search-input fl"
+                  clearable
+                >
+                <el-option
+                      v-for="item in windOptions"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
+                    </el-option>
+                </el-select>
+              <!-- <el-input
                 v-model="queryParam.creator"
                 placeholder="安装人员"
                 clearable
                 @change="handleSearch"
                 class="filter-item form-search-input fl"
-              />
+              /> -->
             
               <el-button class="filter-item fl" icon="el-icon-search" @click="handleSearch">
                 搜索
@@ -78,7 +90,7 @@ export default {
       barXData: [],
       barSeriesData: [],
       barOptions: {},
-      
+      windOptions:[],
       departments: [],
       queryParam:{
         depart_id:'',
@@ -97,7 +109,9 @@ export default {
 
         // 获取所属单位
         this.getDepartOptions();
-       
+         this.$http.get("wind").then((response) => {
+          this.windOptions = response.data;
+        });
   },
   methods: {    
     /**