unknown преди 2 години
родител
ревизия
48c905aff5
променени са 8 файла, в които са добавени 292 реда и са изтрити 218 реда
  1. 18 25
      .drone.yml
  2. 1 0
      README.md
  3. 61 0
      deployment-app.yaml
  4. 1 0
      index.html
  5. 199 193
      manpower/index.html
  6. 0 0
      manpower/js/index.js
  7. 12 0
      manpower/js/zhb.js
  8. 0 0
      manpower/libs/datav.min.js

+ 18 - 25
.drone.yml

@@ -3,15 +3,18 @@ type: docker
 name: 自动部署
 
 clone:
-  disable: true # 禁用自带clone
+  disable: false # 禁用自带clone
+  
+workspace:
+  path: /drone/src  
 
 steps:
   - name: 镜像打包
     pull: if-not-exists
     image: plugins/docker
     settings:
-      #dockerfile: ./docker/ 默认根目录
-      repo: harbor.sxidc.com/ywzx/${DRONE_REPO_NAME//_/-}
+      #dockerfile: Dockerfile
+      repo: harbor.sxidc.com/fs/${DRONE_REPO_NAME//_/-}
       registry: harbor.sxidc.com
       tags: ${DRONE_COMMIT_BRANCH/master/latest}
       username:
@@ -19,29 +22,19 @@ steps:
       password:
         from_secret: harbor_password
 
-  - name: ssh-commands
+  # 使用ssh访问主机制作镜像并运行
+  - name: 集群部署
     pull: if-not-exists
-    image: appleboy/drone-ssh:1.5.7
+    image: bh90210/dron8s:latest
     settings:
-      host: test_host
-      username: test_user
-      password:
-        # 从drone仓库配置中秘密空间读取密码
-        from_secret: test_pwd
-      port: 22
-      script:
-        - echo =======暂停容器=======
-        - docker stop `docker ps -a | grep  kingdee_big_screen | awk '{print $1}' `
-        - echo =======暂停旧容器和镜像=======
-        - docker rm -f `docker ps -a | grep kingdee_big_screen | awk '{print $1}' `
-        - docker rmi `docker images | grep harbor.sxidc.com/fs/kingdee_big_screen | awk '{print $3}' `
-        - echo =======开始部署应用=======
-        - docker run -d -p 10003:80  --name kingdee_big_screen harbor.sxidc.com/fs/kingdee_big_screen
-        - echo =======清理构建文件,建议保留=======
-        - echo =======部署成功=======
-
+      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}
+      kubeconfig:
+        from_secret: test_kubeconfig
+      
+      
 trigger:
   branch:
-    - master
-  event:
-    - promote
+    - main   

+ 1 - 0
README.md

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

+ 61 - 0
deployment-app.yaml

@@ -0,0 +1,61 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{.repo_namespace}}
+
+---
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{.repo_name}}
+  namespace: {{.repo_namespace}}
+spec:
+  selector:
+    matchLabels:
+      app: {{.repo_name}}
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: {{.repo_name}}
+      annotations:
+        dapr.io/enabled: "true"
+        dapr.io/app-id: {{.repo_name}}
+        dapr.io/app-port: "80"  
+    spec:
+      imagePullSecrets:
+        - name: harbor-registry-secret
+      containers:
+        - name: {{.repo_name}}
+          image: {{.image_addr}}
+          ports:
+            - containerPort: 80
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{.repo_name}}-svc
+  namespace: {{.repo_namespace}}
+spec:
+  selector:
+    app: {{.repo_name}}
+  type: NodePort
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+      nodePort: 30016
+
+---
+# 私有仓库
+apiVersion: v1
+kind: Secret
+metadata:
+  name: harbor-registry-secret
+  namespace: {{.repo_namespace}}
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: eyJhdXRocyI6eyJoYXJib3Iuc3hpZGMuY29tIjp7InVzZXJuYW1lIjoiZHJvbmUiLCJwYXNzd29yZCI6IkRyb25lMTIzNDU2IiwiYXV0aCI6IlpISnZibVU2UkhKdmJtVXhNak0wTlRZPSJ9fX0=

+ 1 - 0
index.html

@@ -0,0 +1 @@
+1

+ 199 - 193
manpower/index.html

