中投页面开发，接口对接

investment/investHome5.html

@@ -44,7 +44,7 @@
               </div>
             </div>
           </dv-border-box-8>
-          <dv-border-box-8 class="overflow-hidden topBack">
+          <dv-border-box-8 class="overflow-hidden topBackR">
             <div class="panel-title ">
               <span class="text">股权类</span>
             </div>

investment/js/data5.js

@@ -1,21 +1,65 @@
-let echartL1 = [[1,2,3,4,5,6,7],[7,6,5,4,3,2,1]]
+let echartL1 = [[1, 2, 3, 4, 5, 6, 7], [7, 6, 5, 4, 3, 2, 1]]
 let title = [
-  { name: '山西焦煤', value: 189.07, value2: 121.59 },
-  { name: '晋能控股', value: 385.25, value2: 224.89 },
-  { name: '华阳新材', value: 82.95, value2: 71.34 },
-  { name: '潞安化工', value: 106.84, value2: 59.93 },
-  { name: '华新燃气', value: 31.83, value2: 25.20 },
-  { name: '太重集团', value: 80.01, value2: 42.46 },
-  { name: '国际能源', value: 64.20, value2: 12.19 },
-  { name: '华远陆港', value: 97.57, value2: 112.67 },
-  { name: '万家寨水控', value: 46.99, value2: 50.89 },
-  { name: '文旅集团', value: 26.79, value2: 9.64 },
-  { name: '山西交控', value: 346.36, value2: 335.91 },
-  { name: '航产集团', value: 41.09, value2: 42.67 },
-  { name: '山西建投', value: 218.35, value2: 143.84 },
-  { name: '汾酒集团', value: 14.03, value2: 7.69 },
-  { name: '大地控股', value: 47.05, value2: 23.93 },
-  { name: '云时代', value: 63.45, value2: 32.60 },
-  { name: '华舰体育', value: 5.33, value2: 0.80 },
-  { name: '神农科技', value: 14.76, value2: 5.84 }
+  { name: '山西焦煤', value: 189.07, value2: 121.59, value3: 12.6, value4: 35.8 },
+  { name: '晋能控股', value: 385.25, value2: 224.89, value3: 12.6, value4: 35.8 },
+  { name: '华阳新材', value: 82.95, value2: 71.34, value3: 12.6, value4: 35.8 },
+  { name: '潞安化工', value: 106.84, value2: 59.93, value3: 12.6, value4: 35.8 },
+  { name: '华新燃气', value: 31.83, value2: 25.20, value3: 12.6, value4: 35.8 },
+  { name: '太重集团', value: 80.01, value2: 42.46, value3: 12.6, value4: 35.8 },
+  { name: '国际能源', value: 64.20, value2: 12.19, value3: 12.6, value4: 35.8 },
+  { name: '华远陆港', value: 97.57, value2: 112.67, value3: 12.6, value4: 35.8 },
+  { name: '万家寨水控', value: 46.99, value2: 50.89, value3: 12.6, value4: 35.8 },
+  { name: '文旅集团', value: 26.79, value2: 9.64, value3: 12.6, value4: 35.8 },
+  { name: '山西交控', value: 346.36, value2: 335.91, value3: 12.6, value4: 35.8 },
+  { name: '航产集团', value: 41.09, value2: 42.67, value3: 12.6, value4: 35.8 },
+  { name: '山西建投', value: 218.35, value2: 143.84, value3: 12.6, value4: 35.8 },
+  { name: '汾酒集团', value: 14.03, value2: 7.69, value3: 12.6, value4: 35.8 },
+  { name: '大地控股', value: 47.05, value2: 23.93, value3: 12.6, value4: 35.8 },
+  { name: '云时代', value: 63.45, value2: 32.60, value3: 12.6, value4: 35.8 },
+  { name: '华舰体育', value: 5.33, value2: 0.80, value3: 12.6, value4: 35.8 },
+  { name: '神农科技', value: 14.76, value2: 5.84, value3: 12.6, value4: 35.8 }
+]
+let echart3 = [
+  { value: 189.07, value2: 121.59, value3: 12.6, value4: 35.8 },
+  { value: 385.25, value2: 224.89, value3: 12.6, value4: 35.8 },
+  { value: 82.95, value2: 71.34, value3: 12.6, value4: 35.8 },
+  { value: 106.84, value2: 59.93, value3: 12.6, value4: 35.8 },
+  { value: 31.83, value2: 25.20, value3: 12.6, value4: 35.8 },
+  { value: 80.01, value2: 42.46, value3: 12.6, value4: 35.8 },
+  { value: 64.20, value2: 12.19, value3: 12.6, value4: 35.8 },
+  { value: 97.57, value2: 112.67, value3: 12.6, value4: 35.8 },
+  { value: 46.99, value2: 50.89, value3: 12.6, value4: 35.8 },
+  { value: 26.79, value2: 9.64, value3: 12.6, value4: 35.8 },
+  { value: 346.36, value2: 335.91, value3: 12.6, value4: 35.8 },
+  { value: 41.09, value2: 42.67, value3: 12.6, value4: 35.8 },
+  { value: 218.35, value2: 143.84, value3: 12.6, value4: 35.8 },
+  { value: 14.03, value2: 7.69, value3: 12.6, value4: 35.8 },
+  { value: 47.05, value2: 23.93, value3: 12.6, value4: 35.8 },
+  { value: 63.45, value2: 32.60, value3: 12.6, value4: 35.8 },
+  { value: 5.33, value2: 0.80, value3: 12.6, value4: 35.8 },
+  { value: 14.76, value2: 5.84, value3: 12.6, value4: 35.8 }
+]
+let echart4 = [
+  [4200, 3000, 20000, 35000, 50000, 18000],
+  [8000, 3000, 38000, 76000, 32000, 71000],
+]
+let echart5 = [
+  { value: 189.07, value2: 121.59, value3: 12.6, value4: 35.8 },
+  { value: 385.25, value2: 224.89, value3: 12.6, value4: 35.8 },
+  { value: 82.95, value2: 71.34, value3: 12.6, value4: 35.8 },
+  { value: 106.84, value2: 59.93, value3: 12.6, value4: 35.8 },
+  { value: 31.83, value2: 25.20, value3: 12.6, value4: 35.8 },
+  { value: 80.01, value2: 42.46, value3: 12.6, value4: 35.8 },
+  { value: 64.20, value2: 12.19, value3: 12.6, value4: 35.8 },
+  { value: 97.57, value2: 112.67, value3: 12.6, value4: 35.8 },
+  { value: 46.99, value2: 50.89, value3: 12.6, value4: 35.8 },
+  { value: 26.79, value2: 9.64, value3: 12.6, value4: 35.8 },
+  { value: 346.36, value2: 335.91, value3: 12.6, value4: 35.8 },
+  { value: 41.09, value2: 42.67, value3: 12.6, value4: 35.8 },
+  { value: 218.35, value2: 143.84, value3: 12.6, value4: 35.8 },
+  { value: 14.03, value2: 7.69, value3: 12.6, value4: 35.8 },
+  { value: 47.05, value2: 23.93, value3: 12.6, value4: 35.8 },
+  { value: 63.45, value2: 32.60, value3: 12.6, value4: 35.8 },
+  { value: 5.33, value2: 0.80, value3: 12.6, value4: 35.8 },
+  { value: 14.76, value2: 5.84, value3: 12.6, value4: 35.8 }
 ]

