活跃度和工作完成积分优化

shanXiPlatform/src/views/home/branchOffice.vue

@@ -1125,56 +1125,57 @@ export default {
     drawtrt() {
       gethyd(this.midprovinceid, this.homeType).then(res => {
         var chartDataone = [
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100,
-          100
+          // 66
+          100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100,
+          // 100
         ] // 数据
         var chartName = res.data.depotName
         var chartData = res.data.series
-        console.log(res,'chartData')
+        // console.log(res,'chartData')
         const myChartrt = this.$echarts.init(
           document.getElementById("myChartrt")
         )
@@ -1308,10 +1309,11 @@ export default {
               label: {
                 normal: {
                   show: true,
-                  position: [-180, 10],
+                  position: [-180, 22],
                   textStyle: {
                     fontSize: 12,
                     color: "#666",
+                    // color: "red",
                     fontWeight: 700
                   },
                   formatter: function(data) {
@@ -1320,6 +1322,7 @@ export default {
                 }
               },
               data: chartDataone
+              // data: chartName
             }
           ]
         })

shanXiPlatform/src/views/home/gzjftable.vue

@@ -32,7 +32,7 @@
                         {{scope.row.sscore}} 分
                       </template>
                     </el-table-column>
-                    <el-table-column property="operation" label="操作" align="center">
+                    <el-table-column property="operation" label="操作" align="center" width='250'>
                         <template slot-scope="scope">
                           <div v-show="depotChild.includes(scope.row.depotId)">
                             <el-button size="mini" type="detailbtn" @click="detailbtn(scope.$index, scope.row)">查看库内工作情况排名</el-button>
@@ -155,6 +155,7 @@ export default {
                 // depotId: this.$store.state.depotId,
                 depotId: this.$route.query.depotId,
                 sTime: this.checkYear,
+                groupBy:1,
                 type:''
             }
             condition = JSON.stringify(condition)

shanXiPlatform/src/views/home/hydmoretable.vue

@@ -72,6 +72,7 @@ export default {
                 // depotId: this.$store.state.depotId,
                 depotId: this.$route.query.depotId,
                 sTime: this.checkYear,
+                groupBy:2,
                 type:'1'
             }
             condition = JSON.stringify(condition)

shanXiPlatform/src/views/home/hydtable.vue

@@ -149,6 +149,7 @@ export default {
                 // depotId: this.$store.state.depotId,
                 depotId: this.$route.query.depotId,
                 sTime: this.checkYear,
+                groupBy:1,
                 type: ""
             }
             condition = JSON.stringify(condition)

shanXiPlatform/src/views/home/kngzjftable.vue

@@ -75,6 +75,7 @@ export default {
                 // depotId: this.$store.state.depotId,
                 depotId: this.$route.query.depotId,
                 sTime: this.checkYear,
+                groupBy:2,
                 type:'1'
             }
             condition = JSON.stringify(condition)

shanXiPlatform/vue.config.js

@@ -39,8 +39,8 @@ module.exports = {
 
     proxy: {  //配置跨域
       '/': {
-         //target: 'http://101.36.160.140:21061',  //这里后台的地址模拟的;应该填写你们真实的后台接口
-         target: 'http://101.36.160.140:21021',  //这里后台的地址模拟的;应该填写你们真实的后台接口
+         target: 'http://101.36.160.140:21061',  //这里后台的地址模拟的;应该填写你们真实的后台接口
+        //  target: 'http://101.36.160.140:21021',  //这里后台的地址模拟的;应该填写你们真实的后台接口
         // target:'http://172.16.0.02:9601',
         changOrigin: true,  //允许跨域
 
@@ -54,7 +54,7 @@ module.exports = {
       '/apk': {
         // ws: true,
          target: 'http://101.36.160.140:21021',
-         //target: 'http://101.36.160.140:21061',
+        //  target: 'http://101.36.160.140:21061',
         changOrigin: true,
         pathRewrite: {
             '^/apk': ''