Merge remote-tracking branch 'origin/develop' into develop

src/pages/localTool/standardWarning.vue

@@ -14,7 +14,7 @@
             <div class="more">
               <el-form :inline="true" :model="dynamic" class="demo-form-inline">
                 <el-row :gutter="24">
-                  <el-col span="24">
+                  <el-col>
                     <el-form-item label="标准编号">
                       <el-input clearable size="mini"
                                 v-model="dynamic.standCode"
@@ -57,7 +57,7 @@
                   </el-col>
                 </el-row>
                 <el-row :gutter="24">
-                  <el-col span="24">
+                  <el-col>
                     <el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
                       <el-date-picker
                           size="mini"
@@ -579,7 +579,7 @@ export default {
     },
     //查找适用车型
     searchBtnClick() {
-      this.$http.get('sys/EarlyWarning/StandWarning', {
+      this.$http.get('StandWarning/getStandWarning', {
         ...this.pageConfig,
         //标准编号
         standCode: this.dynamic.standCode,
@@ -771,10 +771,10 @@ export default {
       this.warningTableHeight = $(window).height()*0.54;
     };
     // alert(this.warningTableHeight)
-    this.height = $(".content").height();
-    window.onresize = () => {
-      this.height = $(".content").height();
-    };
+    // this.height = $(".content").height();
+    // window.onresize = () => {
+    //   this.height = $(".content").height();
+    // };
     //从数据库中查询下拉框数据
     this.$http.get("sys/dictype/getDicTypeListCode", {}, {
       _this: this
@@ -820,7 +820,6 @@ export default {
           })
           let arr = result.newItems.records
           arr.forEach(item => {
-            console.log(item.applyType)
             // 适用车型转换
             if (item.applyType !== null) {
               let k = (item.applyType || "").split(",");