Merge branch 'main' of https://git.sxidc.com/kingdee_large_screen/pc_kingdee_large_screen

cokingCoal/styles/cokingCoalB.css

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

investment/investHome3compound.html

@@ -36,7 +36,7 @@
               <div class="top-left-bottom flex items-center justify-between">
                 <div class="top-left-bottom-left flex items-center justify-center">
                   <img src="./images3/light.png" alt="">
-                  <div class="num">651<span style="font-size: 14px;font-weight: normal;">个</span></div>
+                  <div class="num">442<span style="font-size: 14px;font-weight: normal;">个</span></div>
                 </div>
                 <div class="top-left-bottom-right flex items-center">
                   <div ref="tl1" style="height:100%;width: 25%;"></div>

investment/investHomeChild.html

@@ -25,10 +25,12 @@
     <dv-full-screen-container>
       <img src="./images3/back.png" alt="" class="goBack" @click="handleGoBack()">
       <header class="my-header">
-        <span>投资管理数智中心</span>
+        <span>数智化投资管理驾驶舱</span>
         <span class="right">{{time}}</span>
       </header>
-      <dv-scroll-board :config="config5" style="width:100%;height:100%" />
+      <div class="main">
+        <dv-scroll-board :config='config' style="width:100%;height:100%" />
+      </div>
     </dv-full-screen-container>
   </div>
   <script src="./js/investHomeChild.js"></script>

investment/js/investHome3compound.js

