页面调换测风塔下拉框与时间下拉框的位置

neim-ui/src/views/statistical/airDensity/index.vue

@@ -3,40 +3,41 @@
     <el-card class="box-card">
       <div class="seachBox">
         <div class="conditionOne">
-          <span>时间：</span>
-          <el-date-picker
-            v-model="dataTime"
-            type="monthrange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          >
-          </el-date-picker>
-        </div>
-        <div class="conditionTwo">
-          <span>时间纬度：</span>
-          <el-select v-model="uid" placeholder="请选择">
+          <span>测风塔：</span>
+          <el-select v-model="cftId" placeholder="请选择">
             <el-option
-              v-for="item in uidOption"
+              v-for="item in startDateAndEndDate"
               :key="item.value"
               :label="item.label"
               :value="item.value">
+              <span style="float: left;">{{ item.label }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.date }}</span>
             </el-option>
           </el-select>
         </div>
         <div class="conditionTwo">
-          <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择">
+        <span>时间：</span>
+        <el-date-picker
+          v-model="dataTime"
+          type="monthrange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+        <div class="conditionTwo">
+          <span>时间纬度：</span>
+          <el-select v-model="uid" placeholder="请选择">
             <el-option
-              v-for="item in startDateAndEndDate"
+              v-for="item in uidOption"
               :key="item.value"
               :label="item.label"
               :value="item.value">
-              <span style="float: left;">{{ item.label }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.date }}</span>
             </el-option>
           </el-select>
         </div>
+
         <el-button class="seachBtu" type="primary" plain icon="el-icon-search" size="small" @click="getListAirDensity">
           搜索
         </el-button>

neim-ui/src/views/statistical/gumbel/index.vue

@@ -3,17 +3,6 @@
     <el-card class="box-card">
       <div class="seachBox">
         <div class="conditionOne">
-          <span>时间：</span>
-          <el-date-picker
-            v-model="dataTime"
-            type="monthrange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          >
-          </el-date-picker>
-        </div>
-        <div class="conditionTwo">
           <span>测风塔：</span>
           <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
             <el-option
@@ -27,6 +16,17 @@
           </el-select>
         </div>
         <div class="conditionTwo">
+          <span>时间：</span>
+          <el-date-picker
+            v-model="dataTime"
+            type="monthrange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
+          </el-date-picker>
+        </div>
+        <div class="conditionTwo">
           <span>层高：</span>
           <el-select v-model="height" placeholder="请选择">
             <el-option

neim-ui/src/views/statistical/shear/index.vue

@@ -3,17 +3,6 @@
     <el-card class="box-card">
       <div class="seachBox">
         <div class="conditionOne">
-          <span>时间：</span>
-          <el-date-picker
-            v-model="dataTime"
-            type="monthrange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          >
-          </el-date-picker>
-        </div>
-        <div class="conditionTwo">
           <span>测风塔：</span>
           <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
             <el-option
@@ -27,6 +16,17 @@
           </el-select>
         </div>
         <div class="conditionTwo">
+          <span>时间：</span>
+          <el-date-picker
+            v-model="dataTime"
+            type="monthrange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
+          </el-date-picker>
+        </div>
+        <div class="conditionTwo">
           <span>层高：</span>
           <el-select v-model="height" placeholder="请选择" clearable multiple>
             <el-option

neim-ui/src/views/statistical/statisticsWs/index.vue

@@ -3,40 +3,41 @@
     <el-card class="box-card">
       <div class="seachBox">
         <div class="conditionOne">
-          <span>时间：</span>
-          <el-date-picker
-            v-model="dataTime"
-            type="monthrange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          >
-          </el-date-picker>
-        </div>
-        <div class="conditionTwo">
-          <span>时间纬度：</span>
-          <el-select v-model="uid" placeholder="请选择">
+          <span>测风塔：</span>
+          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
             <el-option
-              v-for="item in uidOption"
+              v-for="item in startDateAndEndDate"
               :key="item.value"
               :label="item.label"
               :value="item.value">
+              <span style="float: left;">{{ item.label }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.date }}</span>
             </el-option>
           </el-select>
         </div>
         <div class="conditionTwo">
-          <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+        <span>时间：</span>
+        <el-date-picker
+          v-model="dataTime"
+          type="monthrange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+        <div class="conditionTwo">
+          <span>时间纬度：</span>
+          <el-select v-model="uid" placeholder="请选择">
             <el-option
-              v-for="item in startDateAndEndDate"
+              v-for="item in uidOption"
               :key="item.value"
               :label="item.label"
               :value="item.value">
-              <span style="float: left;">{{ item.label }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.date }}</span>
             </el-option>
           </el-select>
         </div>
+
         <div class="conditionTwo">
           <span>层高：</span>
           <el-select v-model="height" placeholder="请选择" clearable multiple>

