zc

src/views/components/center-bottom-left.vue

@@ -189,7 +189,7 @@
               name: '教师',
               type: 'line',
               showSymbol: true,
-              smooth: true,
+              smooth: false,//折线/弧线
               // symbol: 'rect',
               symbolSize: 0,
               itemStyle: {
@@ -217,7 +217,7 @@
               name: '学生',
               type: 'line',
               showSymbol: true,
-              smooth: true,
+              smooth: false,//折线/弧线
               // symbol: 'rect',
               symbolSize: 0,
               itemStyle: {
@@ -245,7 +245,7 @@
               name: '总数',
               type: 'line',
               showSymbol: true,
-              smooth: true,
+              smooth: false,//折线/弧线
               // symbol: 'rect',
               symbolSize: 0,
               itemStyle: {

src/views/components/center-bottom-right.vue

@@ -61,7 +61,9 @@
         laboratoryWsBigViewGetResourceRank().then(res => {
           let list = [];
           for(let i=0;i<res.data.length;i++){
-            list.push([res.data[i].roomNo,res.data[i].deptName,res.data[i].authorizedUserCount,res.data[i].recentThirtyDays,res.data[i].recentSevenDays,])
+            if( res.data[i].deptName!= '实验室处'){
+              list.push([res.data[i].roomNo,res.data[i].deptName,res.data[i].authorizedUserCount,res.data[i].recentThirtyDays,res.data[i].recentSevenDays,])
+            }
           }
           this.$set(this.config,'data',list);
         })

src/views/components/center-center.vue

@@ -53,15 +53,20 @@
       },
       laboratoryWsBigViewGetDeptUserStat(){
         laboratoryWsBigViewGetDeptUserStat().then(res => {
-          this.$set(this,'total',res.data.deptNumber);
           let deptName = [];
           let deptNum = [];
           let userNum = [];
           for(let i=0;i<res.data.deptUserStatDataVoList.length;i++){
-            deptName.push(res.data.deptUserStatDataVoList[i].deptName)
-            deptNum.push(res.data.deptUserStatDataVoList[i].useNumber)
-            userNum.push(res.data.deptUserStatDataVoList[i].totalUserNumber)
+            if(res.data.deptUserStatDataVoList[i].deptName == '实验室处'){
+              res.data.deptNumber = res.data.deptNumber - 1;
+            }
+            if(res.data.deptUserStatDataVoList[i].deptName != '实验室处'){
+              deptName.push(res.data.deptUserStatDataVoList[i].deptName)
+              deptNum.push(res.data.deptUserStatDataVoList[i].useNumber)
+              userNum.push(res.data.deptUserStatDataVoList[i].totalUserNumber)
+            }
           }
+          this.$set(this,'total',res.data.deptNumber);
           this.eChartsCenter(deptName,deptNum,userNum);
         })
       },

src/views/components/left-bottom.vue

@@ -22,7 +22,7 @@
     data () {
       return {
         titleData:{
-          name:'科研项目概览',
+          name:'承担科研项目概览',
           type:'left',
           num:'2',
         },
@@ -78,18 +78,20 @@
           let list = []
           res.data.collages = res.data.collages.sort((a, b) => b.count - a.count);
           for (let i = 0; i < res.data.collages.length; i++) {
-            if (list[7]) {
-              maxList.push(JSON.parse(JSON.stringify(list)))
-              list = []
-              list.push({
-                name: getFirstSix(res.data.collages[i].type),
-                value: res.data.collages[i].count
-              })
-            } else {
-              list.push({
-                name: getFirstSix(res.data.collages[i].type),
-                value: res.data.collages[i].count
-              })
+            if( res.data.collages[i].type != '实验室处'){
+              if (list[7]) {
+                maxList.push(JSON.parse(JSON.stringify(list)))
+                list = []
+                list.push({
+                  name: getFirstSix(res.data.collages[i].type),
+                  value: res.data.collages[i].count
+                })
+              } else {
+                list.push({
+                  name: getFirstSix(res.data.collages[i].type),
+                  value: res.data.collages[i].count
+                })
+              }
             }
           }
           if (!maxList[0]) {

src/views/components/left-top.vue

@@ -38,7 +38,7 @@
     data() {
       return {
         titleData:{
-          name:'科研人员统计',
+          name:'准入科研人员统计',
           type:'left',
           num:'1',
         },

src/views/components/right.vue

@@ -671,11 +671,11 @@
           1,
           [{
             offset: 0,
-            color: 'rgba(255,132,0,0.6)'
+            color: 'rgba(0,255,127,0.6)'
           },
             {
               offset: 1,
-              color: 'rgba(255,132,0,0)'
+              color: 'rgba(0,255,127,0)'
             }
           ],
           false
@@ -688,11 +688,11 @@
           1,
           [{
             offset: 0,
-            color: 'rgba(255,132,0,0)'
+            color: 'rgba(0,255,127,0)'
           },
             {
               offset: 1,
-              color: 'rgba(255,132,0,0)'
+              color: 'rgba(0,255,127,0)'
             }
           ],
           false
@@ -800,8 +800,8 @@
               },
               itemStyle: {
                 borderWidth: 5,
-                borderColor: 'rgba(255,132,0,1)',
-                color: 'rgba(255,132,0,1)'
+                borderColor: 'rgba(0,255,127,1)',
+                color: 'rgba(0,255,127,1)'
               },
               label: {
                 show: true,
@@ -810,7 +810,7 @@
                 fontSize: 22,
               },
               areaStyle: {
-                color: 'rgba(255,132,0,1)',
+                color: 'rgba(0,255,127,1)',
                 normal: {
                   //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);
                   color: colorA
@@ -833,11 +833,11 @@
               },
               itemStyle: {
                 borderWidth: 5,
-                borderColor: 'rgba(255,132,0,1)',
-                color: 'rgba(255,132,0,1)'
+                borderColor: 'rgba(0,255,127,1)',
+                color: 'rgba(0,255,127,1)'
               },
               areaStyle: {
-                color: 'rgba(255,132,0,1)',
+                color: 'rgba(0,255,127,1)',
                 normal: {
                   //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);
                   color: colorB