@@ -72,7 +72,7 @@ let app = new Vue({
           elements: [{
             type: "text",
             left: "center",
-            top: "77%",
+            top: "72%",
             style: {
               text: "投资类别",
               textAlign: "center",
@@ -100,8 +100,8 @@ let app = new Vue({
               position: 'center'
             },
             data: [
-              { value: 1048, name: '数据1' },
-              { value: 735, name: '数据2' }
+              { value: 1169.91, name: '固定资产投资' },
+              { value: 154.17, name: '股权投资' }
             ],
           },
         ],

investment/js/investHomeChild.js

@@ -4,20 +4,56 @@ let app = new Vue({
     return {
       time: '',
       timer: '',
+      config: '',
       config5: {
         rowNum: 9,
         waitTime: 2000,
-        header: ["项目名称", "所属组织", '实施主体', '建设性质（新建/续建）', '产业类别', '建设地点', '2022年投资完成额（亿）'],
+        header: ["项目名称", "所属组织", '实施主体', '建设性质（新建/续建）', '产业类别', '建设地点', '2022年投资完成额（万元）'],
         data: [
-          ["青银二广高速公路太原联络线建设PPP项目", "交控集团", "山西路桥建设集团有限公司", "新建", "交通运输业", "山西省太原市、晋中市", "14.81"],
-          ["国道241、省道岚马线汾河水库段改线工程", "交控集团", "太原国省道汾河水库段建设管理有限公司", "续建", "交通运输业", "山西省 太原市、吕梁市", "16.53"],
-          ["路桥科技中心", "交控集团", "山西路桥集团多经营有限公司", "续建", "建筑房地产", "山西省太原市", "0.81"],
-          ["路桥科研基地", "交控集团", "山西路桥集团多经有限公司", "续建", "建筑房地产", "山西省太原市", "0.66"],
-          ["武宿高速充电站建设", "交控集团", "山西交通运输投融资集团有限责任公司", "新建", "新能源产业", "山西省太原市", "0.01"],
-          ["山西交通研创商务基地项目", "交控集团", "山西交通物流集团有限公司", "续建", "建筑房地产", "山西省太原市", "0.41"],
-          ["山西省交通科学研究院产业化基地", "交控集团", "山西省交通科技研发有限公司", "续建", "建筑房地产", "山西省太原市武洛街27号", "0.32"],
-          ["太长高速公路太原南收费站（二期工程暨龙城服务区）项目", "交控集团", "山西省交通开发投资集团有限公司龙城服务区发展分公司", "续建", "建筑房地产", "山西省太原市", "0.36"],
-          ["山西转型综改示范区中小企业产业园项目", "交控集团", "山西交投综改园区开发有限公司", "续建", "建筑房地产", "山西省太原市", "1.44"]
+          ["青银二广高速公路太原联络线建设PPP项目", "交控集团", "山西路桥建设集团有限公司", "新建", "交通运输业", "山西省太原市、晋中市", "148086"],
+          ["国道241、省道岚马线汾河水库段改线工程", "交控集团", "太原国省道汾河水库段建设管理有限公司", "续建", "交通运输业", "山西省 太原市、吕梁市", "165314.33"],
+          ["路桥科技中心", "交控集团", "山西路桥集团多经营有限公司", "续建", "建筑房地产", "山西省太原市", "8098.26"],
+          ["路桥科研基地", "交控集团", "山西路桥集团多经有限公司", "续建", "建筑房地产", "山西省太原市", "6596.56"],
+          ["武宿高速充电站建设", "交控集团", "山西交通运输投融资集团有限责任公司", "新建", "新能源", "山西省太原市", "100"],
+          ["山西交通研创商务基地项目", "交控集团", "山西交通物流集团有限公司", "续建", "建筑房地产", "山西省太原市", "4097"],
+          ["山西省交通科学研究院产业化基地", "交控集团", "山西省交通科技研发有限公司", "续建", "建筑房地产", "山西省太原市武洛街27号", "3242"],
+          ["太长高速公路太原南收费站（二期工程暨龙城服务区）项目", "交控集团", "山西省交通开发投资集团有限公司龙城服务区发展分公司", "续建", "建筑房地产", "山西省太原市", "3580"],
+          ["山西转型综改示范区中小企业产业园项目", "交控集团", "山西交投综改园区开发有限公司", "续建", "建筑房地产", "山西省太原市", "14432"]
+        ],
+        align: ["center", "center", "center", "center", "center", "center", "center"],
+        headerBGC: "#153A62",
+        oddRowBGC: "#061F42",
+        evenRowBGC: "#0C284A",
+      },
+      config6: {
+        rowNum: 9,
+        waitTime: 2000,
+        header: ["项目名称", "所属组织", '实施主体', '产业类别I级', '产业类别II级', '2022年投资完成额（万元）'],
+        data: [
+          ["6万吨/年PBAT项目", "华阳新材", "华阳新材", "战略新兴", "新材料", "20340"],
+          ["2万吨/年生物降解改性材料及塑料制品项目", "华阳新材", "华阳新材", "战略新兴", "新材料", "5270"],
+          ["2万吨/年全系列生物降解新材料项目", "华阳新材", "华阳新材", "战略新兴", "新材料", "5560"],
+          ["30万吨/年PBAT项目一期10万吨PBAT", "华阳新材", "华阳新材", "战略新兴", "新材料", "0"],
+          ["30万吨/年PBAT项目一期20万吨BDO", "华阳新材", "华阳集团", "战略新兴", "新材料", "0"],
+          ["开元煤层气发电项目", "华阳新材", "华阳股份", "战略新兴", "煤层气", "880"],
+          ["平舒翟下庄煤层气发电项目", "华阳新材", "华阳股份", "战略新兴", "煤层气", "570"],
+          ["5GW高效光伏组件制造项目一期2GW", "华阳新材", "新阳公司", "战略新兴", "新能源", "10000"],
+          ["钠离子电池正极材料千吨级生产项目", "华阳新材", "新阳公司", "战略新兴", "新能源", "6060"],
+          ["钠离子电池负极材料千吨级生产项目", "华阳新材", "新阳公司", "战略新兴", "新能源", "4080"],
+          ["1GWh钠离子Pack电池生产线建设项目", "华阳新材", "新阳公司", "战略新兴", "新能源", "2790"],
+          ["天成光储网充项目", "华阳新材", "新阳公司", "战略新兴", "新能源", "1680"],
+          ["华豹绿色涂层材料智造项目", "华阳新材", "阳煤华豹", "战略新兴", "新材料", "0"],
+          ["宏厦三建绿色建材工业园区项目", "华阳新材", "宏厦三建", "战略新兴", "新材料", "2550"],
+          ["气凝胶科创城标准化厂房项目", "华阳新材", "华阳科创城", "战略新兴", "新材料", "0"],
+          ["超净滤材项目", "华阳新材", "华阳科创城", "战略新兴", "新材料", "5510"],
+          ["华阳集团网络安全工作顶层设计及整体整改项目", "华阳新材", "华阳集团", "战略新兴", "新一代信息技术", "814"],
+          ["财务共享二期项目", "华阳新材", "华阳集团", "战略新兴", "新一代信息技术", "0"],
+          ["山西科技创新城阳煤设计研发中心项目", "华阳新材", "华阳集团", "战略新兴", "其他", "12930"],
+          ["洪城北路与平阳路节点立交工程", "华阳新材", "华阳集团", "战略新兴", "其他", "0"],
+          ["阳煤西110kv变电站及线路建设工程", "华阳新材", "华阳股份", "战略新兴", "其他", "7060"],
+          ["一矿高家沟风井矿井瓦斯利用工程项目", "华阳新材", "华阳股份", "战略新兴", "煤层气", "0"],
+          ["郊区35kV输变电工程", "华阳新材", "新阳公司", "战略新兴", "其他", "1250"],
+          ["环境保护及治理", "华阳新材", "华阳股份", "战略新兴", "节能环保", "5890"]
         ],
         align: ["center", "center", "center", "center", "center", "center", "center"],
         headerBGC: "#153A62",
@@ -27,6 +63,7 @@ let app = new Vue({
     }
   },
   created () {
+    this.getUrlParams()
     this.time = formatDate()
     this.timer = setInterval(() => {
       this.time = formatDate()
@@ -38,14 +75,12 @@ let app = new Vue({
     }
   },
   mounted () {
-    this.getUrlParams()
   },
   methods: {
     handleGoBack () {
       window.history.go(-1)
     },
     getUrlParams () {
-      console.log(window.location.href)
       let url = window.location.href
       // 通过 ? 分割获取后面的参数字符串
       let urlStr = url.split('?')[1]
@@ -58,7 +93,11 @@ let app = new Vue({
         let arr = paramsArr[i].split('=')
         obj[arr[0]] = arr[1];
       }
-      console.log(obj)
+      if (obj.type == 1) {
+        this.config = { ...this.config5 }
+      } else if (obj.type == 2) {
+        this.config = { ...this.config6 }
+      }
     }
   },
 })

investment/styles/investHomeChild.css

@@ -103,7 +103,7 @@ a {
   padding: 15px;
   display: flex;
   height: calc(100vh - 25px);
-  background: url('../images/content-bg.png') no-repeat center bottom;
+  /* background: url('../images/content-bg.png') no-repeat center bottom; */
   background-size: 100% 100%;
   display: flex;
   padding-bottom: 65px;