neim-ui/src/views/statistical/turIntensity/index.vue

@@ -3,17 +3,6 @@
     <el-card class="box-card">
       <div class="seachBox">
         <div class="conditionOne">
-          <span>时间：</span>
-          <el-date-picker
-            v-model="dataTime"
-            type="monthrange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          >
-          </el-date-picker>
-        </div>
-        <div class="conditionTwo">
           <span>测风塔：</span>
           <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
             <el-option
@@ -27,6 +16,17 @@
           </el-select>
         </div>
         <div class="conditionTwo">
+          <span>时间：</span>
+          <el-date-picker
+            v-model="dataTime"
+            type="monthrange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
+          </el-date-picker>
+        </div>
+        <div class="conditionTwo">
           <span>层高：</span>
           <el-select v-model="height" placeholder="请选择" clearable multiple>
             <el-option

neim-ui/src/views/statistical/windResources/index.vue

@@ -3,6 +3,19 @@
     <el-card class="box-card">
       <div class="seachBox">
         <div class="conditionOne">
+        <span>测风塔：</span>
+        <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+          <el-option
+            v-for="item in startDateAndEndDate"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            <span style="float: left;">{{ item.label }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.date }}</span>
+          </el-option>
+        </el-select>
+      </div>
+        <div class="conditionTwo">
           <span>时间：</span>
           <el-date-picker
             v-model="startTime"
@@ -18,19 +31,7 @@
             placeholder="选择年">
           </el-date-picker>
         </div>
-        <div class="conditionTwo">
-          <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
-            <el-option
-              v-for="item in startDateAndEndDate"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-              <span style="float: left;">{{ item.label }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.date }}</span>
-            </el-option>
-          </el-select>
-        </div>
+
         <div class="conditionTwo">
           <span>层高：</span>
           <el-select v-model="height" placeholder="请选择" clearable multiple>

neim-ui/src/views/statistical/windpowerDensity/index.vue

@@ -3,40 +3,42 @@
     <el-card class="box-card">
       <div class="seachBox">
         <div class="conditionOne">
-          <span>时间：</span>
-          <el-date-picker
-            v-model="dataTime"
-            type="monthrange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          >
-          </el-date-picker>
-        </div>
-        <div class="conditionTwo">
-          <span>时间纬度：</span>
-          <el-select v-model="uid" placeholder="请选择">
+
+          <span>测风塔：</span>
+          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
             <el-option
-              v-for="item in uidOption"
+              v-for="item in startDateAndEndDate"
               :key="item.value"
               :label="item.label"
               :value="item.value">
+              <span style="float: left;">{{ item.label }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.date }}</span>
             </el-option>
           </el-select>
         </div>
         <div class="conditionTwo">
-          <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+        <span>时间：</span>
+        <el-date-picker
+          v-model="dataTime"
+          type="monthrange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+        <div class="conditionTwo">
+          <span>时间纬度：</span>
+          <el-select v-model="uid" placeholder="请选择">
             <el-option
-              v-for="item in startDateAndEndDate"
+              v-for="item in uidOption"
               :key="item.value"
               :label="item.label"
               :value="item.value">
-              <span style="float: left;">{{ item.label }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.date }}</span>
             </el-option>
           </el-select>
         </div>
+
         <div class="conditionTwo">
           <span>层高：</span>
           <el-select v-model="height" placeholder="请选择" clearable multiple>

neim-ui/src/views/windResources/airDensity/index.vue

@@ -2,16 +2,6 @@
   <el-card class="box-card">
     <div class="seachBox">
       <div class="conditionOne">
-        <span>时间：</span>
-        <el-date-picker
-          v-model="dataTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </div>
-      <div class="conditionTwo">
         <span>测风塔：</span>
         <el-select v-model="cftId" placeholder="请选择" @change="getDataTime(cftId)">
           <el-option
@@ -24,6 +14,16 @@
           </el-option>
         </el-select>
       </div>
+      <div class="conditionTwo">
+        <span>时间：</span>
+        <el-date-picker
+          v-model="dataTime"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </div>
       <el-button class="seachBtu" type="primary" plain icon="el-icon-search" size="small" @click="seachTPAndAirdensity">
         搜索
       </el-button>

neim-ui/src/views/windResources/turIntensity/index.vue

@@ -3,18 +3,6 @@
     <el-card class="box-card">
       <div class="seachBox">
         <div class="conditionOne">
-          <span>时间：</span>
-          <el-date-picker
-            v-model="dataTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-           >
-          </el-date-picker>
-        </div>
-<!--        :picker-options="pickerOptions"-->
-        <div class="conditionTwo">
           <span>测风塔：</span>
           <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
             <el-option
@@ -27,6 +15,18 @@
             </el-option>
           </el-select>
         </div>
