1.修改三期优化点

jero-web/src/components/search/index.vue

@@ -67,6 +67,24 @@
                                :type="'select'"
                                :triggerChange="false" :dictCode="item.dict_field"/>
           </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '12'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-select :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                      class="box-input"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      allowClear
+                      v-model="queryParam[item.db_field_name]">
+              <a-select-option v-for="(item, key) in item.option"
+                               :key="key"
+                               :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+              </a-select-option>
+            </a-select>
+          </div>
         </template>
 
         <template v-if="index >= 3 && toggleSearchStatus">
@@ -133,6 +151,24 @@
                                :type="'select'"
                                :triggerChange="false" :dictCode="item.dict_field"/>
           </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '12'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-select :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                      class="box-input"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      allowClear
+                      v-model="queryParam[item.db_field_name]">
+              <a-select-option v-for="(item, key) in item.option"
+                               :key="key"
+                               :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+              </a-select-option>
+            </a-select>
+          </div>
         </template>
 
       </a-col>
@@ -190,11 +226,12 @@
     methods: {
       searchQuery() {
         if (this.isDefault) {
+          if (!this.queryParam['WarnTimeText']) {
+            this.queryParam['WarnTimeText'] = '2'
+          }
           let startTime = moment(new Date()).format('YYYY-MM-DD')
           let endTime = this.getNowdate()
-          if (this.queryParam['WarnTime'].length == 0) {
-            this.queryParam['WarnTime'] = [startTime, endTime]
-          }
+          this.queryParam['WarnTime'] = [startTime, endTime]
           this.queryParam = { ...this.queryParam }
         }
         eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
@@ -203,8 +240,8 @@
         this.queryParam = {}
         if (this.isDefault) {
           let startTime = moment(new Date()).format('YYYY-MM-DD')
+          this.queryParam['WarnTimeText'] = '2'
           let endTime = this.getNowdate()
-          console.log(endTime)
           this.queryParam['WarnTime'] = [startTime, endTime]
           this.queryParam = { ...this.queryParam }
         }
@@ -218,7 +255,17 @@
           if (res.success) {
             this.searchList = res.result
             if (this.searchQueryList && this.searchQueryList.length > 0) {
-              this.searchList = this.searchList.concat(this.searchQueryList)
+              for (let i = 0; i < this.searchList.length; i++) {
+                if (this.searchList[i].db_field_name == 'issue_time') {
+                  this.searchList.splice(i, 1)
+                  i--
+                }
+                if (this.searchList[i].db_field_name == 'title') {
+                  let data = this.searchList[i + 1]
+                  this.searchList[i + 1] = this.searchQueryList[0]
+                  this.searchList.push(data)
+                }
+              }
               if (this.isDefault) {
                 this.searchReset()
               }
@@ -226,26 +273,41 @@
           }
         })
       },
-      getNowdate(){
+      getNowdate() {
+        let monthData
+        let yearData
+        if (this.queryParam['WarnTimeText'] == '1') {
+          monthData = 4
+          yearData = 1
+        } else if (this.queryParam['WarnTimeText'] == '2') {
+          monthData = 7
+          yearData = 1
+        } else if (this.queryParam['WarnTimeText'] == '3') {
+          monthData = 13
+          yearData = 1
+        } else if (this.queryParam['WarnTimeText'] == '4') {
+          monthData = 25
+          yearData = 2
+        }
         var date_now = new Date()//获取当前时间
         var year = date_now.getFullYear()//获取当前时间的年份
         var month = date_now.getMonth()//获取当前时间的月份
         var day = date_now.getDate()//获取当前时间的日
-        var days = new Date(year,month,0)//将获取到的年月赋值给days
+        var days = new Date(year, month, 0)//将获取到的年月赋值给days
         days = days.getDate()//获取当前年月的日
         var year2 = year
-        var month2 =  parseInt(month+7)//获取当前月份的1一个月以后的月份
-        if(month2 > 12){
-          year2 = parseInt(year2) + 1
+        var month2 = parseInt(month + monthData)//获取当前月份的1一个月以后的月份
+        if (month2 > 12) {
+          year2 = parseInt(year2) + yearData
           month2 = parseInt(month2) % 12
         }//考虑到12月要是获取一个月以后，就是一月，年份需要加一 ，一年没有13月，所以%12，取得来年1月
         var day2 = day
-        var days2 = new Date(year2,month2,0)
+        var days2 = new Date(year2, month2, 0)
         days2 = days2.getDate()
-        if(day2>days2){
+        if (day2 > days2) {
           day2 = days2
         }//获取了当前年份的日和6个月以后的日，为的就是判断如果前一个月是有31号，后一个月没有，就将一个月以后的日期取到，赋值给day2
-        if(month2 < 10){
+        if (month2 < 10) {
           month2 = '0' + month2
         }
         var time = year2 + '-' + month2 + '-' + day2