investment/js/investHome5.js

@@ -46,7 +46,7 @@ let app = new Vue({
           bottom: '15%',
         },
         legend: {
-          data: ["计划投资", "实际投资"],
+          data: ["预算额", "已签合同额",'产值认定额','结算额','结算额'],
           x:'center',
           y:'10px',
           textStyle: {
@@ -103,15 +103,15 @@ let app = new Vue({
         ],
         series: [
           {
-            name: '计划投资',
+            name: '预算额',
             type: 'bar',
-            barWidth: 10,
+            barWidth: 5,
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#69c0ff',
+                    color: '#71D5FF',
                   },
                   {
                     offset: 1,
@@ -120,18 +120,58 @@ let app = new Vue({
                 ]),
               },
             },
-            data: echartL1[0],
+            data: title.map(item=>item.value),
           },
           {
-            name: '实际投资',
+            name: '已签合同额',
             type: 'bar',
-            barWidth: 10,
+            barWidth: 5,
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
                     offset: 0,
-                    color: '#957DFF',
+                    color: '#4D6FF6',
+                  },
+                  {
+                    offset: 1,
+                    color: '#082550',
+                  },
+                ]),
+              },
+            },
+            data: title.map(item=>item.value2),
+          },
+          {
+            name: '产值认定额',
+            type: 'bar',
+            barWidth: 5,
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: '#877CFC',
+                  },
+                  {
+                    offset: 1,
+                    color: '#082550',
+                  },
+                ]),
+              },
+            },
+            data: title.map(item=>item.value2),
+          },
+          {
+            name: '结算额',
+            type: 'bar',
+            barWidth: 5,
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: '#52BF80',
                   },
                   {
                     offset: 1,
@@ -140,7 +180,27 @@ let app = new Vue({
                 ]),
               },
             },
