zhbyyy 2 жил өмнө
parent
commit
f008276e40

+ 1 - 0
cokingCoal/cokingCoalA.html

@@ -16,6 +16,7 @@
   <script src="./libs/axios.min.js"></script>
   <script src="./js/request.js"></script>
   <script src="./libs/echarts-tooltip-carousel.js"></script>
+  <script src="./js/dataA.js"></script>
 </head>
 
 <body>

+ 3 - 20
cokingCoal/js/cokingCoalA.js

@@ -314,7 +314,7 @@ let app = new Vue({
           },
         },
         xAxis: {
-          data: ["管理序列", "技术序列", "操作序列"],
+          data: echarts1[0],
           axisTick: {
             show: false,
           },
@@ -372,7 +372,7 @@ let app = new Vue({
           {
             name: "",
             type: "bar",
-            data: [1200, 680, 562, 268, 717, 843, 987, 126, 723, 569],
+            data: echarts1[1],
             showBackground: false,
             backgroundStyle: {
               color: "#18416F",
@@ -414,24 +414,7 @@ let app = new Vue({
     },
     initChartR1 () {
       let myChart = echarts.init(this.$refs['echartR1'])
-      data = [
-        {
-          name: "高级-正高级",
-          value: 754,
-        },
-        {
-          name: "高级-副高级",
-          value: 611,
-        },
-        {
-          name: "中级",
-          value: 400,
-        },
-        {
-          name: "初级-助理级",
-          value: 200,
-        },
-      ];
+      data = echarts2;
       arrName = getArrayValue(data, "name");
       arrValue = getArrayValue(data, "value");
       sumValue = eval(arrValue.join("+"));

+ 21 - 0
cokingCoal/js/dataA.js

@@ -0,0 +1,21 @@
+let echarts1 = [
+   ["管理序列", "技术序列", "操作序列"],  [1200, 680, 562] 
+]
+let echarts2 = [
+  {
+    name: "高级-正高级",
+    value: 754,
+  },
+  {
+    name: "高级-副高级",
+    value: 611,
+  },
+  {
+    name: "中级",
+    value: 400,
+  },
+  {
+    name: "初级-助理级",
+    value: 200,
+  },
+]

+ 59 - 58
investment/js/investHome5.js

@@ -249,7 +249,7 @@ let app = new Vue({
           bottom: '15%',
         },
         yAxis: {
-          data: ['备案', '特别监管'],
+          type:'value',
           splitLine: {
             show: true,
             lineStyle: {
@@ -273,7 +273,7 @@ let app = new Vue({
           },
         },
         xAxis: {
-          data: ['项目储备', '项目立项', '可研论证', '投资决策'],
+          type:'value',
           axisLine: {
             show: true, //隐藏X轴轴线
             lineStyle: {
@@ -293,62 +293,63 @@ let app = new Vue({
           },
         },
         series: [
-          {
-            name: '特别监管',
-            type: 'scatter',
-            symbol: 'circle',//'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'
-            symbolSize: function (data) {
-              return Math.sqrt(data[2]) * 3;
-            },
-            label: {
-              emphasis: {
-                show: true,
-                formatter: function (param) {
-                  return param.data[2];
-                },
-                position: 'top'
-              }
-            },
-            itemStyle: {
-              normal: {
-                color: '#40A9FF'
-              }
-            },
-            data: [
-              ['项目储备', '特别监管', 14, 12.05],
-              ['项目立项', '特别监管', 2, 1.25],
-              ['可研论证', '特别监管', 10, 32.69],
-              ['投资决策', '特别监管', 15, 28.53],
-            ]
-          },
-          {
-            name: '备案',
-            type: 'scatter',
-            symbol: 'circle',//'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'
-            symbolSize: function (data) {
-              return Math.sqrt(data[2]) * 3;
-            },
-            label: {
-              emphasis: {
-                show: true,
-                formatter: function (param) {
-                  return param.data[2];
-                },
-                position: 'top'
-              }
-            },
-            itemStyle: {
-              normal: {
-                color: '#45DAD1'
-              }
-            },
-            data: [
-              ['项目储备', '备案', 27, 23.86],
-              ['项目立项', '备案', 1, 1.05],
-              ['可研论证', '备案', 14, 18.46],
-              ['投资决策', '备案', 40, 38.86],
-            ]
-          },
+          // {
+          //   name: '特别监管',
+          //   type: 'scatter',
+          //   symbol: 'circle',//'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'
+          //   symbolSize: function (data) {
+          //     return Math.sqrt(data[2]) * 3;
+          //   },
+          //   label: {
+          //     emphasis: {
+          //       show: true,
+          //       formatter: function (param) {
+          //         return param.data[2];
+          //       },
+          //       position: 'top'
+          //     }
+          //   },
+          //   itemStyle: {
+          //     normal: {
+          //       color: '#40A9FF'
+          //     }
+          //   },
+          //   data: [
+          //     ['项目储备', '特别监管', 14, 12.05],
+          //     ['项目立项', '特别监管', 2, 1.25],
+          //     ['可研论证', '特别监管', 10, 32.69],
+          //     ['投资决策', '特别监管', 15, 28.53],
+          //   ]
+          // },
+          // {
+          //   name: '备案',
+          //   type: 'scatter',
+          //   symbol: 'circle',//'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'
+          //   symbolSize: function (data) {
+          //     return Math.sqrt(data[2]) * 3;
+          //   },
+          //   label: {
+          //     emphasis: {
+          //       show: true,
+          //       formatter: function (param) {
+          //         return param.data[2];
+          //       },
+          //       position: 'top'
+          //     }
+          //   },
+          //   itemStyle: {
+          //     normal: {
+          //       color: '#45DAD1'
+          //     }
+          //   },
+          //   data: [
+          //     ['项目储备', '备案', 27, 23.86],
+          //     ['项目立项', '备案', 1, 1.05],
+          //     ['可研论证', '备案', 14, 18.46],
+          //     ['投资决策', '备案', 40, 38.86],
+          //   ]
+          // },
+          
         ]
       }
       myChart.setOption(option)

+ 2 - 1
manpowerPort/index.html

@@ -295,8 +295,9 @@
       </div>
     </div>
     <div class="footer">
-      <a class="item" v-for="(item,index) in companyList" :key="index" @click="handleGoPage(item.id,item.name)"><img
+      <a class="item" v-for="(item,index) in companyList.slice(0, 8)" :key="index" @click="handleGoPage(item.id,item.name)"><img
           :src="`./images/logos/${item.orgLogoNum}.png`"></img> {{item.name}}</a>
+          <div style="font-weight: bold;display: flex;align-items: center;"><span>. . .</span></div>
     </div>
     <!-- 公共弹窗 -->
     <div class="tip" @click="showTip = false" v-if="showTip && tipNum != 3">

+ 3 - 2
manpowerPort/index2.html

@@ -271,8 +271,9 @@
       </div>
     </div>
     <div class="footer">
-      <a class="item" v-for="(item,index) in companyList" :key="index"
-        @click="handleGoPage(item.id,item.name)">{{item.name}}</a>
+      <a class="item" v-for="(item,index) in companyList.slice(0, 8)" :key="index" @click="handleGoPage(item.id,item.name)"><img
+        :src="`./images/logos/${item.orgLogoNum}.png`"></img> {{item.name}}</a>
+        <div style="font-weight: bold;display: flex;align-items: center;"><span>. . .</span></div>
     </div>
 
     <div class="tip" @click="showTip = false" v-if="showTip">

+ 3 - 2
manpowerPort/index3.html

@@ -269,8 +269,9 @@
       </div>
     </div>
     <div class="footer" style="width: 70%;">
-      <a class="item" v-for="(item,index) in companyList" :key="index"
-        @click="handleGoPage(item.id,item.name)">{{item.name}}</a>
+      <a class="item" v-for="(item,index) in companyList.slice(0, 8)" :key="index" @click="handleGoPage(item.id,item.name)"><img
+        :src="`./images/logos/${item.orgLogoNum}.png`"></img> {{item.name}}</a>
+        <div style="font-weight: bold;display: flex;align-items: center;"><span>. . .</span></div>
     </div>
     <div class="tip" @click="showTip = false" v-if="showTip">
       <div class="tip-box">

+ 3 - 2
manpowerPort/js/index.js

@@ -227,6 +227,8 @@ let app = new Vue({
     console.log(this.twinkleR6)
   },
   mounted () {
+    let a = [1,2,3,4,5,6,7]
+    console.log(a.slice(1,3,'??????'))
     if (!sessionStorage.getItem('accounts', this.accounts)) {
       window.location.href = './login/login.html'
       return
@@ -299,7 +301,7 @@ let app = new Vue({
 
         // SIT环境
         "user": "jiashicangjiekou",
-        "apptoken": "ee196889-9030-41ae-beda-1c3305890988",
+        "apptoken": this.app_token,
         "tenantid": "test",
         "accountId": "1484008912330950656",
         "usertype": "UserName"
@@ -470,7 +472,6 @@ let app = new Vue({
             c1[0].push(item['ZBPZ0035'])
             c1[1].push(item['ZBPZ0039'])
           })
-          console.log(c1, '核心指标检测')
           // 各省属企业人工成本利润率
           c2[1] = []
           c2[0] = []

+ 3 - 2
manpowerPort/js/request.js

@@ -57,7 +57,8 @@ function getMinioUrl () {
  */
 const httpRequest = axios.create({
   // baseURL: 'http://192.168.1.2:8080', // 测试环境
-  baseURL: 'http://172.21.9.23:8081', // 生产环境
+  // baseURL: 'http://172.21.9.23:8081', // SIT环境
+  baseURL: 'http://172.21.9.23:30001/api/', // SIT环境解决跨域
   timeout: 3 * 60 * 1000, // 3分钟等待
   withCredentials: true // 携带cookie
 })
@@ -66,7 +67,7 @@ const httpRequest = axios.create({
 httpRequest.interceptors.request.use(
   function (config) {
     if(config.data.access_token){
-      config.headers['access_token'] = config.data.access_token
+      config.headers['accessToken'] = config.data.access_token
     }
     // if (!isLocalEnv()) {
     //   if (getQueryVariable('token')) {