完善

src/api/check/checkstandard.js

@@ -50,8 +50,22 @@ export function importCheckStandard (parameter) {
     },
     data: parameter
   })
+}/**
+ * add func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function importCheckStandardNew (parameter) {
+  return axios({
+    url: '/check/standards/import/execute',
+    method: 'POST',
+    headers: {
+      'Content-Type': 'multipart/form-data;charset=UTF-8'
+    },
+    data: parameter
+  })
 }
-
 /**
  * add func
  * parameter: { }

src/utils/dict.js

@@ -244,6 +244,7 @@ DictCache.TYPE = {
    * 标识
    */
   FILL_INFO_CODE_VALUE: 'FILL_INFO_CODE_VALUE',
+  LOGO: 'LOGO', // 登录页logo
 
   /**
    * 供应商
@@ -849,7 +850,7 @@ DictCache.VALUE = {
   CHECK_USER_TYPE: {
     USE_USER: 1, // 使用人
     REPAIR_USER: 2, // 维修人
-    ZHIDING: 3,// 维修人
+    ZHIDING: 3, // 维修人
     FACTORY: 4 //
   },
   /**

src/views/Login.vue

@@ -2,9 +2,9 @@
   <div>
     <div class="fh-login">
       <div class="fh-login-left">
-        <h2 style='padding-bottom: 0px'>CNTHB</h2>
-        <h2 style='padding-bottom: 0px'>HITACHI ABB</h2>
-        <h2 style='font-size:30px'>设备管理系统</h2>
+        <h2 style="padding-bottom: 0px">CNTHB</h2>
+        <h2 style="padding-bottom: 0px">HITACHI ABB</h2>
+        <h2 style="font-size:30px">设备管理系统</h2>
       </div>
       <div class="fh-login-right">
         <div class="login-title">欢迎使用</div>
@@ -120,6 +120,8 @@ export default {
       })
     })
     this.getCaptchaImage()
+    // this.logo = this.DictCache.getValueByLabelMapByType(this.DictCache.TYPE.LOGO)
+    // console.log(this.logo )
   },
   methods: {
     ...mapActions(['Login', 'Logout']),

src/views/check/checkstandard/CheckStandard.vue

@@ -86,18 +86,18 @@
           icon="plus"
           @click="$refs.baseModal.base()">新增
         </a-button>
-        <a-button style="margin-left:8px;" type="primary" @click="doImport">
+        <!-- <a-button style="margin-left:8px;" type="primary" @click="doImport">
           <a-icon type="upload"/>
           新增导入
-        </a-button>
-        <!--        <a-button style="margin-left:8px;" type="primary" @click="doImportOldVersion">
+        </a-button> -->
+        <a-button style="margin-left:8px;" type="primary" @click="doImportOldVersion">
           <a-icon type="upload"/>
-          老版本导入
-        </a-button>-->
-        <a-button style="margin-left:8px;" type="primary" @click="doImportByUpdate">
+          导入
+        </a-button>
+        <!-- <a-button style="margin-left:8px;" type="primary" @click="doImportByUpdate">
           <a-icon type="upload"/>
           修改导入
-        </a-button>
+        </a-button> -->
         <a-button
           style="margin-left: 8px"
           v-if="($auth('check-spot-standards-export')||$auth('check-polling-standards-export'))"

src/views/check/checkstandard/modules/ImportFormAdd.vue

@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { importCheckStandard, importCheckStandardOldVersion, importCheckStandardByUpdate } from '@/api/check/checkstandard'
+import { importCheckStandard, importCheckStandardOldVersion, importCheckStandardByUpdate, importCheckStandardNew } from '@/api/check/checkstandard'
 
 export default {
   name: 'SbModelBomImportForm',
@@ -145,7 +145,7 @@ export default {
               this.confirmLoading = false
             })
         } else if (this.type === 1) {
-          importCheckStandardOldVersion(formData)
+          importCheckStandardNew(formData)
             .then((res) => {
               // 循环添加到formData中
               const resultArr = res.data.split(';')

src/views/dashboard/CheckJobReport.vue

@@ -54,7 +54,10 @@
                 </a-select>
               </a-col>
               <a-col :md="2" :sm="24">
-                <a-button style="margin-left: 8px" type="default" @click="getData()">查询</a-button>
+                <a-button style="margin-left: 8px" type="default" @click="reset()">重置</a-button>
+              </a-col>
+              <a-col :md="2" :sm="24">
+                <a-button style="margin-left: 8px" type="primary" @click="getData()">查询</a-button>
               </a-col>
               <a-col :md="2" :sm="24">
                 <a-button style="margin-left: 8px" type="primary" @click="handlePrint()">打印</a-button>
@@ -287,6 +290,15 @@ export default {
     },
     handleOk () {
       this.visible = true
+    },
+    reset () {
+      this.queryParam = {
+        startMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR) + '-01-01',
+        endMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR) + '-12-01',
+        standardLevel: 2,
+        sbLevel: 1
+      }
+      this.getData()
     }
   }
 }