fix:风险进度查询改进与整体进度调整

src/views/system/jbdHome/board/component/tableCom.vue

@@ -11,11 +11,11 @@
                 :key="item.prop"
                 :prop="item.prop"
                 :label="item.label"
-                width="150"
+                :width="item.width?item.width:100"
             />
             <el-table-column v-if="controlSchedule" key="schedule" prop="schedule" label="进度">
                 <template slot-scope="scope">
-                    <el-progress :percentage="scope.row.percentage" :color="customColorMethod(percentage)" />
+                    <el-progress :percentage="scope.row.percentage" :color="customColorMethod(scope.row.percentage)" />
                 </template>
             </el-table-column>
 
@@ -95,12 +95,14 @@ export default {
             this.tableData = this.tableList
         },
         customColorMethod (percentage) {
-            if (percentage < 30) {
-                return '#909399'
-            } else if (percentage < 70) {
-                return '#e6a23c'
-            } else {
-                return '#67c23a'
+            if (percentage == 25) {
+                return '#555555'
+            } else if (percentage == 50) {
+                return '#9999CC'
+            } else if (percentage == 75) {
+                return '#6666FF'
+            } else if (percentage == 100) {
+                return '#99FF66'
             }
         },
         handleSizeChange (val) {

src/views/system/jbdScan/goods/fengxiangkongzhi.vue

@@ -89,13 +89,13 @@
                         </el-tab-pane>
                     </el-tabs>
                 </template>
-                <div>
+                <div v-if="obj[0].zhuang_tai_ ==='已识别'">
                     <div class="tableTitle">风险识别评估</div>
-                    <tableCom :table-prop="RiskIdenProp" :table-list="RiskIdenList" :page-show="true" :page-total="rickLength" @handleSizeChange="riskIdenHandleSizeChange" @handleCurrentChange="riskIdenhandleCurrentChange" />
+                    <tableCom :table-prop="RiskIdenProp" :table-list="RiskIdenList" :page-show="true" :page-total="pageTotal" @handleSizeChange="handleSizeChange" @handleCurrentChange="handleCurrentChange" />
                 </div>
-                <div>
+                <div v-if="obj[0].zhuang_tai_ ==='改进中'">
                     <div class="tableTitle">部门风险改进记录</div>
-                    <tableCom :table-prop="ImproRecordsProp" :table-list="ImproRecordsList " :control-schedule="true" />
+                    <tableCom :table-prop="ImproRecordsProp" :table-list="ImproRecordsList " :control-schedule="true" :page-show="true" :page-total="pageTotal" @handleSizeChange="handleSizeChange" @handleCurrentChange="handleCurrentChange" />
                 </div>
 
             </div>
@@ -165,7 +165,7 @@ export default {
             tableList: [],
             RiskIdenList: [],
             RiskIdenProp: [],
-            rickLength: 0,
+            pageTotal: 0,
             ImproRecordsList: [],
             ImproRecordsProp: [],
             RiskLevelList: [], // 风险等级
@@ -392,8 +392,8 @@ export default {
             await curdPost('sql', riskCountSql).then((res) => {
                 riskCount = res.variables.data
             })
-            this.rickLength = riskCount[0].count
-            const sql = `select bian_zhi_bu_men_,bian_zhi_shi_jian,bian_zhi_ren_,shi_fou_guo_shen_ from t_fxsbpgb where zong_id_ = '1214889836008177664' order by shi_fou_guo_shen_ desc LIMIT ${(this.page - 1) * this.pagesize},${this.pagesize}`
+            this.pageTotal = riskCount[0].count
+            const sql = `select bian_zhi_bu_men_,bian_zhi_shi_jian,bian_zhi_ren_,shi_fou_guo_shen_ from t_fxsbpgb where zong_id_ = '1214889836008177664' order by shi_fou_guo_shen_ desc limit ${(this.page - 1) * this.pagesize},${this.pagesize}`
             await curdPost('sql', sql).then((res) => {
                 this_.RiskIdenList = res.variables.data
             })
@@ -413,35 +413,69 @@ export default {
         // 风险改进记录
         async getImprovementRecords () {
             const this_ = this
-            const sql = `select * from t_bmfxgjjl where zong_id_ = '${this.zongid}' `
-            await curdPost('sql', sql).then((res) => {
-                this_.ImproRecordsList = res.variables.data
+            // const sql = `select * from t_bmfxgjjl where zong_id_ = '${this.zongid}' `
+            const sql1 = `select * from t_bmfxgjjl limit ${(this.page - 1) * this.pagesize},${this.pagesize}`
+            const sql2 = `select count(*) as count from t_bmfxgjjl`
+            await Promise.all([this.$common.request('sql', sql1), this.$common.request('sql', sql2)]).then((res) => {
+                this_.ImproRecordsList = res[0].variables.data
+                this_.pageTotal = res[1].variables.data[0].count
             })
             for (const item of this_.ImproRecordsList) {
-                item.bian_zhi_ren_ = this.findUser(item.bian_zhi_ren_)
-                item.bian_zhi_bu_men_ = this.findDept(item.bian_zhi_bu_men_)
-                item.bian_zhi_shi_jian = item.bian_zhi_shi_jian || '/'
+                item.bian_zhi_ren_ = item.bian_zhi_ren_ ? this.findUser(item.bian_zhi_ren_) : '/'
+                item.ping_gu_ren_ = item.ping_gu_ren_ ? this.findUser(item.ping_gu_ren_) : '/'
+                item.bian_zhi_bu_men_ = item.bian_zhi_bu_men_ ? this.findDept(item.bian_zhi_bu_men_) : '/'
+                item.bian_zhi_shi_jian = item.bian_zhi_shi_jian.split(' ')[0] || '/'
                 item.shi_fou_guo_shen_ = item.shi_fou_guo_shen_ || '未编制'
+                item.yao_su_tiao_kuan_ = item.yao_su_tiao_kuan_ || '/'
+                item.gai_jin_bian_hao_ = item.gai_jin_bian_hao_ || '/'
+                item.zheng_gai_qi_xian = item.zheng_gai_qi_xian || '/'
+                item.wan_cheng_shi_jia = item.wan_cheng_shi_jia || '/'
+                item.yan_zhong_cheng_d = item.yan_zhong_cheng_d || '/'
+                item.percentage = this.getImpRecordsSchedule(item.shi_fou_guo_shen_)
             }
             this.ImproRecordsProp = [
                 { prop: 'bian_zhi_bu_men_', label: '编制部门' },
                 { prop: 'bian_zhi_shi_jian', label: '编制时间' },
                 { prop: 'bian_zhi_ren_', label: '编制人' },
+                { prop: 'ping_gu_ren_', label: '评估人' },
                 { prop: 'shi_fou_guo_shen_', label: '状态' },
-                { prop: 'yao_su_tiao_kuan_', label: '要素条款' },
+                { prop: 'yao_su_tiao_kuan_', label: '要素条款', width: 120 },
+                { prop: 'gai_jin_bian_hao_', label: '改进编号', width: 120 },
+                { prop: 'zheng_gai_qi_xian', label: '整改期限' },
+                { prop: 'wan_cheng_shi_jia', label: '完成日期' },
                 { prop: 'yan_zhong_cheng_d', label: '严重程度' }
-
             ]
             // this.tableList = []
         },
-        riskIdenHandleSizeChange (val) {
+        getImpRecordsSchedule (value) {
+            if (value === '已改进') {
+                return 25
+            } else if (value === '已评估') {
+                return 50
+            } else if (value === '已审核') {
+                return 75
+            } else if (value === '已完成') {
+                return 100
+            } else {
+                return 0
+            }
+        },
+        handleSizeChange (val) {
             this.page = 1
             this.pagesize = val
-            this.getRiskIdentification()
+            this.turnPage()
         },
-        riskIdenhandleCurrentChange (val) {
+        handleCurrentChange (val) {
             this.page = val
-            this.getRiskIdentification()
+            this.turnPage()
+        },
+        turnPage () {
+            const zhuang_tai_ = this.obj[0].zhuang_tai_
+            if (zhuang_tai_ === '识别中') {
+                this.getRiskIdentification()
+            } else if (zhuang_tai_ === '改进中') {
+                this.getImprovementRecords()
+            }
         }
     }
 }