Merge branch 'feature/style' of http://121.42.41.42:7070/r/esua-epdc-admin into feature/style

src/views/modules/analysis/user/register.vue

@@ -4,7 +4,7 @@
     <div class="mod-news__news}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构">
           <el-cascader v-model="deptIdList"
                        :options="options"
@@ -33,10 +33,10 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary"
+          <el-button type="success"
                      @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         <el-form-item>

src/views/modules/kpi/kpimassevaluation.vue

@@ -3,7 +3,7 @@
     <div class="mod-kpi__kpimassevaluation}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-form-item label="部门">
+          <el-form-item label="部门" label-width="68px">
             <el-cascader
               v-model="deptIdList"
               :options="options"
@@ -19,19 +19,20 @@
               value-format="yyyy"  format="yyyy">
           </el-date-picker>
         </el-form-item>
+        <br/>
         <el-form-item label="部门类型" prop="deptTypeKey">
           <el-select v-model="dataForm.deptTypeKey" placeholder="部门类型" clearable>
             <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListNew()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListNew()" type="primary">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportTemplate()">导出录入模板</el-button>
+          <el-button type="success" @click="exportTemplate()">导出录入模板</el-button>
         </el-form-item>
         <el-form-item>
           <el-upload class="upload-demo"