@@ -1,223 +1,229 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <!-- 引入样式 -->
-    <link rel="stylesheet" href="./styles/element-ui@2.15.9.css" />
-    <link rel="stylesheet" href="./styles/normalize.css" />
-    <link rel="stylesheet" href="./styles/index.css" />
-    <!-- 引入js -->
-    <script src="./libs/vue@2.7.10.js"></script>
-    <script src="https://unpkg.com/@jiaminghi/data-view/dist/datav.min.vue.js"></script>
-    <script src="./libs/echarts.min.js"></script>
-    <script src="./libs/element-ui@2.15.9.js"></script>
-    <script src="./libs/axios.min.js"></script>
-    <script src="./libs/lodash.min.js"></script>
-    <script src="./js/request.js"></script>
-    <script src="./js/data.js"></script>
-    <script src="./js/fjx.js"></script>
-    <script src="./js/li.js"></script>
-  </head>
-  <body>
-    <div id="app">
-      <header class="my-header">
-        <span>数智人力&nbsp;&nbsp;智慧山西</span>
-        <span class="right">{{time}}</span>
-      </header>
-      <div class="main">
-        <div class="left">
-          <dv-border-box-8 :dur="10" style="flex: 1;">
-            <div class="my-panel">
-              <div class="panel-title">
-                <span class="text">定机构</span>
-              </div>
-              <div class="content flex">
-                <div ref="echartL1" style="flex: 1;height: 100%;"></div>
-                <div ref="echartL2" style="flex: 1;height: 100%;"></div>
-              </div>
+
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <!-- 引入样式 -->
+  <link rel="stylesheet" href="./styles/element-ui@2.15.9.css" />
+  <link rel="stylesheet" href="./styles/normalize.css" />
+  <link rel="stylesheet" href="./styles/index.css" />
+  <!-- 引入js -->
+  <script src="./libs/vue@2.7.10.js"></script>
+  <!-- <script src="https://unpkg.com/@jiaminghi/data-view/dist/datav.min.vue.js"></script> -->
+  <script src="./libs/echarts.min.js"></script>
+  <script src="./libs/datav.min.js"></script>
+  <script src="./libs/element-ui@2.15.9.js"></script>
+  <script src="./libs/axios.min.js"></script>
+  <script src="./libs/lodash.min.js"></script>
+  <script src="./js/request.js"></script>
+  <script src="./js/data.js"></script>
+  <script src="./js/zhb.js"></script>
+  <script src="./js/li.js"></script>
+  <script src="./js/fjx.js"></script>
+</head>
+
+<body>
+  <div id="app">
+    <header class="my-header">
+      <span>数智人力&nbsp;&nbsp;智慧山西</span>
+      <span class="right">2023-1-16 10:23:00</span>
+    </header>
+    <div class="main">
+      <div class="left">
+        <dv-border-box-8 :dur="10" style="flex: 1;">
+          <div class="my-panel">
+            <div class="panel-title">
+              <span class="text">投资关键指标</span>
             </div>
-          </dv-border-box-8>
-          <dv-border-box-8 :dur="11" style="flex: 1;">
-            <div class="my-panel">
-              <div class="panel-title">
-                <span class="text">定职数</span>
-              </div>
-              <div class="content flex">
-                <div ref="echartL3" style="flex: 1;height: 100%;"></div>
-                <div ref="echartL4" style="flex: 1;height: 100%;"></div>
-              </div>
+            <div class="content flex">
+              <div ref="echartL1" style="flex: 1;height: 100%;"></div>
+              <div ref="echartL2" style="flex: 1;height: 100%;"></div>
             </div>
-          </dv-border-box-8>
-          <dv-border-box-8 :dur="12" style="flex: 2;">
-            <div class="my-panel">
-              <div class="panel-title">
-                <span class="text">定员额</span>
-              </div>
-              <div class="content flex flex-wrap">
-                <div ref="echartL5" style="flex: 0 0 49.9%;height: 50%;"></div>
-                <div ref="echartL6" style="flex: 0 0 49.9%;height: 50%;"></div>
-                <div ref="echartL7" style="flex: 0 0 49.9%;height: 50%;"></div>
-                <div ref="echartL8" style="flex: 0 0 49.9%;height: 50%;"></div>
-              </div>
+          </div>
+        </dv-border-box-8>
+        <dv-border-box-8 :dur="11" style="flex: 1;">
+          <div class="my-panel">
+            <div class="panel-title">
+              <span class="text">定职数</span>
             </div>
-          </dv-border-box-8>
-        </div>
-        <div class="center">
-          <div class="top" v-if="centerData">
-            <div class="box">
-              <img src="./images/center-top1.png"/>
-              <div>
-                <p>架构数</p>
-                <p><i style="color: #45DAD1">{{numFormat(centerData.info.value1)}}</i></p>
-              </div>
+            <div class="content flex">
+              <div ref="echartL3" style="flex: 1;height: 100%;"></div>
+              <div ref="echartL4" style="flex: 1;height: 100%;"></div>
             </div>
