Procházet zdrojové kódy

fix:风险控制统计列表和统计图,内审柱状图修改

zhangjingyuan před 2 roky
rodič
revize
7e7c3afc9f

+ 16 - 31
src/views/system/jbdScan/goods/fengxiangkongzhi.vue

@@ -28,48 +28,44 @@
                 </div>
                 <template>
                     <el-tabs v-model="activeName" class="count" @tab-click="handleClick">
-                        <el-tab-pane label="风险等级统计表" name="first">
-                            <div v-show="riskLeveChange" style="width: 50%;height:320px">
+                        <el-tab-pane label="风险等级统计表" name="first" style="display: flex;">
+                            <div style="width: 50%;height:320px;display: inline-block">
                                 <tableCom :table-prop="RiskLevelProp" :table-list="riskLevelList" />
                             </div>
-                            <div v-show="!riskLeveChange" style="width: 45%; height:320px">
+                            <div style="width: 50%; height:320px;display: inline-block;">
                                 <div id="riskLevePieView" style="width: 500px; height: 300px; margin:0 auto" />
                                 <PieView ref="riskLevePieView" :info="riskLevePieView" />
                             </div>
-                            <div v-show="riskLevelList.length" class="change" @click="changeFn('first')">切换 <i class="el-icon-refresh" /></div>
                         </el-tab-pane>
                         <el-tab-pane label="涉及条款统计表" name="second">
-                            <div v-show="termChange" style="width: 50%;">
+                            <div style="width: 50%;display: inline-block">
                                 <tableCom :table-prop="termProp" :table-list="termList" />
                             </div>
-                            <div v-show="!termChange" style="width: 60%; height:320px;">
+                            <div style="width: 50%; height:320px;display: inline-block">
                                 <div id="termPieView" style="width: 850px; height: 300px; margin:0 auto" />
                                 <PieView ref="termPieView" :info="termPieView" />
                             </div>
-                            <div v-show="termList.length" class="change" @click="changeFn('second','termPieView')">切换 <i class="el-icon-refresh" /></div>
                         </el-tab-pane>
                         <el-tab-pane label="责任部门统计表" name="third">
-                            <div v-show="departChange" style="width: 50%;">
+                            <div style="width: 50%;display: inline-block">
                                 <tableCom :table-prop="departProp" :table-list="departList" />
                             </div>
-                            <div v-show="!departChange" style="width: 45%; height:350px">
+                            <div style="width: 45%; height:350px;display: inline-block">
                                 <div id="departPieView" style="width: 500px; height: 300px; margin:0 auto" />
                                 <PieView ref="departPieView" :info="departPieView" />
                             </div>
-                            <div v-show="departList.length" class="change" @click="changeFn('third','departPieView')">切换 <i class="el-icon-refresh" /></div>
                         </el-tab-pane>
                         <el-tab-pane label="风险应对措施统计表" name="fourth">
-                            <div v-show="riskReChange" style="width: 50%;">
+                            <div style="width: 50%;display: inline-block">
                                 <tableCom :table-prop="riskReProp" :table-list="riskReList" />
                             </div>
-                            <div v-show="!riskReChange" style="width: 45%; height:350px">
+                            <div style="width: 45%; height:350px;display: inline-block">
                                 <div id="riskRePieView" style="width: 500px; height: 300px; margin:0 auto" />
                                 <PieView ref="riskRePieView" :info="riskRePieView" />
                             </div>
-                            <div v-show="riskReList.length" class="change" @click="changeFn('fourth','riskRePieView')">切换 <i class="el-icon-refresh" /></div>
                         </el-tab-pane>
                         <el-tab-pane label="剩余风险等级统计表" name="fine">
-                            <div style="width: 100%; height:350px;display: flex;justify-content: space-around">
+                            <div style="width: 100%; height:350px;display: flex;justify-content: space-around; overflow-x: scroll;">
                                 <div id="remainingRiskCD" style="width: 400px; height: 300px; " />
                                 <PieView ref="remainingRiskCD" :info="remainingRiskCD" />
                                 <div id="remainingRiskDJ" style="width: 350px; height: 300px; " />
@@ -228,21 +224,6 @@ export default {
         this.$destroy()
     },
     methods: {
-        changeFn (type) {
-            if (type === 'first') {
-                this.riskLeveChange = !this.riskLeveChange
-                this.$refs.riskLevePieView.getMiddleLeft('riskLevePieView')
-            } else if (type === 'second') {
-                this.termChange = !this.termChange
-                this.$refs.termPieView.getMiddleLeft('termPieView')
-            } else if (type === 'third') {
-                this.departChange = !this.departChange
-                this.$refs.departPieView.getMiddleLeft('departPieView')
-            } else if (type === 'fourth') {
-                this.riskReChange = !this.riskReChange
-                this.$refs.riskRePieView.getMiddleLeft('riskRePieView')
-            }
-        },
         findDept (depId) {
             const dept = this.deptList.find(i => i.positionId === depId)
             return dept.positionName
@@ -285,12 +266,16 @@ export default {
         handleClick () {
             if (this.activeName === 'first') {
                 this.getRiskLevel()
+                this.$refs.riskLevePieView.getMiddleLeft('riskLevePieView')
             } else if (this.activeName === 'second') {
                 this.getClauseStatistics()
+                this.$refs.termPieView.getMiddleLeft('termPieView')
             } else if (this.activeName === 'third') {
                 this.getDepartmentStatistics()
+                this.$refs.departPieView.getMiddleLeft('departPieView')
             } else if (this.activeName === 'fourth') {
                 this.getRiskResponse()
+                this.$refs.riskRePieView.getMiddleLeft('riskRePieView')
             } else if (this.activeName === 'fine') {
                 this.remainingRisk()
                 this.$refs.remainingRiskCD.getMiddleLeft('remainingRiskCD')
@@ -342,7 +327,7 @@ export default {
             this.termPieView = {
                 data: [],
                 idSelector: 'termPieView',
-                color: ['#FF0033', '#3870e0', '#339933']
+                color: ['#CC0066', '#FF6600', '#3399CC', '#99CC00', '#FF9900', '#FFFFCC', '#FFCC99', '#009999', '#FFCC33']
             }
             this.termPieView.data = []
             this.termList = []
@@ -364,7 +349,7 @@ export default {
             this.departPieView = {
                 data: [],
                 idSelector: 'departPieView',
-                color: ['#FF0033', '#3870e0', '#339933']
+                color: ['#FF0033', '#3870e0', '#339933', '#FF9900']
             }
             this.departPieView.data = []
             this.departList = []

+ 1 - 1
src/views/system/jbdScan/goods/neishenzhuangtai.vue

@@ -568,7 +568,7 @@ export default {
                 grid: {
                 // 让图表占满容器
                     top:"50px",
-                    left:"45px",
+                    left:"100px",
                     right:"80px",
                     bottom:"40px"
                 },