Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
kingdee_large_screen
/
pc_kingdee_large_screen
2
0
Салаа 0
Файлууд Асуудлууд 0 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

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

zhbyyy 2 жил өмнө
parent
a1d54b6041 c5e811295a
commit
268f01800d
11 өөрчлөгдсөн 228 нэмэгдсэн , 135 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 50 0
      .drone.yml
  2. 3 0
      Dockerfile
  3. 1 0
      README.md
  4. 63 114
      manpower/index2.html
  5. 13 0
      manpower/js/data.js
  6. 54 0
      manpower/js/data2.js
  7. 16 0
      manpower/js/fjx.js
  8. 0 1
      manpower/js/index.js
  9. 0 20
      manpower/js/index2.js
  10. 16 0
      manpower/js/li.js
  11. 12 0
      manpower/js/request.js

+ 50 - 0
.drone.yml
Файл харах 

@@ -0,0 +1,50 @@
 
+kind: pipeline
 
+type: docker
 
+name: 自动部署
 
+
 
+clone:
 
+  disable: false # 禁用自带clone
 
+  
+workspace:
 
+  path: /drone/src  
+
 
+steps:
 
+  - name: 镜像打包
 
+    pull: if-not-exists
 
+    image: plugins/docker
 
+    settings:
 
+      #dockerfile: Dockerfile
 