-            data: echartL1[1],
+            data: title.map(item=>item.value2),
+          },
+          {
+            name: '付款额',
+            type: 'bar',
+            barWidth: 5,
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: '#CADD62',
+                  },
+                  {
+                    offset: 1,
+                    color: '#082550',
+                  },
+                ]),
+              },
+            },
+            data: title.map(item=>item.value2),
           },
         ],
       }
@@ -316,7 +376,7 @@ let app = new Vue({
           bottom: '25%',
         },
         legend: {
-          data: ["计划投资", "实际投资"],
+          data: ["高风险", "中风险",'低风险'],
           x:'center',
           y:'10px',
           textStyle: {
@@ -373,9 +433,9 @@ let app = new Vue({
         ],
         series: [
           {
-            name: '计划投资',
+            name: '高风险',
             type: 'bar',
-            barWidth: 10,
+            barWidth: 5,
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -390,12 +450,12 @@ let app = new Vue({
                 ]),
               },
             },
-            data: echartL1[0],
+            data: echart3.map(item=>item.value),
           },
           {
-            name: '实际投资',
+            name: '中风险',
             type: 'bar',
-            barWidth: 10,
+            barWidth: 5,
             itemStyle: {
               normal: {
                 color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -410,7 +470,27 @@ let app = new Vue({
                 ]),
               },
             },
-            data: echartL1[1],
+            data: echart3.map(item=>item.value2),
+          },
+          {
+            name: '低风险',
+            type: 'bar',
+            barWidth: 5,
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: '#957DFF',
+                  },
+                  {
+                    offset: 1,
+                    color: '#082550',
+                  },
+                ]),
+              },
+            },
+            data: echart3.map(item=>item.value3),
           },
         ],
       }
@@ -485,7 +565,7 @@ let app = new Vue({
             symbolSize: 0, // 数值点的大小
             data: [
               {
-                value: [4200, 3000, 20000, 35000, 50000, 18000],
+                value: echart4[0],
                 name: '类型1',
                 itemStyle: { //该数值区域样式设置
                   normal: {
@@ -511,7 +591,7 @@ let app = new Vue({
                 },
               },
               {
-                value: [8000, 3000, 38000, 76000, 32000, 71000],
+                value: echart4[1],
                 name: '类型2',
                 itemStyle: { //该数值区域样式设置
                   normal: {
@@ -565,7 +645,7 @@ let app = new Vue({
           bottom: '25%',
         },
         legend: {
-          data: ["计划投资", "实际投资"],
+          data: ["预算额", "合同额","结算额","支付额"],
           x:'center',
           y:'10px',
           textStyle: {
@@ -622,7 +702,7 @@ let app = new Vue({
         ],
         series: [
           {
-            name: '计划投资',
+            name: '预算额',
             type: 'bar',
             barWidth: 10,
             itemStyle: {
@@ -639,10 +719,50 @@ let app = new Vue({
                 ]),
               },
             },
-            data: echartL1[0],
+            data: title.map(item=>item.value),
+          },
+          {
+            name: '合同额',
+            type: 'bar',
+            barWidth: 10,
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: '#957DFF',
+                  },
+                  {
+                    offset: 1,
+                    color: '#082550',
+                  },
+                ]),
+              },
+            },
+            data:title.map(item=>item.value2),
+          },
+          {
+            name: '结算额',
+            type: 'bar',
+            barWidth: 10,
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: '#957DFF',
+                  },
+                  {
+                    offset: 1,
+                    color: '#082550',
+                  },
+                ]),
+              },
+            },
+            data:title.map(item=>item.value3),
           },
           {
-            name: '实际投资',
+            name: '支付额',
             type: 'bar',
             barWidth: 10,
             itemStyle: {
@@ -659,7 +779,7 @@ let app = new Vue({
                 ]),
               },
             },
-            data: echartL1[1],
+            data:title.map(item=>item.value4),
           },
         ],
       }

