From c7289ded9e2c100ab27e40ebdb5d78c51abcf359 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 24 Nov 2021 10:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E8=83=BD=E5=9C=A81366=E4=B8=8B?=
 =?UTF-8?q?=E7=9C=8B=E7=9D=80=E8=BF=98=E4=B8=8D=E9=94=99=E7=9A=84=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standWarning.vue    | 118 ------------------------
 src/pages/localTool/standardWarning.vue |  52 +++++++----
 2 files changed, 33 insertions(+), 137 deletions(-)
 delete mode 100644 src/pages/localTool/standWarning.vue

diff --git a/src/pages/localTool/standWarning.vue b/src/pages/localTool/standWarning.vue
deleted file mode 100644
index 2b6d6b055..000000000
--- a/src/pages/localTool/standWarning.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-  <div class="stand-warning">
-    <div class="header-area" style="background-color: white">
-      <h3>实施预警</h3>
-    </div>
-    <div class="search-area">
-      <el-form :inline="true" :model="searchForm" class="demo-form-inline">
-        <el-form-item label="标准编号">
-          <el-input clearable size="mini"
-                    v-model="searchForm.standCode"
-                    placeholder="根据标准编号查找">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="标准名称">
-          <el-input clearable size="mini"
-                    v-model="searchForm.standName"
-                    placeholder="根据标准名称查找">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="适用车型">
-          <el-input clearable size="mini"
-                    v-model="searchForm.applyType"
-                    placeholder="根据适用车型查找">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="发布日期" style="margin-right: 10px" class="choose-time-area">
-          <el-date-picker
-              size="mini"
-              clearable
-              v-model="searchForm.putTime"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
-          <el-date-picker
-              size="mini"
-              clearable
-              v-model="searchForm.putTime"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="新车型实施日期" style="margin-right: 10px" class="choose-time-area">
-          <el-date-picker
-              size="mini"
-              clearable
-              v-model="searchForm.putTime"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item><el-form-item label="在产车实施日期" style="margin-right: 10px" class="choose-time-area">
-        <el-date-picker
-            size="mini"
-            clearable
-            v-model="searchForm.putTime"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
-
-        <el-button
-            type="primary"
-            size="mini"
-            @click="searchBtnClick"
-            class="common-button-primary">
-          查询
-        </el-button>
-        <el-button
-            size="mini"
-            @click="clearBtnClick"
-            class="common-button-primary">
-          清空
-        </el-button>
-      </el-form>
-    </div>
-    <div class="data-area">
-
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "standardWarning",
-  data() {
-    return {
-      // 头部搜索框
-      searchForm: {
-        //标准编号
-        standCode: "",
-        //标准名称
-        standName: "",
-        //实施日期
-        putTime: "",
-        //适用车型
-        applyType: "",
-      },
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 5baf5253a..563d59441 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -8,9 +8,9 @@
           <!--          <el-tabs v-model="activeName" @tab-click="handleClick">-->
           <!--            <el-tab-pane label="标准预警" name="STANDARD">-->
           <div class="dynamic-content">
-            <div>
-              <h5 style="font-size: 20px">实施预警</h5>
-            </div>
+<!--            <div>-->
+<!--              <h5 style="font-size: 20px">实施预警</h5>-->
+<!--            </div>-->
             <div class="more">
               <el-form :inline="true" :model="dynamic" class="demo-form-inline">
                 <el-row :gutter="24">
@@ -27,12 +27,21 @@
                                 placeholder="根据标准名称查找">
                       </el-input>
                     </el-form-item>
-                    <el-form-item label="适用车型">
-                      <el-input clearable size="mini"
-                                v-model="dynamic.applyType"
-                                placeholder="根据适用车型查找">
-                      </el-input>
+                    <!--            适用车型-->
+                    <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
+                      <el-select v-model="dynamic.applyType" size="mini"
+                                 :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable>
+                        <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"
+                                   :key="opt.value" :label="opt.label">{{ opt.label }}
+                        </el-option>
+                      </el-select>
                     </el-form-item>
+<!--                    <el-form-item label="适用车型">-->
+<!--                      <el-input clearable size="mini"-->
+<!--                                v-model="dynamic.applyType"-->
+<!--                                placeholder="根据适用车型查找">-->
+<!--                      </el-input>-->
+<!--                    </el-form-item>-->
                     <el-form-item label="发布日期" style="margin-right: 10px" class="choose-time-area">
                       <el-date-picker
                           size="mini"
@@ -104,11 +113,11 @@
                 </el-row>
               </el-form>
             </div>
-            <div class="content" style="height: 100%; padding-top: 100px; ">
-              <el-divider content-position="left" class="dynamic-child-title">实施日期预警</el-divider>
+            <div class="content" style="height: 100%">
+<!--              <el-divider content-position="left" class="dynamic-child-title">实施日期预警</el-divider>-->
               <el-table
                   :data="newItems"
-                  height="260px"
+                  height="335px"
                   border
                   :resizable="false"
                   :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
@@ -360,6 +369,7 @@ export default {
   name: "standardWarning",
   data() {
     return {
+      applyArcticOptions: [], // 适用车型下拉框
       isShowBtn: true,
       activeName: "STANDARD",   //tab 默认选中值
       // 头部搜索框
@@ -754,15 +764,16 @@ export default {
   },
   watch: {},
   mounted() {
-    // this.height = $(".content").height() * 0.4;
-    // window.onresize = () => {
-    //   this.height = $(".content").height() * 0.4;
-    // };
+    this.height = $(".content").height() * 1.8;
+    window.onresize = () => {
+      this.height = $(".content").height() * 1.8;
+    };
     //从数据库中查询下拉框数据
     this.$http.get("sys/dictype/getDicTypeListCode", {}, {
       _this: this
     }, res => {
       this.energyKindOptions = res.data.ENERGYTYPES; // 文本状态
+      this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
       this.zrgcs = res.data.ZRGCSCLASS;
       this.loading[this.field] = true
       this.$http.get('sys/EarlyWarning/StandWarning', {
@@ -1015,8 +1026,11 @@ export default {
         }
 
         .more {
-          margin-top: 30px;
+          display: flex;
 
+          align-items: center;
+
+          justify-content: center;
           /deep/ .el-input__inner {
             width: 185px;
           }
@@ -1027,13 +1041,13 @@ export default {
             }
           }
 
-          cursor: pointer;
+          //cursor: pointer;
           color: #12508e;
-          position: absolute;
+          //position: absolute;
           top: 0;
           right: 0;
           z-index: 100;
-          padding: 5px 10px;
+          //padding: 5px 10px;
           // &:hover {
           //   color: #fff;
           //   background: #12508e;