Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
-#VUE_APP_BASE_API = 'http://47.92.229.224:8080'
+VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 #罗俊
 #VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
@@ -20,7 +20,7 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://10.87.23.62:8080'
 # VUE_APP_BASE_API = 'http://localhost:8080'
 # 开发环境
-VUE_APP_BASE_API = 'http://10.87.21.103:8080'
+# VUE_APP_BASE_API = 'http://10.87.21.103:8080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

src/assets/styles/ruoyi.scss

@@ -81,6 +81,7 @@
 }
 
 .el-table {
+	
 	.el-table__header-wrapper, .el-table__fixed-header-wrapper {
 		th {
 			word-break: break-word;

src/views/evaluationRule/index.vue

@@ -112,7 +112,7 @@
       <el-table
         v-loading="loading"
         :data="dataList"
-        align="center"
+        
         border
         height="644"
         size="small"
@@ -121,24 +121,25 @@
         <el-table-column
           label="序号"
           type="index"
+          align="center"
           width="100"
         ></el-table-column>
-        <el-table-column label="机构类型" prop="orgTypeText"/>
-        <el-table-column label="指标分类" prop="typeCodeText"/>
-        <el-table-column label="指标项目" prop="projectCodeText"/>
-        <el-table-column label="指标要点" prop="pointCodeText"/>
-        <el-table-column
+        <el-table-column  align="center" label="机构类型" prop="orgTypeText"/>
+        <el-table-column  align="center" label="指标分类" prop="typeCodeText"/>
+        <el-table-column  align="center" label="指标项目" prop="projectCodeText"/>
+        <el-table-column  align="center" label="指标要点" prop="pointCodeText"/>
+        <el-table-column  align="center"
           :formatter="formatterScore"
           label="扣分方式"
           prop="evaluateCycle"
         />
-        <el-table-column label="分值" prop="score"/>
+        <el-table-column label="分值" align="center" prop="score"/>
 
         <el-table-column
           class-name="small-padding fixed-width"
           fixed="right"
           label="操作"
-
+          align="center"
           width="180"
         >
           <template slot-scope="{ row }">

src/views/resumptionEvaluate/evaluate/index.vue

@@ -136,22 +136,23 @@
             @selection-change="handleSelectionChange"
           >
             <el-table-column
+            align="center"
               label="序号"
               type="index"
-              width="60"
+              width="100"
             ></el-table-column>
-            <el-table-column label="创建机构" prop="orgName" />
-            <el-table-column
+            <el-table-column align="center"  label="创建机构" prop="orgName" />
+            <el-table-column align="center"
               label="外包评价名称"
               prop="evaluateName"
               width="300"
             />
-            <el-table-column label="评价机构类型" prop="orgType" />
-            <el-table-column label="评价角色" prop="roleName" />
-            <el-table-column label="评价周期" prop="evaluateCycle" />
-            <el-table-column label="创建人" prop="createBy" />
-            <el-table-column label="创建时间" prop="createTime" width="180" />
-            <el-table-column label="状态" width="150">
+            <el-table-column align="center" label="评价机构类型" prop="orgType" />
+            <el-table-column align="center" label="评价角色" prop="roleName" />
+            <el-table-column align="center" label="评价周期" prop="evaluateCycle" />
+            <el-table-column align="center" label="创建人" prop="createBy" width="180" />
+            <el-table-column align="center" label="创建时间" prop="createTime" width="180" />
+            <el-table-column align="center" label="状态" width="150">
               <template slot-scope="{ row }">
                 <el-switch
                   v-model="row.status"
@@ -169,6 +170,7 @@
             <el-table-column
               label="操作"
               width="260"
+              align="center"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="{ row }">

src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -112,18 +112,19 @@
             @selection-change="handleSelectionChange"
           >
             <el-table-column
+            align="center"
               label="序号"
               type="index"
               width="100"
             ></el-table-column>
-            <el-table-column label="评价机构" prop="orgName" />
-            <el-table-column label="评价角色" prop="roleName" />
-            <el-table-column label="外包评价名称" prop="evaluateName" />
-            <el-table-column label="计划开始时间" prop="startTime" />
-            <el-table-column label="计划结束时间" prop="endTime" />
-            <el-table-column label="评价人" prop="evaluateBy" />
-            <el-table-column label="评价时间" prop="completeTime" />
-            <el-table-column
+            <el-table-column align="center" label="评价机构" prop="orgName" />
+            <el-table-column align="center" label="评价角色" prop="roleName" />
+            <el-table-column align="center" label="外包评价名称" prop="evaluateName" />
+            <el-table-column align="center" label="计划开始时间" prop="startTime" />
+            <el-table-column align="center" label="计划结束时间" prop="endTime" />
+            <el-table-column align="center" label="评价人" prop="evaluateBy" />
+            <el-table-column align="center" label="评价时间" prop="completeTime" />
+            <el-table-column align="center"
               label="状态"
               prop="status"
               :formatter="statusChange"
@@ -132,6 +133,7 @@
             <el-table-column
               label="操作"
               width="180"
+              align="center"
               fixed="right"
               class-name="small-padding fixed-width"
             >

src/views/scorestatistics/index.vue

@@ -69,7 +69,7 @@
           size="small"
           v-loading="loading"
           :data="dataList"
-          align="center"
+          
           border
           height="644"
           @selection-change="handleSelectionChange"
@@ -77,11 +77,12 @@
           <el-table-column
             label="序号"
             type="index"
+            align="center"
             width="100"
           ></el-table-column>
-          <el-table-column :formatter="formatterScore" label="年月"/>
-          <el-table-column label="机构名称" prop="orgName"></el-table-column>
-          <el-table-column label=">90 低" prop="level_gt90">
+          <el-table-column align="center" :formatter="formatterScore" label="年月"/>
+          <el-table-column align="center" label="机构名称" prop="orgName"></el-table-column>
+          <el-table-column align="center" label=">90 低" prop="level_gt90">
             <template slot-scope="{ row }">
               <div>
                 <span class="text" @click="clickHandlerRow(row, 1)">{{
@@ -91,7 +92,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="80-90 中" prop="level_80_90">
+          <el-table-column  align="center" label="80-90 中" prop="level_80_90">
             <template slot-scope="{ row }">
               <div>
                 <span class="text" @click="clickHandlerRow(row, 2)">{{
@@ -100,7 +101,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="70-80 高" prop="level_70_80">
+          <el-table-column align="center" label="70-80 高" prop="level_70_80">
             <template slot-scope="{ row }">
               <div>
                 <span class="text" @click="clickHandlerRow(row, 3)">{{
@@ -110,7 +111,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="70及以下 极高" prop="level_lt70">
+          <el-table-column align="center" label="70及以下 极高" prop="level_lt70">
             <template slot-scope="{ row }">
               <div>
                 <span class="text" @click="clickHandlerRow(row, 4)">{{
@@ -125,6 +126,7 @@
             fixed="right"
             label="操作"
             width="180"
+            align="center"
           >
             <template slot-scope="{ row }">
               <el-button