v1.0.1

Foss-Sky1.0.1
YDKD · Apr 13, 2022 · 42cd9bf · 42cd9bf
2 parents 867289b + 14d66db
commit 42cd9bf
Show file tree

Hide file tree

Showing 39 changed files with 1,021 additions and 67 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -17,6 +17,25 @@ pipeline {
     }
 
     stages {
+        stage('stop container') {
+
+            when {
+                anyOf {
+                    branch 'dev'
+                }
+            }
+            agent {
+                docker {
+                    image 'node:14.18.0'
+                    reuseNode true
+                }
+            }
+
+            steps {
+                sh './jenkins/script/stop.sh'
+            }
+        }
+
         stage('pre-build') {           //  自定义步骤 pre-build
 
             when {
@@ -112,6 +131,25 @@ pipeline {
             }
         }
 
+        stage('restart container') {
+
+            when {
+                anyOf {
+                    branch 'dev'
+                }
+            }
+            agent {
+                docker {
+                    image 'node:14.18.0'
+                    reuseNode true
+                }
+            }
+
+            steps {
+                sh './jenkins/script/restart.sh'
+            }
+        }
+
         stage("artifacts-manage"){
             when {
                 expression{
@@ -130,13 +168,13 @@ pipeline {
                 expression{
                     return fileExists("${resetFlagFile}")
                 }
-                anyOf { 
+                anyOf {
                     branch 'dev'
                     branch 'release'
                     branch 'master'
                     }
                 }
-            
+
             steps {
                 echo "是回滚啊啊啊啊"
                 //当然我们这里为了方便下载
@@ -174,7 +212,7 @@ pipeline {
     }
 
     //post 就是流水线的运行结果状态啦，我们慢点会在这里设置邮件通
-    post { 
+    post {
         changed{
             echo 'I changed!'
         }
@@ -187,7 +225,7 @@ pipeline {
                    emailext(
                     subject: "Job [${env.JOB_NAME}] - Status: fail",
                     body: """${template}""",
-                    recipientProviders: [culprits(),requestor(),developers()], 
+                    recipientProviders: [culprits(),requestor(),developers()],
                     to: "[email protected]",
                    )
                }
@@ -203,7 +241,7 @@ pipeline {
                    emailext(
                     subject: "Job [${env.JOB_NAME}] - Status: Success",
                     body: """${template}""",
-                    recipientProviders: [requestor(),developers()], 
+                    recipientProviders: [requestor(),developers()],
                     to: "[email protected]",
                    )
                }

diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
 <head>
   <meta charset="UTF-8" />
   <link rel="icon" href="/favicon.ico" />
-  <link rel="stylesheet" href="//at.alicdn.com/t/font_3289955_rrzu1plqg1l.css" />
+  <link rel="stylesheet" href="//at.alicdn.com/t/font_3289955_zcjv91nt0w.css" />
   <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@500&display=swap" rel="stylesheet" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title></title>

diff --git a/jenkins/script/build-dev.sh b/jenkins/script/build-dev.sh
@@ -1,12 +1,6 @@
 #! /bin/bash
 
 # set -x
-# stop nestjs
-docker stop nestjs
-
 npm run build-dev || exit 1
 
-# start nestjs
-docker start nestjs
-
 # set +x
diff --git a/jenkins/script/restart.sh b/jenkins/script/restart.sh
@@ -0,0 +1,13 @@
+#! /bin/bash
+
+# set -x
+# restart mysql
+docker start mysql
+
+# restart nestjs
+containerId=`docker ps -a | grep -w nestjs  | awk '{print $1}'`
+
+if [ "$containerId" !=  "" ] ; then
+	docker start $containerId
+	echo "成功运行容器 $containerId"
+fi
diff --git a/jenkins/script/stop.sh b/jenkins/script/stop.sh
@@ -0,0 +1,14 @@
+#! /bin/bash
+
+# set -x
+# stop nestjs
+containerId=`docker ps -a | grep -w nestjs  | awk '{print $1}'`
+
+if [ "$containerId" !=  "" ] ; then
+	docker stop $containerId
+	echo "成功停止容器 $containerId"
+fi
+
+# stop mysql
+docker stop mysql
+
diff --git a/src/api/getApi.ts b/src/api/getApi.ts
@@ -59,6 +59,13 @@ export function getPerson(params: any) {
     params
   })
 }
+export function getWorkerSalary(params: any) {
+  return defaultRequest.request<ReutrnDataType>({
+    url: '/sys/person/salary',
+    method: 'GET',
+    params
+  })
+}
 
 export function getSerialNum() {
   return defaultRequest.request<ReutrnDataType>({
@@ -74,3 +81,24 @@ export function getWorkerAttendance(params: any) {
     params
   })
 }
+
+export function getAddPerson() {
+  return defaultRequest.request<ReutrnDataType>({
+    url: '/analysis/person/add',
+    method: 'GET'
+  })
+}
+
+export function getLeavingPerson() {
+  return defaultRequest.request<ReutrnDataType>({
+    url: '/analysis/person/leaving',
+    method: 'GET'
+  })
+}
+
+export function getCountTotal() {
+  return defaultRequest.request<ReutrnDataType>({
+    url: '/analysis/count/total',
+    method: 'GET'
+  })
+}
diff --git a/src/api/postApi.ts b/src/api/postApi.ts
@@ -3,7 +3,7 @@
  * @Autor: YDKD
  * @Date: 2022-03-19 18:42:32
  * @LastEditors: YDKD
- * @LastEditTime: 2022-04-04 20:44:17
+ * @LastEditTime: 2022-04-12 15:21:44
  */
 import { defaultRequest } from '@/service'
 import { ReutrnDataType } from './type'
@@ -55,3 +55,11 @@ export function addPersonInfo(data: any) {
     data
   })
 }
+
+export function updateWorkerSalary(data: any) {
+  return defaultRequest.request<ReutrnDataType>({
+    url: '/sys/person/salary',
+    method: 'POST',
+    data
+  })
+}
diff --git a/src/components/Echarts/src/Echarts.vue b/src/components/Echarts/src/Echarts.vue
@@ -3,7 +3,7 @@
  * @Autor: YDKD
  * @Date: 2022-04-06 10:32:17
  * @LastEditors: YDKD
- * @LastEditTime: 2022-04-07 16:12:17
+ * @LastEditTime: 2022-04-08 16:07:29
 -->
 <template>
   <div ref="elRef" :class="[$attrs.class, prefixCls]" :style="styles"></div>
@@ -50,10 +50,8 @@ const options = computed(() => {
   })
 })
 
-// eslint-disable-next-line no-undef
 const elRef = ref<ElRef>()
 
-// eslint-disable-next-line no-undef
 let echartRef: Nullable<echarts.ECharts> = null
 
 const contentEl = ref<Element>()
@@ -94,7 +92,7 @@ const resizeHandler = debounce(() => {
 }, 100)
 
 const contentResizeHandler = async (e: TransitionEvent) => {
-  if (e.propertyName === 'width') {
+  if (e.propertyName === 'transform') {
     resizeHandler()
   }
 }
@@ -104,23 +102,21 @@ onMounted(() => {
 
   window.addEventListener('resize', resizeHandler)
 
-  // contentEl.value = document.getElementsByClassName(
-  //   `${namespace}-layout-content`
-  // )[0]
-  // unref(contentEl) &&
-  //   (unref(contentEl) as HTMLElement).addEventListener(
-  //     'transitionend',
-  //     contentResizeHandler
-  //   )
+  contentEl.value = document.getElementsByClassName(`${namespace}-container`)[0]
+  unref(contentEl) &&
+    (unref(contentEl) as HTMLElement).addEventListener(
+      'transitionend',
+      contentResizeHandler
+    )
 })
 
 onBeforeUnmount(() => {
   window.removeEventListener('resize', resizeHandler)
-  // unref(contentEl) &&
-  //   (unref(contentEl) as HTMLElement).removeEventListener(
-  //     'transitionend',
-  //     contentResizeHandler
-  //   )
+  unref(contentEl) &&
+    (unref(contentEl) as HTMLElement).removeEventListener(
+      'transitionend',
+      contentResizeHandler
+    )
 })
 
 onActivated(() => {

diff --git a/src/components/Icon/src/Icon.vue b/src/components/Icon/src/Icon.vue
@@ -3,7 +3,7 @@
  * @Autor: YDKD
  * @Date: 2022-03-28 15:08:36
  * @LastEditors: YDKD
- * @LastEditTime: 2022-04-08 09:06:21
+ * @LastEditTime: 2022-04-12 15:53:27
 -->
 <template>
   <ElIcon :class="prefixCls" :size="size" :color="color">
@@ -34,8 +34,6 @@ const props = defineProps({
 const iconfontSize = computed(() => {
   return props.size > 16 ? '2.4rem' : '20px'
 })
-
-console.log()
 </script>
 
 <style lang="less" scoped>

diff --git a/src/components/Menu/src/Menu.vue b/src/components/Menu/src/Menu.vue
@@ -3,7 +3,7 @@
  * @Autor: YDKD
  * @Date: 2022-03-28 10:19:48
  * @LastEditors: YDKD
- * @LastEditTime: 2022-04-02 21:28:29
+ * @LastEditTime: 2022-04-12 15:53:30
 -->
 <script lang="tsx">
 import { defineComponent, computed, unref } from 'vue'
@@ -27,7 +27,6 @@ export default defineComponent({
       }
       return path
     })
-    console.log(unref(activeMenu))
 
     const appStore = useAppStore()
 
@@ -37,8 +36,6 @@ export default defineComponent({
 
     const routes = permissionStore.getRouters
 
-    console.log(unref(routes))
-
     return () => (
       <div class={[prefixCls, 'h-full overflow-hidden flex-col text-white']}>
         <ElScrollbar>

diff --git a/src/components/TabMenu/src/TabMenu.vue b/src/components/TabMenu/src/TabMenu.vue
@@ -3,15 +3,14 @@
  * @Autor: YDKD
  * @Date: 2022-03-24 11:26:09
  * @LastEditors: YDKD
- * @LastEditTime: 2022-03-24 11:35:02
+ * @LastEditTime: 2022-04-12 15:53:37
 -->
 <script lang="tsx">
 import { useDesign } from '@/hooks'
 import { defineComponent } from 'vue'
 
 const prefixCls = useDesign('prefix', 'tab-menu')
 const variables = useDesign('variables')
-console.log(variables)
 
 export default defineComponent({
   name: 'TabMenu',

diff --git a/src/main.ts b/src/main.ts
@@ -5,12 +5,12 @@ import 'normalize.css'
 
 import '@purge-icons/generated'
 
-// import global css
-import '@/styles/index.less'
-
 import './assets/css/index.less'
 import './assets/css/tailwind.css'
 
+// import global css
+import '@/styles/index.less'
+
 import router from './router'
 import { setupStore } from './store'
 

diff --git a/src/plugins/echarts/index.ts b/src/plugins/echarts/index.ts
@@ -1,6 +1,6 @@
 import * as echarts from 'echarts/core'
 
-import { PieChart } from 'echarts/charts'
+import { PieChart, LineChart } from 'echarts/charts'
 
 import {
   TitleComponent,
@@ -25,7 +25,8 @@ echarts.use([
   ParallelComponent,
   PieChart,
   CanvasRenderer,
-  ToolboxComponent
+  ToolboxComponent,
+  LineChart
 ])
 
 export default echarts