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

src/views/modules/events/item-timeout-list.vue

@@ -36,7 +36,7 @@
             ></el-input>
           </el-form-item>
            <br>
-          <el-form-item label="项目状态:" label-width="105px">
+          <el-form-item label="项目状态" label-width="105px">
             <el-select v-model="dataForm.itemState" clearable  placeholder="请选择现在项目状态" style="width:250px;">
               <el-option label="处理中" value="0"></el-option>
               <el-option label="已关闭" value="5"></el-option>

src/views/modules/kpi/kpimattersresponse.vue

@@ -1,9 +1,9 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpimattersresponse}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
-          <el-form-item label="部门">
+          <el-form-item label="部门" label-width="80px">
             <el-cascader
               v-model="deptIdList"
               :options="options"
@@ -13,27 +13,27 @@
             ></el-cascader>
           </el-form-item>
         </el-form-item>
-        <el-form-item label="考核周期起始月">
+        <el-form-item label="考核周期起始月" label-width="120px">
           <el-date-picker v-model="dataForm.monthYear"
               type="month" clearable placeholder="选择月"
               value-format="yyyy-MM"  format="yyyy-MM">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="部门类型" prop="deptTypeKey">
+        <el-form-item label="部门类型" prop="deptTypeKey" label-width="90px">
           <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 label="扣分类别" prop="deductionCategory">
+        <el-form-item label="扣分类别" prop="deductionCategory" label-width="80px">
             <el-select v-model="dataForm.deductionCategory" placeholder="扣分类别" clearable>
               <el-option v-for="item in deductionCategoryArr" :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 type="primary" @click="getDataListSearch()">{{ $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 v-if="$hasPermission('kpi:kpimattersresponse:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -45,13 +45,13 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="monthYear" label="年月" header-align="center" align="center"></el-table-column>
         <el-table-column prop="deptTypeKey" label="部门类型" header-align="center" align="center" :formatter = "deptTypeKeyFormat"></el-table-column>
         <el-table-column prop="deductionCategory" label="扣分类别" header-align="center" align="center" :formatter = "stateFormat"></el-table-column>
         <el-table-column prop="deduction" label="扣分分值" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptNames" label="上级部门" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="所有部门" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="上级部门" header-align="center" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="allDeptNames" label="所有部门" header-align="center" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -119,10 +119,6 @@ export default {
     this.getdeductionCategoryListInfo('deduction_category')
   },
   methods: {
-    getDataListNew () {
-      this.page = 1
-      this.getDataList()
-    },
     stateFormat (row, column) {
       for (var i = 0; i < this.deductionCategoryArr.length; i++) {
         if (row.deductionCategory === this.deductionCategoryArr[i].dictValue) {

src/views/modules/oss/oss.vue

@@ -20,7 +20,12 @@
         @sort-change="dataListSortChangeHandle"
         style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="url" :label="$t('oss.url')" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号"
+                                 type="index"
+                                 align="center"
+                                 show-overflow-tooltip
+                                 width="50"></el-table-column>
+        <el-table-column prop="url" :label="$t('oss.url')" header-align="center" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="createDate" :label="$t('oss.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">