Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0

* 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui:
  优化

src/views/kpi/assessment/performance/components/table.vue

@@ -33,7 +33,7 @@
                    </pre>
                  </div>
                 <div v-if="tableInfo.result || auth.showResult">
-                    <el-input v-if="tableInfo.result" type="textarea"  style="width:120px;" size="mini"  placeholder="请输入内容" v-model="child.checkResult" clearable></el-input>
+                    <el-input v-if="tableInfo.result" type="textarea"   size="mini"  placeholder="请输入内容" v-model="child.checkResult" clearable></el-input>
                     <pre v-else>{{child.checkResult || '--'}}</pre>
                 </div>
                 <div class="quanzhomng" style="flex:none;">
@@ -50,7 +50,7 @@
                       </el-option>
                     </el-select>
                     <el-input v-if="tableInfo.score && obj.gradeGroupId===2"  style="width:120px;" size="mini"  placeholder="请输入评分值" v-model="child.superScore" clearable></el-input>
-                    <span v-if="!tableInfo.score">{{child.scoreDtos[child.scoreDtos.length-1].acquireScore || 0}}</span>
+                    <span v-if="!tableInfo.score">{{handleScore(child.scoreDtos[child.scoreDtos.length-1].acquireScore)}}</span>
                 </div>
                 <div style="padding:10px;" v-if="tableInfo.score || auth.showScore">
                     <el-input v-if="tableInfo.score" style="width:200px;" size="mini"  type="textarea" placeholder="请输入内容" v-model="child.scoreComment" clearable></el-input>
@@ -139,6 +139,10 @@ export default {
     this.handleGrt375()
   },
   methods: {
+    handleScore (item) {
+      console.log('this.scoreList: ', this.scoreList)
+      return this.scoreList.filter(i => i.score === item).length > 0 ? this.scoreList.filter(i => i.score === item)[0].name : 0
+    },
     async handleGetNext () {
       this.loadingTi = true
       let res1 = await apiSaveDetail(this.obj)
@@ -150,7 +154,7 @@ export default {
       const obj = {status: 1, menuName: this.tableInfo.result ? '提交了结果值' : '提交了评分'}
       const params = Object.assign({}, {resultRecordId: this.$route.query.id || ''}, obj)
       let res = await apiSaveapproval(params)
-      this.this.loadingTi = false
+      this.loadingTi = false
       if (res.code !== 200) {
         this.$message.error(res.msg)
         return
@@ -276,6 +280,7 @@ export default {
 }
 .table-left{
   width: 60px;
+  text-align: center;
 }
 .quanzhomng{
      width: 100px !important;

src/views/kpi/assessment/performance/index.vue

@@ -76,7 +76,7 @@
           :obj='obj'
         />
       </div>
-      <div v-if="formList.resultCommentList" class="performance-content-jilu">
+      <div v-if="formList.resultCommentList.length !== 0" class="performance-content-jilu">
         <div class="performance-content-jilu-title commonFont">
           记录
         </div>

src/views/kpi/report/home/index.vue

@@ -37,6 +37,7 @@
                 <div>{{ assessItem.num }}人</div>
               </div>
             </li>
+            <li class="zanwu commonFont" v-if="assessNum.length === 0">暂无数据</li>
           </ul>
         </div>
       </div>
@@ -219,7 +220,7 @@ export default {
   },
   methods: {
     handleJump (item) {
-      this.$router.push({name: 'assessment-stepList', query: {id: 10, step: item.flowProcess}})
+      this.$router.push({name: 'assessment-stepList', query: {id: this.startId, step: item.flowProcess}})
     },
     // 背景色计算
     handleliColor (val) {
@@ -348,7 +349,7 @@ export default {
 }
 </script>
 
-<style lang='' scoped>
+<style lang='less' scoped>
 .report_index{
    display: flex;
    flex-direction: column;
@@ -425,7 +426,12 @@ export default {
 .num_report_list{
   margin-top: 20px;
   height: 360px;
-  overflow:auto
+  overflow:auto;
+  .zanwu{
+    .center();
+    height: 200px;
+    width: 100%;
+  }
 }
 .rep_list{
   width: 200px;