Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

.env.development

@@ -14,8 +14,8 @@ ENV = 'development'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超
-VUE_APP_BASE_API = 'http://10.87.11.173:8080'
-# VUE_APP_BASE_API = 'http://localhost:8080'
+# VUE_APP_BASE_API = 'http://10.87.11.173:8080'
+VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
 # VUE_APP_BASE_API = 'http://10.87.10.55:8080'
 

src/views/core/send/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <div class="main-right-box">
+          <div class="main-search-box">
+
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="标题" prop="title">
         <el-input maxlength="50" v-model="queryParams.title" placeholder="请输入标题" clearable
           @keyup.enter.native="handleQuery" />
@@ -31,8 +34,11 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
-    <el-table v-loading="loading" :data="sendList">
+          </div>
+          <el-table border
+                    height="650"
+                    size="small"
+                    v-loading="loading" :data="sendList">
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="类型" align="center" key="type" prop="type" width="80">
         <template slot-scope="scope">
@@ -67,6 +73,7 @@
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
+        </div>
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>

src/views/evaluateTable/index.vue

@@ -82,11 +82,17 @@
               <th colspan="1" rowspan="1" :key="item" v-for="item in obj">
                 {{ item }}
               </th>
+             
             </tr>
             <tr v-for="(item, index) in targetList" :key="index">
-              <td>{{ index }}</td>
+              <td>{{ index+1 }}</td>
               <td v-for="i in obj" :key="i">{{ item[i] }}</td>
             </tr>
+            <tr>
+
+              <th :colspan="obj.length" rowspan="1">平均得分</th>
+              <th :colspan="1" rowspan="1">{{average}}</th>
+            </tr>
           </table>
         </div>
       </el-col>
@@ -110,8 +116,10 @@ export default {
     const { params, query } = this.$route;
     return {
       targetList: [],
+      average:0,
       obj: {},
       loading: false,
+      average:'',//平均值
       selectedValues: [],
       planRoles: [],
       options: [],
@@ -188,7 +196,8 @@ export default {
       list(this.queryParams).then((res) => {
         let { code, data, msg } = res;
         if (code == 200) {
-          this.targetList = data || [];
+          this.targetList = data.list || [];
+          this.average=data.average||0
           if (this.targetList) {
             this.obj = Object.keys(this.targetList[0]);
           }

src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -232,6 +232,7 @@ export default {
     //判断是否能评价
     isEvaluateHandler(row) {
       let falg = false;
+      let statsFalg=false
       row.roleName?.split(",").forEach((item) => {
         this.roleList.forEach((i) => {
           if (i.roleName == item) {
@@ -239,7 +240,15 @@ export default {
           }
         });
       });
-      return falg;
+      if(row.status=='0'){
+        statsFalg=true
+      }
+      if(statsFalg&&falg){
+
+        return true;
+      }else{
+        return false
+      }
       // row
     },
     evaluateHandler(row) {