investment/styles/investHome5.css

@@ -153,6 +153,10 @@ a {
   background: url('../images/title-right.png') no-repeat;
 }
 .topBack {
+  background: url('../images5/langBack.png') no-repeat;
+  background-size: 100% 100%;
+}
+.topBackR{
   background: url('../images5/back1.png') no-repeat;
   background-size: 100% 100%;
 }

manpowerPort/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-  "liveServer.settings.port": 5502
-}

manpowerPort/js/index.js

@@ -268,10 +268,18 @@ let app = new Vue({
     // 获取token
     getAppToken () {
       let value = {
-        "appId": "cockpitScreen",
-        "appSecuret": "JSCdpsjgl@123456",
-        "tenantid": "gydev",
-        "accountId": "1614416231203341312",
+        // dev环境
+        // "appId": "cockpitScreen",
+        // "appSecuret": "JSCdpsjgl@123456",
+        // "tenantid": "gydev",
+        // "accountId": "1614416231203341312",
+        // "language": "zh_CN"
+
+        // SIT环境
+        "appId": "CockpitScreen",
+        "appSecuret": "JSCdpsjgl@539126",
+        "tenantid": "test",
+        "accountId": "1484008912330950656",
         "language": "zh_CN"
       }
       post('/ierp/api/getAppToken.do', value).then(res => {
@@ -282,10 +290,18 @@ let app = new Vue({
     // 获取AccessToken
     getAccessToken () {
       let value = {
+        // dev环境
+        // "user": "jiashicangjiekou",
+        // "apptoken": this.app_token,
+        // "tenantid": "gydev",
+        // "accountId": "1614416231203341312",
+        // "usertype": "UserName"
+
+        // SIT环境
         "user": "jiashicangjiekou",
-        "apptoken": this.app_token,
-        "tenantid": "gydev",
-        "accountId": "1614416231203341312",
+        "apptoken": "ee196889-9030-41ae-beda-1c3305890988",
+        "tenantid": "test",
+        "accountId": "1484008912330950656",
         "usertype": "UserName"
       }
       post('/ierp/api/login.do', value).then(res => {
@@ -310,7 +326,7 @@ let app = new Vue({
         }
         post('/ierp/kapi/v2/mdnb/mdnb_das/Data/CockpitScreen', value).then(res => {
           this.companyList = res.data.map(item => {
-            return { name: item.orgName, id: item.orgNumber,orgLogoNum:item.orgLogoNum }
+            return { name: item.orgName, id: item.orgNumber, orgLogoNum: item.orgLogoNum }
           })
           this.commonOption.xAxis.data = this.companyList.map(item => item.name)
           resolve(1);
@@ -454,7 +470,7 @@ let app = new Vue({
             c1[0].push(item['ZBPZ0035'])
             c1[1].push(item['ZBPZ0039'])
           })
-          console.log(c1,'核心指标检测')
+          console.log(c1, '核心指标检测')
           // 各省属企业人工成本利润率
           c2[1] = []
           c2[0] = []