-            <div class="box">
-              <img src="./images/center-top2.png"/>
-              <div>
-                <p>岗位数</p>
-                <p><i style="color: #8BA2FF">{{numFormat(centerData.info.value2)}}</i></p>
-              </div>
+          </div>
+        </dv-border-box-8>
+        <dv-border-box-8 :dur="12" style="flex: 2;">
+          <div class="my-panel">
+            <div class="panel-title">
+              <span class="text">定员额</span>
             </div>
-            <div class="box">
-              <img src="./images/center-top3.png"/>
-              <div>
-                <p>总人数</p>
-                <p><i style="color: #69C0FF">{{numFormat(centerData.info.value3)}}</i></p>
-              </div>
+            <div class="content flex flex-wrap">
+              <div ref="echartL5" style="flex: 0 0 49.9%;height: 50%;"></div>
+              <div ref="echartL6" style="flex: 0 0 49.9%;height: 50%;"></div>
+              <div ref="echartL7" style="flex: 0 0 49.9%;height: 50%;"></div>
+              <div ref="echartL8" style="flex: 0 0 49.9%;height: 50%;"></div>
             </div>
           </div>
-          <dv-border-box-8 :dur="10">
-            <div class="my-panel" v-if="centerData">
-              <div class="panel-title">
-                <span class="text">六定改革成效果展示</span>
-              </div>
-              <div class="content flex" style="padding: 10px;">
-                <div class="box-center">
-                  <div class="t">
-                    <p>{{centerData.changeInfo[0].value1}}<span>%</span></p>
-                    <p>总部机构压缩率</p>
+        </dv-border-box-8>
+      </div>
+      <div class="center">
+        <div class="top" v-if="centerData">
+          <div class="box">
+            <img src="./images/center-top1.png" />
+            <div>
+              <p>架构数</p>
+              <p><i style="color: #45DAD1">{{numFormat(centerData.info.value1)}}</i></p>
+            </div>
+          </div>
+          <div class="box">
+            <img src="./images/center-top2.png" />
+            <div>
+              <p>岗位数</p>
+              <p><i style="color: #8BA2FF">{{numFormat(centerData.info.value2)}}</i></p>
+            </div>
+          </div>
+          <div class="box">
+            <img src="./images/center-top3.png" />
+            <div>
+              <p>总人数</p>
+              <p><i style="color: #69C0FF">{{numFormat(centerData.info.value3)}}</i></p>
+            </div>
+          </div>
+        </div>
+        <dv-border-box-8 :dur="10">
+          <div class="my-panel" v-if="centerData">
+            <div class="panel-title">
+              <span class="text">六定改革成效</span>
+            </div>
+            <div class="content flex" style="padding: 10px;">
+              <div class="box-center">
+                <div class="t">
+                  <p>{{centerData.changeInfo[0].value1}}<span>%</span></p>
+                  <p>总部机构压缩率</p>
+                </div>
+                <div class="flex">
+                  <div>
+                    <p style="color:#FBE139">{{centerData.changeInfo[0].value2}}</p>
+                    <p>改革前总部机构平均数</p>
                   </div>
-                  <div class="flex">
-                    <div>
-                      <p style="color:#FBE139">{{centerData.changeInfo[0].value2}}</p>
-                      <p>改革前总部机构平均数</p>
-                    </div>
-                    <div>
-                      <p style="color:#17AC76">{{centerData.changeInfo[0].value3}}</p>
-                      <p>改革后总部机构平均数
-                      </p>
-                    </div>
+                  <div>
+                    <p style="color:#17AC76">{{centerData.changeInfo[0].value3}}</p>
+                    <p>改革后总部机构平均数
+                    </p>
                   </div>
                 </div>
-                <div class="box-center">
-                  <div class="t">
-                    <p>{{centerData.changeInfo[1].value1}}<span>%</span></p>
-                    <p>中层管理人数压缩率</p>
+              </div>
+              <div class="box-center">
+                <div class="t">
+                  <p>{{centerData.changeInfo[1].value1}}<span>%</span></p>
+                  <p>中层管理人数压缩率</p>
+                </div>
+                <div class="flex">
+                  <div>
+                    <p style="color:#FBE139">{{numFormat(centerData.changeInfo[1].value2)}}</p>
+                    <p>改革前中层管理人数</p>
                   </div>