+<!--        :picker-options="pickerOptions"-->
+        <div class="conditionTwo">
+          <span>时间：</span>
+          <el-date-picker
+            v-model="dataTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
+          </el-date-picker>
+        </div>
         <div class="conditionTwo">
           <span>层高：</span>
           <el-select v-model="height" placeholder="请选择" clearable multiple>

neim-ui/src/views/windResources/windCondition/index.vue

@@ -2,17 +2,6 @@
   <el-card class="box-card">
     <div class="seachBox">
       <div class="conditionOne">
-        <span>时间：</span>
-        <el-date-picker
-          v-model="dataTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          >
-        </el-date-picker>
-      </div>
-      <div class="conditionTwo">
         <span>测风塔：</span>
         <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
           <el-option
@@ -25,6 +14,17 @@
           </el-option>
         </el-select>
       </div>
+      <div class="conditionTwo">
+        <span>时间：</span>
+        <el-date-picker
+          v-model="dataTime"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
       <div class="conditionThree">
         <span>层高：</span>
         <el-select v-model="height" placeholder="请选择">

neim-ui/src/views/windResources/windRose/index.vue

@@ -3,17 +3,6 @@
     <el-card class="box-card">
       <div class="seachBox">
         <div class="conditionOne">
-          <span>时间：</span>
-          <el-date-picker
-            v-model="dataTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            >
-          </el-date-picker>
-        </div>
-        <div class="conditionTwo">
           <span>测风塔：</span>
           <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
             <el-option
@@ -26,6 +15,17 @@
             </el-option>
           </el-select>
         </div>
+        <div class="conditionTwo">
+          <span>时间：</span>
+          <el-date-picker
+            v-model="dataTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
+          </el-date-picker>
+        </div>
         <div class="conditionThree">
           <span>层高：</span>
           <el-select v-model="height" placeholder="请选择">

neim-ui/src/views/windResources/windShear/index.vue

@@ -2,16 +2,6 @@
   <el-card class="box-card">
     <div class="seachBox">
       <div class="conditionOne">
-        <span>时间：</span>
-        <el-date-picker
-          v-model="dataTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </div>
-      <div class="conditionTwo">
         <span>测风塔：</span>
         <el-select v-model="cftId" placeholder="请选择" @change="changeCft(cftId)">
           <el-option
@@ -24,6 +14,16 @@
           </el-option>
         </el-select>
       </div>
+      <div class="conditionTwo">
+        <span>时间：</span>
+        <el-date-picker
+          v-model="dataTime"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </div>
       <div class="conditionThree">
         <span>层高(高)：</span>
         <el-select v-model="height" placeholder="请选择">
@@ -303,7 +303,7 @@ export default {
       let data = this.startDateAndEndDate.find(w => w.value == this.cftId)
       this.getDataTime(this.cftId)
       this.changeHeight(data)
-      this.getWindShear()
+      // this.getWindShear()
     },
     getDataTime(cftId) {
       this.dataTime = [new Date(new Date().toLocaleDateString()).getTime() - 168 * 60 * 60 * 1000, new Date(new Date().toLocaleDateString()).getTime()]
@@ -330,6 +330,7 @@ export default {
           }
         }
         this.options = option
+        this.heightMin = str[str.length-1]
         this.optionsMin = option
       } else {
         this.height = "50"

neim-ui/src/views/windResources/windSpeedCurve/index.vue

@@ -3,18 +3,6 @@
     <el-card class="box-card">
       <div class="seachBox">
         <div class="conditionOne">
-          <span>时间：</span>
-          <el-date-picker
-            v-model="dataTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          >
-          </el-date-picker>
-          <!--            :picker-options="pickerOptions"-->
-        </div>
-        <div class="conditionTwo">
           <span>测风塔：</span>
           <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
             <el-option
@@ -26,6 +14,18 @@
               <span style="float: right; color: #8492a6; font-size: 13px">{{ item.date }}</span>
             </el-option>
           </el-select>
+          <!--            :picker-options="pickerOptions"-->
+        </div>
+        <div class="conditionTwo">
+          <span>时间：</span>
+          <el-date-picker
+            v-model="dataTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
+          </el-date-picker>
         </div>
         <div class="conditionTwo">
           <span>层高：</span>

neim-ui/src/views/windResources/wsFrequency/index.vue

@@ -2,16 +2,6 @@
   <el-card class="box-card">
     <div class="seachBox">
       <div class="conditionOne">
-        <span>时间：</span>
-        <el-date-picker
-          v-model="dataTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </div>
-      <div class="conditionTwo">
         <span>测风塔：</span>
         <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
           <el-option
@@ -24,6 +14,16 @@
           </el-option>
         </el-select>
       </div>
+      <div class="conditionTwo">
+        <span>时间：</span>
+        <el-date-picker
+          v-model="dataTime"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </div>
       <div class="conditionThree">
         <span>层高：</span>
         <el-select v-model="height" placeholder="请选择">