修改页面跳转传参bug 修改页面样式

cokingCoal/cokingCoalB.html

@@ -50,8 +50,24 @@
                 </div>
                 <img class="w-full block" style="margin-top: 2px;" src="./images/line.png" alt="">
               </div>
-              <div class="left-bottom-content">
+              <div class="left-bottom-content relative ">
                 <div ref="echartR1" class="loopBack" style="height:100%;width:100%;"></div>
+                <div class="line-circle absolute flex items-center">
+                  <img src="./images/right.png" alt="" style="margin-right: 5px;">
+                  <span>离职人数：0</span>
+                </div>
+                <div class="line-circle absolute flex items-center">
+                  <img src="./images/right.png" alt="" style="margin-right: 5px;">
+                  <span>调动人数：62</span>
+                </div>
+                <div class="line-circle absolute flex items-center">
+                  <span>转正人数：86</span>
+                  <img src="./images/left.png" alt="" style="margin-left:5px">
+                </div>
+                <div class="line-circle absolute flex items-center">
+                  <span>入职人数：825</span>
+                  <img src="./images/left.png" alt="" style="margin-left:5px">
+                </div>
               </div>
             </div>
           </dv-border-box-8>

cokingCoal/js/cokingCoalA.js

@@ -414,78 +414,254 @@ let app = new Vue({
     },
     initChartR1 () {
       let myChart = echarts.init(this.$refs['echartR1'])
-      let option = {
-        tooltip: {
-          trigger: 'item',
+      data = [
+        {
+          name: "高级-正高级",
+          value: 754,
         },
-        legend: {
-          top: 'center',
-          orient: 'vertical',
-          left: '80%',
-          textStyle: {
-            color: '#9DB9EB',
-          },
+        {
+          name: "高级-副高级",
+          value: 611,
+        },
+        {
+          name: "中级",
+          value: 400,
         },
+        {
+          name: "初级-助理级",
+          value: 200,
+        },
+      ];
+      arrName = getArrayValue(data, "name");
+      arrValue = getArrayValue(data, "value");
+      sumValue = eval(arrValue.join("+"));
+      objData = array2obj(data, "name");
+      optionData = getData(data);
+      function getArrayValue (array, key) {
+        var key = key || "value";
+        var res = [];
+        if (array) {
+          array.forEach(function (t) {
+            res.push(t[key]);
+          });
+        }
+        return res;
+      }
+
+      function array2obj (array, key) {
+        var resObj = {};
+        for (var i = 0; i < array.length; i++) {
+          resObj[array[i][key]] = array[i];
+        }
+        return resObj;
+      }
+
+      function getData (data) {
+        var res = {
+          series: [],
+          yAxis: [],
+        };
+        for (let i = 0; i < data.length; i++) {
+          // console.log([70 - i * 15 + '%', 67 - i * 15 + '%']);
+          res.series.push({
+            name: "",
+            type: "pie",
+            clockWise: false, //顺时加载
+            hoverAnimation: false, //鼠标移入变大
+            radius: [53 - i * 15 + "%", 48 - i * 15 + "%"],
+            center: ["35%", "50%"],
+            label: {
+              show: false,
+            },
+            itemStyle: {
+              label: {
+                show: false,
+              },
+              labelLine: {
+                show: false,
+              },
+              borderWidth: 5,
+            },
+            data: [
+              {
+                value: data[i].value,
+                name: data[i].name,
+              },
+              {
+                value: sumValue - data[i].value,
+                name: "",
+                itemStyle: {
+                  color: "rgba(0,0,0,0)",
+                  borderWidth: 0,
+                },
+                tooltip: {
+                  show: false,
+                },
+                hoverAnimation: false,
+              },
+            ],
+          });
+          res.series.push({
+            name: "",
+            type: "pie",
+            silent: true,
+            z: 1,
+            clockWise: false, //顺时加载
+            hoverAnimation: false, //鼠标移入变大
+            radius: [53 - i * 15 + "%", 48 - i * 15 + "%"],
+            center: ["35%", "50%"],
+            label: {
+              show: false,
+            },
+            itemStyle: {
+              label: {
+                show: false,
+              },
+              labelLine: {
+                show: false,
+              },
+              borderWidth: 5,
+            },
+            data: [
+              {
+                value: 7.5,
+                itemStyle: {
+                  color: "rgb(3, 31, 62)",
+                  borderWidth: 0,
+                },
+                tooltip: {
+                  show: false,
+                },
+                hoverAnimation: false,
+              },
+              {
+                value: 2.5,
+                name: "",
+                itemStyle: {
+                  color: "rgba(0,0,0,0)",
+                  borderWidth: 0,
+                },
+                tooltip: {
+                  show: false,
+                },
+                hoverAnimation: false,
+              },
+            ],
+          });
+          res.yAxis.push(((data[i].value / sumValue) * 100).toFixed(2) + "%");
+        }
+        return res;
+      }
+      let option = {
         graphic: {
           elements: [{
             type: 'image',//需要填充图片,配置image,如果不需要图片可以配置其他的, text, circle, sector, ring, polygon, polyline, rect, line, bezierCurve, arc, group,
-            // style: {
-            //   image: './images/pie-back.png', //这里添加图片地址
-            //   width: 180,
-            //   height: 180
-            // },
-            left: 'center',//
+            style: {
+              image: './images/loop.png', //这里添加图片地址
+              width: 320,
+              height: 320
+            },
+            left: '30',//
             top: 'middle' //配置图片居中
           }]
-          // type: "text",
-          // left: "center",
-          // top: "45%",
-          // style: {
-          //   text: "总人数2530",
-          //   textAlign: "center",
-          //   fill: "#fff",
-          //   fontSize: 20,
-          //   fontWeight: 700
-          // }
         },
-        series: [
-          {
+        legend: {
+          show: true,
+          icon: "circle",
+          top: "center",
+          left: "70%",
+          data: arrName,
+          width: 50,
+          padding: [0, 5],
+          itemGap: 25,
+          formatter: function (name) {
+            return (
+              "{title|" + name + "}\n{value|" + objData[name].value + "}  {title|项}"
+            );
+          },
+
+          textStyle: {
+            rich: {
+              title: {
+                fontSize: 14,
+                lineHeight: 15,
+                color: "rgb(0, 178, 246)",
+              },
+              value: {
+                fontSize: 18,
+                lineHeight: 20,
+                color: "#fff",
+              },
+            },
+          },
+        },
+        tooltip: {
+          show: false,
+          normal: {
+            show: false,
+            trigger: "item",
             label: {
-              normal: {
-                position: 'inner'
-              }
+              margin: 10,    // label 距离轴的距离
+              color: '#FFF',     // 文字的颜色
+              fontStyle: 'normal',    // 文字字体的风格（'normal'，无样式；'italic'，斜体；'oblique'，倾斜字体） 
+              fontWeight: 'normal',    // 文字字体的粗细（'normal'，无样式；'bold'，加粗；'bolder'，加粗的基础上再加粗；'lighter'，变细；数字定义粗细也可以，取值范围100至700）
+              fontSize: '20',    // 文字字体大小
+              lineHeight: '50',    // 行高 
             },
-            name: '',
-            type: 'pie',
-            radius: ['0%', '60%'],
-            labelLine: {
-              normal: {
-                lineStyle: {
-                  width: 1,
-                },
-              },
+          },
+          // formatter: "{a}<br>{b}:{c}({d}%)666",
+          textStyle: {
+            color: '#FFF',     // 文字的颜色
+            fontStyle: 'normal',    // 文字字体的风格（'normal'，无样式；'italic'，斜体；'oblique'，倾斜字体） 
+            fontWeight: 'normal',    // 文字字体的粗细（'normal'，无样式；'bold'，加粗；'bolder'，加粗的基础上再加粗；'lighter'，变细；数字定义粗细也可以，取值范围100至700）
+          },
+          formatter: data => {
+            console.log(data)
+            // 小圆点
+            return `<br /><span style="display:inline-block;border-radius:50%;margin-right:10px; width:7px;height:7px;background-color:blue"></span>${data.name}：${data.percent}`
+          },
+
+        },
+        color: [
+          "rgb(24, 183, 142)",
+          "rgb(1, 179, 238)",
+          "rgb(22, 75, 205)",
+          "rgb(52, 52, 176)",
+        ],
+        grid: {
+          top: "21%",
+          bottom: "48%",
+          left: "36%",
+          containLabel: false,
+        },
+        yAxis: [
+          {
+            type: "category",
+            inverse: true,
+            axisLine: {
+              show: false,
             },
-            data: [
-              { value: 1048, name: '教授' },
-              { value: 735, name: '副教授' },
-              { value: 580, name: '助教' },
-              { value: 484, name: '讲师' },
-            ],
-            itemStyle: {
-              normal: {
-                color: function (colors) {
-                  var colorList = [
-                    '#00DCFF',
-                    '#116CFD',
-                    '#8BA2FF',
-                    '#FFC200'
-                  ];
-                  return colorList[colors.dataIndex];
-                }
+            axisTick: {
+              show: false,
+            },
+            axisLabel: {
+              interval: 0,
+              inside: true,
+              textStyle: {
+                color: "#fff",
+                fontSize: 14,
               },
-            }
+              show: true,
+            },
+            data: optionData.yAxis,
+          },
+        ],
+        xAxis: [
+          {
+            show: false,
           },
         ],
+        series: optionData.series,
       }
       myChart.setOption(option)
       tools.loopShowTooltip(myChart, option, {

cokingCoal/styles/cokingCoalA.css

@@ -152,10 +152,10 @@ a {
 .right-bottom-content {
   height: calc(100% - 50px);
 }
-.loopBack {
+/* .loopBack {
   background: url('../images/loop.png') no-repeat center;
   background-size: 60% auto;
-}
+} */
 .center {
   padding: 10px;
 }

cokingCoal/styles/cokingCoalB.css

@@ -215,6 +215,34 @@ a {
 .right-top-content-bottom {
   height: calc(100% - 80px);
 }
+.line-circle{
+  width: 200px;
+  height: 30px;
+}
+.line-circle img{
+  width: 70px;
+  height: 20px;
+}
+.line-circle span{
+  height: 30px;
+  line-height: 30px;
+}
+.left-bottom-content .line-circle:nth-child(2){
+  top: 91px;
+  left: 280px;
+}
+.left-bottom-content .line-circle:nth-child(3){
+  top: 180px;
+  left: 330px;
+}
+.left-bottom-content .line-circle:nth-child(4){
+  top: 130px;
+  left: 80px;
+}
+.left-bottom-content .line-circle:nth-child(5){
+  top: 230px;
+  left: 10px;
+}
 /* zhb */
 /* 宽高纵横比 */
 .aspect-auto {

manpowerPort/index.html

@@ -135,16 +135,16 @@
             </div>
             <div class="content flex" style="padding: 10px;">
               <div class="box-center">
-                <div class="t">
+                <div class="t alignCenter">
                   <p>{{centerData.changeInfo[0].value1}}<span>%</span></p>
                   <p>总部机构压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{centerData.changeInfo[0].value2}}</p>
                     <p style=" cursor: pointer;" @click.stop="handleShowTip(0,'beforeReform')">改革前总部机构平均数</p>
                   </div>
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{centerData.changeInfo[0].value3}}</p>
                     <p>改革后总部机构平均数
                     </p>
@@ -168,32 +168,32 @@
                 </div>
               </div> -->
               <div class="box-center">
-                <div>
+                <div class="alignCenter">
                   <p>{{centerData.changeInfo[2].value1}}<span>%</span></p>
                   <p>在册职工压缩率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{numFormat(centerData.changeInfo[2].value2)}}</p>
                     <p style=" cursor: pointer;" @click.stop="handleShowTip(0,'reformRegistered')">改革前在册职工数</p>
                   </div>
-                  <div>
+                  <div class="alignCenter"> 
                     <p style="color:#17AC76">{{centerData.changeInfo[2].value3}}<span>万</span></p>
                     <p>在册职工压缩数</p>
                   </div>
                 </div>
               </div>
               <div class="box-center">
-                <div class="t">
+                <div class="t alignCenter">
                   <p>{{centerData.changeInfo[1].value1}}<span>%</span></p>
                   <p>在岗职工薪酬增长率</p>
                 </div>
                 <div class="flex">
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#FBE139">{{numFormat(centerData.changeInfo[1].value2)}}<span>万元</span></p>
                     <p style=" cursor: pointer;" @click.stop="handleShowTip(0,'reforAveRemuneration')">改革前在岗职工平均薪酬</p>
                   </div>
-                  <div>
+                  <div class="alignCenter">
                     <p style="color:#17AC76">{{numFormat(centerData.changeInfo[1].value3)}}<span>万元</span></p>
                     <p>改革后在岗职工平均薪酬</p>
                   </div>

manpowerPort/index2.html

@@ -152,11 +152,11 @@
                 </div>
                 <div class="flex">
                   <div>
-                    <p style="color:#FBE139">{{centerData.changeInfo[0].value2}}</p>
+                    <p style="color:#FBE139">{{numFormat(centerData.changeInfo[0].value2)}}</p>
                     <p>改革前总部机构平均数</p>
                   </div>
                   <div>
-                    <p style="color:#17AC76">{{centerData.changeInfo[0].value3}}</p>
+                    <p style="color:#17AC76">{{numFormat(centerData.changeInfo[0].value3)}}</p>
                     <p>改革后总部机构平均数
                     </p>
                   </div>

manpowerPort/index3.html

@@ -151,11 +151,11 @@
                 </div>
                 <div class="flex">
                   <div>
-                    <p style="color:#FBE139">{{centerData.changeInfo[0].value2}}</p>
+                    <p style="color:#FBE139">numFormat({{centerData.changeInfo[0].value2}})</p>
                     <p>改革前总部机构平均数</p>
                   </div>
                   <div>
-                    <p style="color:#17AC76">{{centerData.changeInfo[0].value3}}</p>
+                    <p style="color:#17AC76">numFormat({{centerData.changeInfo[0].value3}})</p>
                     <p>改革后总部机构平均数
                     </p>
                   </div>

manpowerPort/index4.html

@@ -154,11 +154,11 @@
                 </div>
                 <div class="flex">
                   <div>
-                    <p style="color:#FBE139">{{centerData.changeInfo[0].value2}}</p>
+                    <p style="color:#FBE139">numFormat({{centerData.changeInfo[0].value2}})</p>
                     <p>改革前总部机构平均数</p>
                   </div>
                   <div>
-                    <p style="color:#17AC76">{{centerData.changeInfo[0].value3}}</p>
+                    <p style="color:#17AC76">numFormat({{centerData.changeInfo[0].value3}})</p>
                     <p>改革后总部机构平均数
                     </p>
                   </div>

manpowerPort/js/index.js

@@ -354,8 +354,8 @@ let app = new Vue({
           // 弹窗
           // return
           // 左侧图表
-          tipData.focus[0] = res.orgData.area1.keyPoint
-          tipData.analysis[0] = res.orgData.area1.intAnalysis
+          // tipData.focus[0] = res.orgData.area1.keyPoint
+          // tipData.analysis[0] = res.orgData.area1.intAnalysis
           //各省属企业总部机构数
           dataL1[1] = []
           dataL1[0] = []
@@ -375,8 +375,8 @@ let app = new Vue({
 
           // 定职数
           // 弹窗
-          tipData.focus[1] = res.orgData.area2.keyPoint
-          tipData.analysis[1] = res.orgData.area2.intAnalysis
+          // tipData.focus[1] = res.orgData.area2.keyPoint
+          // tipData.analysis[1] = res.orgData.area2.intAnalysis
           // 各省属企业管理人员数
           dataL3[0] = []
           dataL3[1] = []
@@ -396,8 +396,8 @@ let app = new Vue({
 
           // 定员额
           // 弹窗
-          tipData.focus[2] = res.orgData.area3.keyPoint
-          tipData.analysis[2] = res.orgData.area3.intAnalysis
+          // tipData.focus[2] = res.orgData.area3.keyPoint
+          // tipData.analysis[2] = res.orgData.area3.intAnalysis
           // 各省属企业总人数
           dataL5[0] = []
           dataL5[1] = []
@@ -445,8 +445,8 @@ let app = new Vue({
 
           // 核心指标监测
           // 弹窗
-          tipData.focus[3] = res.orgData.area9.keyPoint
-          tipData.analysis[3] = res.orgData.area9.intAnalysis
+          // tipData.focus[3] = res.orgData.area9.keyPoint
+          // tipData.analysis[3] = res.orgData.area9.intAnalysis
           // 各省属企业全员劳动生产率
           c1[0] = []
           c1[1] = []
@@ -466,8 +466,8 @@ let app = new Vue({
           // 左边
           // 定机制
           // 弹窗
-          tipData.focus[4] = res.orgData.area4.keyPoint
-          tipData.analysis[4] = res.orgData.area4.intAnalysis
+          // tipData.focus[4] = res.orgData.area4.keyPoint
+          // tipData.analysis[4] = res.orgData.area4.intAnalysis
           // 各省属企业招聘需求公示人次
           dataR1[0] = []
           dataR1[1] = []
@@ -499,8 +499,8 @@ let app = new Vue({
 
           // 定薪酬
           // 弹窗
-          tipData.focus[5] = res.orgData.area5.keyPoint
-          tipData.analysis[5] = res.orgData.area5.intAnalysis
+          // tipData.focus[5] = res.orgData.area5.keyPoint
+          // tipData.analysis[5] = res.orgData.area5.intAnalysis
           // 各省属企业在岗职工平均薪酬
           fjxdataL1[0] = []
           fjxdataL1[1] = []
@@ -518,8 +518,8 @@ let app = new Vue({
 
           // 定任期
           // 弹窗
-          tipData.focus[5] = res.orgData.area6.keyPoint
-          tipData.analysis[5] = res.orgData.area6.intAnalysis
+          // tipData.focus[5] = res.orgData.area6.keyPoint
+          // tipData.analysis[5] = res.orgData.area6.intAnalysis
           // 各省属企业全员绩效考核
           fjxdataL3[0] = []
           res.orgData.area6.card1.forEach(item => {
@@ -584,8 +584,10 @@ let app = new Vue({
     },
     numFormat (value) {
       if (!value) return '0'
-      var intPart = Number(value).toFixed(0) // 获取整数部分
+      // var intPart = Number(value).toFixed(0) // 获取整数部分
+      var intPart = parseInt(value)// 获取整数部分
       var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
+
       var floatPart = '.00' // 预定义小数部分
       var value2Array = value.toString().split('.')
       // =2表示数据有小数位

manpowerPort/js/index2.js

@@ -235,12 +235,11 @@ let app = new Vue({
         }
         post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
           res.orgData = res.data[0]
-          console.log(res.orgData,'??????')
           // 定机构
           // 弹窗
           // return
           // 左侧图表
-          tipData.analysis[0] = res.orgData.area1.intAnalysis
+          // tipData.analysis[0] = res.orgData.area1.intAnalysis
           //各二级企业本部机构数
           dataL1[0] = []
           res.orgData.area1.card1.forEach(item => {
@@ -255,7 +254,7 @@ let app = new Vue({
           // 定职数
           // 弹窗
           // 左侧图表
-          tipData.analysis[2] = res.orgData.area2.intAnalysis
+          // tipData.analysis[2] = res.orgData.area2.intAnalysis
           //各二级企业本部中层管理人数
           dataL3[0] = []
           res.orgData.area2.card1.forEach(item => {
@@ -271,7 +270,7 @@ let app = new Vue({
 
           // 定员额
           // 弹窗
-          tipData.analysis[1] = res.orgData.area3.intAnalysis
+          // tipData.analysis[1] = res.orgData.area3.intAnalysis
           // 各二级企业总人数
           dataL5[0] = []
           dataL5[1] = []
@@ -301,7 +300,7 @@ let app = new Vue({
 
           // 定机制
           // 弹窗
-          tipData.analysis[6] = res.orgData.area4.intAnalysis
+          // tipData.analysis[6] = res.orgData.area4.intAnalysis
           // 各二级企业招聘需求公告人次情况
           dataR1[0] = []
           dataR1[1] = []
@@ -333,7 +332,7 @@ let app = new Vue({
 
           // 定薪酬
           // 弹窗
-          tipData.analysis[5] = res.orgData.area5.intAnalysis
+          // tipData.analysis[5] = res.orgData.area5.intAnalysis
           // 各二级企业在岗职工平均薪酬
           dataR5[0] = []
           dataR5[1] = []
@@ -351,7 +350,7 @@ let app = new Vue({
 
           // 定任期
           // 弹窗
-          tipData.analysis[6] = res.orgData.area6.intAnalysis
+          // tipData.analysis[6] = res.orgData.area6.intAnalysis
           // 各二级企业全员绩效考核
           dataR7[0] = []
           res.orgData.area6.card1.forEach(item => {
@@ -381,7 +380,7 @@ let app = new Vue({
           this.centerData.changeInfo[1].value3 = res.orgData.area8.ZBPZ0073
           // 核心指标监测
           // 弹窗
-          tipData.analysis[3] = res.orgData.area9.intAnalysis
+          // tipData.analysis[3] = res.orgData.area9.intAnalysis
           // 各二级企业全员劳动生产率
           dataC1[0] = []
           dataC1[1] = []
@@ -416,7 +415,7 @@ let app = new Vue({
       }
       this.access_token = obj.access_token
       this.orgNumber = obj.id
-      this.titleName = obj.name
+      this.titleName = decodeURIComponent(obj.name)
       Promise.all([this.getData(), this.getInstitutional()])
         .then((arr) => {
           this.generateEcharts()
@@ -430,8 +429,8 @@ let app = new Vue({
           access_token: this.access_token,
           "Data": {
             "paramType": "ORG",
-            // "orgNumber": this.orgNumber
-            "orgNumber": '1494979736584079360'
+            "orgNumber": this.orgNumber
+            // "orgNumber": '1494979736584079360'
           }
         }
         post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
@@ -455,7 +454,8 @@ let app = new Vue({
     },
     numFormat (value) {
       if (!value) return '0'
-      var intPart = Number(value).toFixed(0) // 获取整数部分
+      // var intPart = Number(value).toFixed(0) // 获取整数部分
+      var intPart = parseInt(value)// 获取整数部分
       var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
       var floatPart = '.00' // 预定义小数部分
       var value2Array = value.toString().split('.')

manpowerPort/js/index3.js

@@ -218,7 +218,7 @@ let app = new Vue({
       }
       this.access_token = obj.access_token
       this.orgNumber = obj.id
-      this.titleName = obj.name
+      this.titleName = decodeURIComponent(obj.name)
       Promise.all([this.getData(), this.getInstitutional()])
         .then((arr) => {
           this.generateEcharts()
@@ -261,7 +261,7 @@ let app = new Vue({
           // 弹窗
           // return
           // 左侧图表
-          tipData.analysis[0] = res.orgData.area1.intAnalysis
+          // tipData.analysis[0] = res.orgData.area1.intAnalysis
           //各二级企业本部机构数
           dataL1[0] = []
           res.orgData.area1.card1.forEach(item => {
@@ -276,7 +276,7 @@ let app = new Vue({
           // 定职数
           // 弹窗
           // 左侧图表
-          tipData.analysis[2] = res.orgData.area2.intAnalysis
+          // tipData.analysis[2] = res.orgData.area2.intAnalysis
           //各二级企业本部中层管理人数
           dataL3[0] = []
           res.orgData.area2.card1.forEach(item => {
@@ -292,7 +292,7 @@ let app = new Vue({
 
           // 定员额
           // 弹窗
-          tipData.analysis[1] = res.orgData.area3.intAnalysis
+          // tipData.analysis[1] = res.orgData.area3.intAnalysis
           // 各二级企业总人数
           dataL5[0] = []
           dataL5[1] = []
@@ -322,7 +322,7 @@ let app = new Vue({
 
           // 定机制
           // 弹窗
-          tipData.analysis[6] = res.orgData.area4.intAnalysis
+          // tipData.analysis[6] = res.orgData.area4.intAnalysis
           // 各二级企业招聘需求公告人次情况
           dataR1[0] = []
           dataR1[1] = []
@@ -354,7 +354,7 @@ let app = new Vue({
 
           // 定薪酬
           // 弹窗
-          tipData.analysis[5] = res.orgData.area5.intAnalysis
+          // tipData.analysis[5] = res.orgData.area5.intAnalysis
           // 各二级企业在岗职工平均薪酬
           dataR5[0] = []
           dataR5[1] = []
@@ -372,7 +372,7 @@ let app = new Vue({
 
           // 定任期
           // 弹窗
-          tipData.analysis[6] = res.orgData.area6.intAnalysis
+          // tipData.analysis[6] = res.orgData.area6.intAnalysis
           // 各二级企业全员绩效考核
           dataR7[0] = []
           res.orgData.area6.card1.forEach(item => {
@@ -402,7 +402,7 @@ let app = new Vue({
           this.centerData.changeInfo[1].value3 = res.orgData.area8.ZBPZ0073
           // 核心指标监测
           // 弹窗
-          tipData.analysis[3] = res.orgData.area9.intAnalysis
+          // tipData.analysis[3] = res.orgData.area9.intAnalysis
           // 各二级企业全员劳动生产率
           dataC1[0] = []
           dataC1[1] = []
@@ -433,7 +433,8 @@ let app = new Vue({
     },
     numFormat (value) {
       if (!value) return '0'
-      var intPart = Number(value).toFixed(0) // 获取整数部分
+      // var intPart = Number(value).toFixed(0) // 获取整数部分
+      var intPart = parseInt(value)// 获取整数部分
       var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
       var floatPart = '.00' // 预定义小数部分
       var value2Array = value.toString().split('.')

manpowerPort/js/index4.js

@@ -219,7 +219,7 @@ let app = new Vue({
       }
       this.access_token = obj.access_token
       this.orgNumber = obj.id
-      this.titleName = obj.name
+      this.titleName = decodeURIComponent(obj.name)
       Promise.all([this.getData(), this.getInstitutional()])
         .then((arr) => {
           this.generateEcharts()
@@ -262,7 +262,7 @@ let app = new Vue({
           // 弹窗
           // return
           // 左侧图表
-          tipData.analysis[0] = res.orgData.area1.intAnalysis
+          // tipData.analysis[0] = res.orgData.area1.intAnalysis
           //各二级企业本部机构数
           dataL1[0] = []
           res.orgData.area1.card1.forEach(item => {
@@ -277,7 +277,7 @@ let app = new Vue({
           // 定职数
           // 弹窗
           // 左侧图表
-          tipData.analysis[2] = res.orgData.area2.intAnalysis
+          // tipData.analysis[2] = res.orgData.area2.intAnalysis
           //各二级企业本部中层管理人数
           dataL3[0] = []
           res.orgData.area2.card1.forEach(item => {
@@ -293,7 +293,7 @@ let app = new Vue({
 
           // 定员额
           // 弹窗
-          tipData.analysis[1] = res.orgData.area3.intAnalysis
+          // tipData.analysis[1] = res.orgData.area3.intAnalysis
           // 各二级企业总人数
           dataL5[0] = []
           dataL5[1] = []
@@ -323,7 +323,7 @@ let app = new Vue({
 
           // 定机制
           // 弹窗
-          tipData.analysis[6] = res.orgData.area4.intAnalysis
+          // tipData.analysis[6] = res.orgData.area4.intAnalysis
           // 各二级企业招聘需求公告人次情况
           dataR1[0] = []
           dataR1[1] = []
@@ -355,7 +355,7 @@ let app = new Vue({
 
           // 定薪酬
           // 弹窗
-          tipData.analysis[5] = res.orgData.area5.intAnalysis
+          // tipData.analysis[5] = res.orgData.area5.intAnalysis
           // 各二级企业在岗职工平均薪酬
           dataR5[0] = []
           dataR5[1] = []
@@ -373,7 +373,7 @@ let app = new Vue({
 
           // 定任期
           // 弹窗
-          tipData.analysis[6] = res.orgData.area6.intAnalysis
+          // tipData.analysis[6] = res.orgData.area6.intAnalysis
           // 各二级企业全员绩效考核
           dataR7[0] = []
           res.orgData.area6.card1.forEach(item => {
@@ -403,7 +403,7 @@ let app = new Vue({
           this.centerData.changeInfo[1].value3 = res.orgData.area8.ZBPZ0073
           // 核心指标监测
           // 弹窗
-          tipData.analysis[3] = res.orgData.area9.intAnalysis
+          // tipData.analysis[3] = res.orgData.area9.intAnalysis
           // 各二级企业全员劳动生产率
           dataC1[0] = []
           dataC1[1] = []
@@ -437,7 +437,8 @@ let app = new Vue({
     },
     numFormat (value) {
       if (!value) return '0'
-      var intPart = Number(value).toFixed(0) // 获取整数部分
+      // var intPart = Number(value).toFixed(0) // 获取整数部分
+      var intPart = parseInt(value)// 获取整数部分
       var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
       var floatPart = '.00' // 预定义小数部分
       var value2Array = value.toString().split('.')

manpowerPort/styles/index.css

@@ -388,6 +388,12 @@ a {
   top: 0;
   left: 0; */
 }
+.alignCenter{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
 .tip-box {
   position: absolute;
   /* top: 35%;