-                  <div class="flex">
-                    <div>
-                      <p style="color:#FBE139">{{numFormat(centerData.changeInfo[1].value2)}}</p>
-                      <p>改革前中层管理人数</p>
-                    </div>
-                    <div>
-                      <p style="color:#17AC76">{{numFormat(centerData.changeInfo[1].value3)}}</p>
-                      <p>改革后中层管理人数</p>
-                    </div>
+                  <div>
+                    <p style="color:#17AC76">{{numFormat(centerData.changeInfo[1].value3)}}</p>
+                    <p>改革后中层管理人数</p>
                   </div>
                 </div>
-                <div class="box-center">
+              </div>
+              <div class="box-center">
+                <div>
+                  <p>{{centerData.changeInfo[2].value1}}<span>%</span></p>
+                  <p>在册职工压缩率</p>
+                </div>
+                <div class="flex">
                   <div>
-                     <p>{{centerData.changeInfo[2].value1}}<span>%</span></p>
-                    <p>在册职工压缩率</p>
+                    <p>{{numFormat(centerData.changeInfo[2].value2)}}</p>
+                    <p>改革前在册职工数</p>
                   </div>
-                  <div class="flex">
-                    <div>
-                       <p>{{numFormat(centerData.changeInfo[2].value2)}}</p>
-                      <p>改革前在册职工数</p>
-                    </div>
-                    <div>
-                      <p>{{centerData.changeInfo[2].value3}}<span>万</span></p>
-                      <p>在册职工压缩数</p>
-                    </div>
+                  <div>
+                    <p>{{centerData.changeInfo[2].value3}}<span>万</span></p>
+                    <p>在册职工压缩数</p>
                   </div>
                 </div>
               </div>
             </div>
-          </dv-border-box-8>
-          <dv-border-box-8 :dur="10">
-            <div class="my-panel">
-              <div class="panel-title">
-                <span class="text">核心指标展示</span>
-              </div>
-              <div class="content flex">
-                <div ref="echartC1" style="flex: 1;height: 100%;"></div>
-                <div ref="echartC2" style="flex: 1;height: 100%;"></div>
-              </div>
+          </div>
+        </dv-border-box-8>
+        <dv-border-box-8 :dur="10">
+          <div class="my-panel">
+            <div class="panel-title">
+              <span class="text">核心指标监测</span>
             </div>
-          </dv-border-box-8>
-          <dv-border-box-8 :dur="10">
-            <div class="my-panel">
-              <div class="panel-title">
-                <span class="text">工作数据分析中心</span>
-              </div>
-              <div class="content yujing">
-                <div class="flex1">
-                  <p class="s-title main-color">工作分析</p>
-                  <dv-scroll-board :config="storageRecordConfig" class="content" />
-                </div>
-                <div class="flex1">
-                  <p class="s-title main-color">数据库情况预警</p>
-                  <dv-scroll-board :config="storageRecordConfig2" class="content" />
-                </div>
-              </div>
+            <div class="content flex">
+              <div ref="echartC1" style="flex: 1;height: 100%;"></div>
+              <div ref="echartC2" style="flex: 1;height: 100%;"></div>
             </div>
-          </dv-border-box-8>
-         
-        </div>
-        <div class="right">
-          <dv-border-box-8 :dur="10" style="flex: 2">
-            <div class="my-panel">
-              <div class="panel-title">
-                <span class="text">定机制</span>
-              </div>
-              <div class="content flex flex-wrap">
-                <div ref="echartR1" style="flex: 0 0 49.9%;height: 50%;"></div>
-                <div ref="echartR2" style="flex: 0 0 49.9%;height: 50%;"></div>
-                <div ref="echartR3" style="flex: 0 0 49.9%;height: 50%;"></div>
-                <div ref="echartR4" style="flex: 0 0 49.9%;height: 50%;"></div>
-              </div>
+          </div>
+        </dv-border-box-8>
+        <dv-border-box-8 :dur="10">
+          <div class="my-panel">
+            <div class="panel-title">
+              <span class="text">分析预警中心</span>
             </div>
-          </dv-border-box-8>
-          <dv-border-box-8 :dur="11" style="flex: 1">
-            <div class="my-panel">
-              <div class="panel-title">
-                <span class="text">定薪酬</span>
+            <div class="content yujing">
+              <div class="flex1">
+                <p class="s-title main-color">工作台分析</p>
+                <dv-scroll-board :config="storageRecordConfig" class="content" />
               </div>