+      repo: harbor.sxidc.com/fs/${DRONE_REPO_NAME//_/-}
 
+      registry: harbor.sxidc.com
 
+      tags: ${DRONE_COMMIT_BRANCH/master/latest}
 
+      username:
 
+        from_secret: harbor_username
 
+      password:
 
+        from_secret: harbor_password
 
+
 
+  - name: ssh-commands
 
+    pull: if-not-exists
 
+    image: appleboy/drone-ssh:1.5.7
 
+    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 =======部署成功=======
 
+
 
+      
+      
+trigger:
 
+  branch:
 
+    - main

+ 3 - 0
Dockerfile
Файл харах 

@@ -0,0 +1,3 @@
 
+FROM nginx:1.15.0
 
+ADD . /usr/share/nginx/html
 
+EXPOSE 80

+ 1 - 0
README.md
Файл харах 

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

+ 63 - 114
manpower/index2.html
Файл харах 

@@ -14,7 +14,9 @@
 
     <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/data2.js"></script>
 
   </head>
 
   <body>
 
     <div id="app">
 
@@ -55,74 +57,83 @@
 
             </div>
 
           </dv-border-box-8>
 
         </div>
 
-        <div class="center" style="flex: 1.5;">
 
-          <div class="top">
 
+        <div class="center" style="flex: 1.5">
 
+          <div class="top" v-if="centerData">
 
             <div class="box">
 
               <img src="./images/center-top1.png"/>
 
               <div>
 
                 <p>架构数</p>
 
-                <p><i style="color: #45DAD1">25600</i>人</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">15080</i>人</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">188600</i>人</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">
 
+            <div class="my-panel" v-if="centerData">
 
               <div class="panel-title">
 
                 <span class="text">六定改革成效果展示</span>
 
               </div>
 
-              <div class="content" style="padding: 10px;">
 
+              <div class="content flex" style="padding: 10px;">
 
                 <div class="box-center">
 
-                  <div>
 
-                    <p>18.20</p>
 
-                    <p>改革前总部机构平均数</p>
 
-                  </div>
 
-                  <div>
 
-                    <p>18.20</p>
 
-                    <p>改革前总部机构平均数</p>
 
+                  <div class="t">
 
+                    <p>{{centerData.changeInfo[0].value1}}<span>%</span></p>
 
+                    <p>总部机构压缩率</p>
 
                   </div>
 
-                  <div>
 
-                    <p>188600</p>
 
-                    <p>改革前总部机构平均数</p>
 
-                  </div>
 
-                  <div>
 
-                    <p>18.20</p>
 
-                    <p>改革前中层管理人数</p>
 
+                  <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>
 
                 </div>
 
                 <div class="box-center">
 
-                  <div>
 
-                    <p>188600</p>
 
-                    <p>改革前总部机构平均数</p>
 
+                  <div class="t">
 
+                    <p>{{centerData.changeInfo[1].value1}}<span>%</span></p>
 
+                    <p>中层管理人数压缩率</p>
 
                   </div>
 
-                  <div>
 
-                    <p>188600</p>
 
-                    <p>中层管理人数压缩数</p>
 
-                  </div>
 
-                  <div>
 
-                    <p>18.20</p>
 
-                    <p>当前在岗职工总人数</p>
 
+                  <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>
 
+                </div>
 
+                <div class="box-center">
 
                   <div>
 
-                    <p>180</p>
 
-                    <p>在册职工压缩数</p>
 
+                     <p>{{centerData.changeInfo[2].value1}}<span>%</span></p>
 
+                    <p>在册职工压缩率</p>
 
                   </div>
 
-                  <div>
 
-                    <p>18</p>
 
-                    <p>在岗职工压缩数</p>
 
+                  <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>
 
                 </div>
 
               </div>
 
@@ -131,94 +142,32 @@
 
           <dv-border-box-8 :dur="10">
 
             <div class="my-panel">
 
               <div class="panel-title">
 
-                <span class="text">预警</span>
 
+                <span class="text">核心指标展示</span>
 
               </div>
 
-              <div class="content yujing">
 
-                <div class="flex1">
 
-                  <p class="s-title main-color">工作预警</p>
 
-                  <dv-scroll-board :config="storageRecordConfig2" class="content" />
 
-                </div>
 
-                <div class="flex1">
 
-                  <p class="s-title main-color">填报情况预警</p>
 
-                  <dv-scroll-board :config="storageRecordConfig" class="content" />
 
-                </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>
 
+                <span class="text">工作数据分析中心</span>
 
               </div>
 
-              <div class="content flex">
 
-                <ul class="list">
 
-                  <li class="list-item">
 
-                    <i>1</i>
 
-                    <span>山西焦煤</span>
 
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="80" stroke-width="15" color="#FBE139"></el-progress>
 
-                    <span><i class="num">12500</i>人</span>
 
-                  </li>
 
-                  <li class="list-item">
 
-                    <i>2</i>
 
-                    <p>晋能控股</p>
 
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="70" stroke-width="15" color="#45DAD1"></el-progress>
 
-                    <span><i class="num">12500</i>人</span>
 
-                  </li>
 
-                  <li class="list-item">
 
-                    <i>3</i>
 
-                      <p>潞安化工</p>
 
-                      <el-progress class="flex1" style="margin: 0 10px;" percentage="60" stroke-width="15" color="#6682F5"></el-progress>
 
-                      <span><i class="num">12500</i>人</span>
 
-                  </li>
 
-                  <li class="list-item">
 
-                    <i>4</i>
 
-                    <p>山西建投</p>
 
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="50" stroke-width="15" color="#69C0FF"></el-progress>
 
-                    <span><i class="num">12500</i>人</span>
 
-                  </li>
 
-                  <li class="list-item">
 
-                    <i>5</i>
 
-                    <p>华阳新材</p>
 
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="50" stroke-width="15" color="#69C0FF"></el-progress>
 
-                    <span><i class="num">12500</i>人</span>
 
-                  </li>
 
-                </ul>
 
-                <ul class="list">
 
-                  <li class="list-item">
 
-                    <i>6</i>
 
-                    <span>山西焦煤</span>
 
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="80" stroke-width="15" color="#69C0FF"></el-progress>
 
-                    <span><i class="num">12500</i>人</span>
 
-                  </li>
 
-                  <li class="list-item">
 
-                    <i>7</i>
 
-                    <p>晋能控股</p>
 
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="70" stroke-width="15" color="#69C0FF"></el-progress>
 
-                    <span><i class="num">12500</i>人</span>
 
-                  </li>
 
-                  <li class="list-item">
 
-                    <i>8</i>
 
-                      <p>潞安化工</p>
 
-                      <el-progress class="flex1" style="margin: 0 10px;" percentage="60" stroke-width="15" color="#69C0FF"></el-progress>
 
-                      <span><i class="num">12500</i>人</span>
 
-                  </li>
 
-                  <li class="list-item">
 
-                    <i>9</i>
 
-                    <p>山西建投</p>
 
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="50" stroke-width="15" color="#69C0FF"></el-progress>
 
-                    <span><i class="num">12500</i>人</span>
 
-                  </li>
 
-                  <li class="list-item">
 
-                    <i>10</i>
 
-                    <p>华阳新材</p>
 
-                    <el-progress class="flex1" style="margin: 0 10px;" percentage="50" stroke-width="15" color="#69C0FF"></el-progress>
 
-                    <span><i class="num">12500</i>人</span>
 
-                  </li>
 
-                </ul>
 
+              <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>
 
           </dv-border-box-8>
 
-          
+         
         </div>
 
         <div class="right">
 
           <dv-border-box-8 :dur="10" style="flex: 1">
 
@@ -254,7 +203,7 @@
 
         </div>
 
       </div>
 
       <div class="footer">
 
-        <a class="item" v-for="(item,index) in companyList" :key="index">{{item.name}}</a>
 
+        <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/index2.js"></script>

+ 13 - 0
manpower/js/data.js
Файл харах 

@@ -63,3 +63,16 @@ const dataL5 = [
 
   [173826, 352494, 54039, 108985, 23512, 8484, 2430, 16357, 7351, 4452, 38863, 3242, 35183, 13285, 1937, 14733, 302, 1052],
 
   [-1, -5, -24, 2, 5, -4, -13, -5, -3, 2, -2, -3, 5, 1, 14, -1, 490, 23],
 
 ]
 
+
 
+const dataL6 = [
 
+  [146, 360, 400, 185, 220, 180, 30, 200, 200, 141, 235, 120, 200, 315, 50, 118, 100, 157],
 
+  [400, 400, 400, 400, 200, 180, 50, 200, 200, 177, 170, 120, 200, 330, 80, 186, 100, 150],
 
+]
 
+const dataL7 = [
 
+  [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.0, 17.0, 23.0, 26, 2, 7, 2896, 24.0, 15.0, -33.0, 10.0, -38.0, 12.0, 43.0, -7.0, 6.0, 56.0, 121.0],
 
+]
 
+const dataL8 = [
 
+  [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],
 
+  [145.0, 88.0, 58.0, 70, 8, 33, 98, 21.0, 24.0, -470.0, 69.0, -185.0, 19.0, 33.0, -4.0, 27.0, 76.0, 107.0],
 
+]

+ 54 - 0
manpower/js/data2.js
Файл харах 

@@ -0,0 +1,54 @@
 
+const companyList = [
 
+  { name: '晋能控股电力集团有限公司' },
 
+  { name: '中国太原煤炭交易中心有限公司' },
 
+  { name: '晋能控股装备制造集团有限公司' },
 
+  { name: '晋能控股山西煤业集团有限公司' },
 
+  { name: '晋能控股山西电力股份有限公司' },
 
+  { name: '晋控电力山西新能源有限公司' },
 
+  { name: '晋能控股煤业集团有限公司' }
 
+]
 
+const data = {
 
+  info: {
 
+    value1: '5808',
 
+    value2: '444094',
 
+    value3: '860527',
 
+  },
 
+  changeInfo: [
 
+    {
 
+      value1: '50.30',
 
+      value2: '25',
 
+      value3: '15',
 
+    },
 
+    {
 
+      value1: '31.00',
 
+      value2: '15695',
 
+      value3: '10756',
 
+    },
 
+    {
 
+      value1: '11',
 
+      value2: '950527',
 
+      value3: '9',
 
+    },
 
+  ],
 
+}
 
+const dataL1 = [
 
+  [18, 21, 14, 21, 13, 14, 6, 13, 13, 14, 14, 12, 15, 16, 12, 15, 10, 19],
 
+  [18, 21, 14, 21, 13, 14, 6, 13, 13, 14, 14, 12, 15, 16, 12, 15, 10, 19],
 
+  [21, 21, 21, 21, 13, 13, 6, 13, 13, 14, 14, 12, 15, 15, 12, 15, 12, 13],
 
+]
 
+const dataL2 = [
 
+  [16, 8, 12, 10, 11, 1, 0, 8, 8, 0, 7, 0, 5, 10, 0, 0, 0, 6],
 
+  [11, 10, 6, 10, 12, 0, 0, 5, 0, 5, 7, 0, 4, 0, 0, 0, 0, 10],
 
+]
 
+const dataL3 = [
 
+  [15732, 29724, 4936, 9821, 2116, 763, 218, 1472, 661, 400, 3497, 265, 3066, 1205, 155, 1311, 22, 93],
 
+  [9.5, 8.43, 9.13, 9.11, 8.96, 8.99, 8.97, 8.99, 9.0, 9.0, 9.1, 8.2, 8.8, 9.1, 8, 8.8, 7.3, 8.8],
 
+]
 
+const dataL4 = [
 
+  [142, 189, 58, 59, 39, 32, 12, 36, 66, 36, 72, 41, 28, 161, 63, 10, 69, 28],
 
+  [109, 65, 42, 44, 36, 34, 8, 62, 45, 28, 51, 98, 40, 30, 20, 99, 51, 24],
 
+]
 
+const dataL5 = [
 
+  [173826, 352494, 54039, 108985, 23512, 8484, 2430, 16357, 7351, 4452, 38863, 3242, 35183, 13285, 1937, 14733, 302, 1052],
 
+  [-1, -5, -24, 2, 5, -4, -13, -5, -3, 2, -2, -3, 5, 1, 14, -1, 490, 23],
 
+]

+ 16 - 0
manpower/js/fjx.js
Файл харах 

@@ -0,0 +1,16 @@
 
+const fjxdataL1 = [
 
+    [10226.85, 9429.80, 7604.59, 17031.45, 7766.82, 8136.27, 14014.79, 3988.28, 7380.63, 5391.49, 6583.80, 8483.91, 10743.01, 10065.77, 8277.90, 5706.48, 16517.72, 5255.80],
 
+    [10765.11, 9926.11, 8004.83, 17927.84, 8175.60, 8564.49, 14752.41, 4198.19, 7769.08, 5675.25, 6930.32, 8930.43, 11308.43, 10595.55, 8713.58, 6006.82, 17387.07, 5532.42],
 
+  ]
 
+  
+  const fjxdataL2 = [
 
+    [172, 89, 80, 117, 23, 38, 99, 30, 34, -524, 64, -160,31, 53, 2, 27, -20, 109],
 
+    [5.26, 5.21, 4.98, 5.27, 5.28, 5.26, 5.25, 5.26, 5.25, 5.27, 5.26, 5.27, 5.28, 5.26, 5.24, 5.25, 5.28, 4.98],
 
+  ]
 
+  
+  const fjxdataL3 = [
 
+    [100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,100],
 
+  ]
 
+  const fjxdataL4 = [
 
+    [100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,100],
 
+  ]

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 1
manpower/js/index.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 20
manpower/js/index2.js


+ 16 - 0
manpower/js/li.js
Файл харах 

@@ -0,0 +1,16 @@
 
+const dataR1 = [
 
+  [1, 1, 5, 1, 1, 4, 2, 6, 3, 0, 7, 5, 1, 1, 4, 1, 1, 3],
 
+  [2000, 0, 1908, 300, 0, 733, 236, 224, 270, 0, 864, 0, 0, 325, 241, 777, 63, 104],
 
+]
 
+const dataR2 = [
 
+  [1, 1, 5, 1, 1, 4, 2, 6, 3, 0, 7, 5, 1, 1, 4, 1, 1, 3],
 
+  [0, 2290, 1884, 0, 34, 339, 0, 231, 93, 0, 511, 0, 9, 12, 85, 508, 61, 82],
 
+]
 
+const dataR3 = [
 
+  [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]
 
+]
 
+const dataR4 = [
 
+  [4000, 7000, 4000, 600, 300, 460, 90, 600, 350, 261, 618, 73, 1200, 500, 60, 742, 10, 300],
 
+  [2, 2125, 835, 450, 34, 476, 190, 225, 37, 46, 78, 199, 281, 164, 86, 59, 12, 26]
 
+]

+ 12 - 0
manpower/js/request.js
Файл харах 

@@ -177,3 +177,15 @@ function stringify(data) {
 
   ret = ret.substring(0, ret.lastIndexOf('&'))
 
   return ret
 
 }
 
+
 
+// 格式化日期
 
+function formatDate(time) {
 
+  let date = time ? new Date(Number(time)) : new Date();
 
+  let Y = date.getFullYear() + '-';
 
+  let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
 
+  let D = date.getDate() < 10 ? '0' + date.getDate() + ' ' : date.getDate() + ' ';
 
+  let h = date.getHours() < 10 ? '0' + date.getHours() + ':' : date.getHours() + ':';
 
+  let m = date.getMinutes() < 10 ? '0' + date.getMinutes() + ':' : date.getMinutes() + ':';
 
+  let s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
 
+  return Y + M + D + h + m + s;
 
+}

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно