فهرست منبع

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

l1448442195@163.com 1 سال پیش
والد
کامیت
76889dcdd4
8فایلهای تغییر یافته به همراه39 افزوده شده و 25 حذف شده
  1. 2 2
      .drone.yml
  2. 0 1
      README.md
  3. 16 1
      index.html
  4. BIN
      manpower/images/center-top1.png
  5. BIN
      manpower/images/center-top2.png
  6. BIN
      manpower/images/center-top3.png
  7. 3 3
      manpower/index.html
  8. 18 18
      manpower/js/index.js

+ 2 - 2
.drone.yml

@@ -16,7 +16,7 @@ steps:
       #dockerfile: Dockerfile
       repo: harbor.sxidc.com/fs/${DRONE_REPO_NAME//_/-}
       registry: harbor.sxidc.com
-      tags: ${DRONE_COMMIT_BRANCH/master/latest}
+      tags: ${DRONE_COMMIT_BRANCH/master/latest}-${DRONE_BUILD_NUMBER}
       username:
         from_secret: harbor_username
       password:
@@ -30,7 +30,7 @@ steps:
       repo_namespace: ywzx
       repo_name: ${DRONE_REPO_NAME//_/-}
       yaml: ./deployment-app.yaml
-      image_addr: harbor.sxidc.com/fs/${DRONE_REPO_NAME//_/-}:${DRONE_COMMIT_BRANCH/master/latest}
+      image_addr: harbor.sxidc.com/fs/${DRONE_REPO_NAME//_/-}:${DRONE_COMMIT_BRANCH/master/latest}-${DRONE_BUILD_NUMBER}
       kubeconfig:
         from_secret: test_kubeconfig
       

+ 0 - 1
README.md

@@ -1,6 +1,5 @@
 ## pc_kingdee_large_screen
 
 ### 金蝶大屏项目(人力manpower、投资中心investment、焦煤)
-cesh
   
 

+ 16 - 1
index.html

@@ -1 +1,16 @@
-1
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no">
+  </head>
+  <body>
+    <a href="./cokingCoal/cokingCoalD.html">大屏1</a>
+    <a href="./investment/investHome.html">大屏2</a>
+    <a href="./manpower/index.html">大屏3</a>
+  </body>
+</html>  

BIN
manpower/images/center-top1.png


BIN
manpower/images/center-top2.png


BIN
manpower/images/center-top3.png


+ 3 - 3
manpower/index.html

@@ -35,7 +35,7 @@
         <dv-border-box-8 :dur="10" style="flex: 1;">
           <div class="my-panel">
             <div class="panel-title">
-              <span class="text">投资关键指标</span>
+              <span class="text">定机构</span>
             </div>
             <div class="content flex">
               <div ref="echartL1" style="flex: 1;height: 100%;"></div>
@@ -138,11 +138,11 @@
                 </div>
                 <div class="flex">
                   <div>
-                    <p>{{numFormat(centerData.changeInfo[2].value2)}}</p>
+                    <p style="color:#FBE139">{{numFormat(centerData.changeInfo[2].value2)}}</p>
                     <p>改革前在册职工数</p>
                   </div>
                   <div>
-                    <p>{{centerData.changeInfo[2].value3}}<span>万</span></p>
+                    <p style="color:#17AC76">{{centerData.changeInfo[2].value3}}<span>万</span></p>
                     <p>在册职工压缩数</p>
                   </div>
                 </div>

+ 18 - 18
manpower/js/index.js

@@ -593,7 +593,7 @@ let app = new Vue({
         series: [
           {
             name: '当前全员劳动生产率(万/人)',
-            type: 'bar',
+            type: 'line',
             barWidth: 15,
             itemStyle: {
               normal: {
@@ -604,7 +604,7 @@ let app = new Vue({
                   },
                   {
                     offset: 1,
-                    color: '#082550',
+                    color: '#43ede3',
                   },
                 ]),
               },
@@ -628,7 +628,7 @@ let app = new Vue({
                   },
                   {
                     offset: 1,
-                    color: '#082550',
+                    color: '#b889ea',
                   },
                 ]),
               },
@@ -647,18 +647,18 @@ let app = new Vue({
                 //     color: '#fff',
                 //   },
                 // },
-                {
-                  name: '央企平均水平(万/人)',
-                  yAxis: 69.4,
-                  lineStyle: {
-                    color: '#fff',
-                  },
-                  label: {
-                    formatter: '{b}',
-                    position: 'middle',
-                    color: '#fff',
-                  },
-                },
+                // {
+                //   name: '央企平均水平(万/人)',
+                //   yAxis: 69.4,
+                //   lineStyle: {
+                //     color: '#fff',
+                //   },
+                //   label: {
+                //     formatter: '{b}',
+                //     position: 'middle',
+                //     color: '#fff',
+                //   },
+                // },
               ],
               label: {
                 distance: [20, 8],
@@ -696,7 +696,7 @@ let app = new Vue({
         series: [
           {
             name: '当前人工成本利润率',
-            type: 'bar',
+            type: 'line',
             barWidth: 15,
             itemStyle: {
               normal: {
@@ -707,7 +707,7 @@ let app = new Vue({
                   },
                   {
                     offset: 1,
-                    color: '#082550',
+                    color: '#5e7ae9',
                   },
                 ]),
               },
@@ -726,7 +726,7 @@ let app = new Vue({
                   },
                   {
                     offset: 1,
-                    color: '#082550',
+                    color: '#b889ea',
                   },
                 ]),
               },