-              <div class="content flex">
-                <div ref="echartR5" style="flex: 1;height: 100%;"></div>
-                <div ref="echartR6" style="flex: 1;height: 100%;"></div>
+              <div class="flex1">
+                <p class="s-title main-color">数据库预警</p>
+                <dv-scroll-board :config="storageRecordConfig2" class="content" />
               </div>
             </div>
-          </dv-border-box-8>
-          <dv-border-box-8 :dur="12" style="flex: 1">
-            <div class="my-panel">
-              <div class="panel-title">
-                <span class="text">定任期</span>
-              </div>
-              <div class="content flex">
-                <div ref="echartR7" style="flex: 1;height: 100%;"></div>
-                <div ref="echartR8" style="flex: 1;height: 100%;"></div>
-              </div>
-            </div>  
-          </dv-border-box-8>
-        </div>
+          </div>
+        </dv-border-box-8>
+
       </div>
-      <div class="footer">
-        <a class="item" v-for="(item,index) in companyList" :key="index"><img :src="`./images/logos/logo${index+1}.png`"></img>  {{item.name}}</a>
+      <div class="right">
+        <dv-border-box-8 :dur="10" style="flex: 2">
+          <div class="my-panel">
+            <div class="panel-title">
+              <span class="text">定机制</span>
+            </div>
+            <div class="content flex flex-wrap">
+              <div ref="echartR1" style="flex: 0 0 49.9%;height: 50%;"></div>
+              <div ref="echartR2" style="flex: 0 0 49.9%;height: 50%;"></div>
+              <div ref="echartR3" style="flex: 0 0 49.9%;height: 50%;"></div>
+              <div ref="echartR4" style="flex: 0 0 49.9%;height: 50%;"></div>
+            </div>
+          </div>
+        </dv-border-box-8>
+        <dv-border-box-8 :dur="11" style="flex: 1">
+          <div class="my-panel">
+            <div class="panel-title">
+              <span class="text">定薪酬</span>
+            </div>
+            <div class="content flex">
+              <div ref="echartR5" style="flex: 1;height: 100%;"></div>
+              <div ref="echartR6" style="flex: 1;height: 100%;"></div>
+            </div>
+          </div>
+        </dv-border-box-8>
+        <dv-border-box-8 :dur="12" style="flex: 1">
+          <div class="my-panel">
+            <div class="panel-title">
+              <span class="text">定任期</span>
+            </div>
+            <div class="content flex">
+              <div ref="echartR7" style="flex: 1;height: 100%;"></div>
+              <div ref="echartR8" style="flex: 1;height: 100%;"></div>
+            </div>
+          </div>
+        </dv-border-box-8>
       </div>
     </div>
-    <script src="./js/index.js"></script>
-  </body>
-</html>
+    <div class="footer">
+      <a class="item" v-for="(item,index) in companyList" :key="index"><img
+          :src="`./images/logos/logo${index+1}.png`"></img> {{item.name}}</a>
+    </div>
+  </div>
+  <script src="./js/index.js"></script>
+</body>
+
+</html>

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
manpower/js/index.js


+ 12 - 0
manpower/js/zhb.js

@@ -0,0 +1,12 @@
+let c1 = [
+  [55.05, 46.82, 52.82, 61.2, 38.48, 30.64, 117.48, 27.09, 28.7, 14.27, 25.92, 12.6, 44.66, 138.83, 56.38, 26.42, 21.58, 17.18],
+  [34, 17, 23, 26, 2, 7, 2896, 24, 15, -33, 10, -38, 12, 43, -7, 6, 56, 121],
+  50.13,
+  69.4
+]
+let c2 = [
+  // [8205410, 14715548, 2568135, 5445393, 886982, 261380, 13345, 384646, 217328, 102553, 886750, 51326, 1357108, 1504393, 99042, 313161, 693, 6361],
+  // [2, 2125, 835, 450, 34, 476, 190, 225, 37, 46, 78, 199, 281, 164, 86, 59, 12, 26]
+  [145, 88, 58, 70, 8, 33, 98, 21, 24, -470, 69, -185, 19, 33, -4, 27, 76, 107],
+  [80.16, 58.04, 115, 48.61, 26.9, 24.16, -8.02, 44.94, 17.05, -54.75, 25.66, -75.02, 67.99, 324.15, 149.79, 44.86, -142.59, 5.82]
+]

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
manpower/libs/datav.min.js


Някои файлове не бяха показани, защото твърде много файлове са промени