From c734466b82a8167379c339c2cb56b8efb301371b Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Sun, 4 Feb 2024 13:17:34 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 6 +++--- .env.test | 2 +- src/router/modules/remaining.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env.production b/.env.production index b8ddc13bc..a6c1280b0 100644 --- a/.env.production +++ b/.env.production @@ -28,10 +28,10 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=dist # 自定义接口路径 -VITE_INTERFACE_URL='http://dev.ccwin-in.com:25110/magic/web/index.html' +VITE_INTERFACE_URL='http://10.62.193.15:25100/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25110' +VITE_JMREPORT_BASE_URL='http://10.62.193.15:25100' diff --git a/.env.test b/.env.test index 0c997f086..78536f89d 100644 --- a/.env.test +++ b/.env.test @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=dist # 自定义接口路径 VITE_INTERFACE_URL='http://dev.ccwin-in.com:25110/magic/web/index.html' diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 69f94de41..2933399d2 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -139,7 +139,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ children: [ { path: 'edit', - component: () => import('@/views/infra/codegen/EditTable.vue'), + component: () => import('@/views/infra/codegen/editTable.vue'), name: 'InfraCodegenEditTable', meta: { noCache: true, From 514032b2ec5a64337eb1ee928472667586f610e8 Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Sun, 4 Feb 2024 13:17:53 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 5 ++++ nginx.conf | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 Dockerfile create mode 100644 nginx.conf diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..902b6a496 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +# 设置基础镜像 +FROM nginx +# 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面 +COPY dist/ /usr/share/nginx/html/ +COPY nginx.conf /etc/nginx/nginx.conf diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 000000000..7528c1ec9 --- /dev/null +++ b/nginx.conf @@ -0,0 +1,69 @@ +#user root; +worker_processes 2; + +#error_log logs/error.log; +#error_log logs/error.log notice; +#error_log logs/error.log info; + +#pid logs/nginx.pid; + +events { + worker_connections 1024; +} + +http { + include mime.types; + charset utf-8,gbk; + default_type application/octet-stream; + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for" "$request_time $upstream_response_time"'; + + proxy_cache_path /opt/nginx_cache/ levels=1:2 keys_zone=my_zone:10m inactive=300s max_size=5g; + access_log logs/access.log main; + sendfile on; + #tcp_nopush on; + keepalive_timeout 600s; + client_max_body_size 200m; + gzip on; + gzip_min_length 10k; + gzip_comp_level 9; + gzip_buffers 4 16k; + gzip_types text/plain application/javascript text/css application/xml text/javascript image/jpeg image/gif image/png; + gzip_vary on; + gzip_disable "MSIE [1-6]\."; + upstream sfms3.0 { + server localhost:25110 weight=10 max_fails=3 fail_timeout=10s; + } + server { + listen 25100; + server_name_in_redirect off; + server_name dev.ccwin-in.com; + access_log logs/sfms3.0.log main; + location /api/ { + access_log logs/sfms3.0.log main; + proxy_pass http://sfms3.0/; + proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; + proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $http_x_forwarded_for; + } + location /profile/ { + proxy_cache my_zone; + proxy_cache_valid 200 304 12h; + proxy_cache_key $host$uri$is_args$args; + alias /opt/profile/; + index index.html index.htm; + } + location / { + proxy_cache my_zone; + proxy_cache_valid 200 304 12h; + proxy_cache_key $host$uri$is_args$args; + try_files $uri $uri/ /index.html; + root /opt/sfms3.0/sfms3.0; + index index.html index.htm; + } + } +} + From 2d5ca7e9a972f17ec4cc16415c7652692b17225f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sun, 4 Feb 2024 14:10:57 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/modules/remaining.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 2933399d2..ef71f7952 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -41,7 +41,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: '/redirect/:path(.*)', name: 'Redirect', - component: () => import('@/views/Redirect/Redirect.vue'), + component: () => import('@/views/redirect/redirect.vue'), meta: {} } ], @@ -59,7 +59,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ children: [ { path: 'index', - component: () => import('@/views/Home/Index.vue'), + component: () => import('@/views/home/index.vue'), name: 'Index', meta: { title: t('router.home'), @@ -80,7 +80,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ children: [ { path: 'profile', - component: () => import('@/views/Profile/Index.vue'), + component: () => import('@/views/profile/index.vue'), name: 'Profile', meta: { canTo: true, @@ -177,7 +177,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ }, { path: '/login', - component: () => import('@/views/Login/Login.vue'), + component: () => import('@/views/login/login.vue'), name: 'Login', meta: { hidden: true, @@ -187,7 +187,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ }, { path: '/sso', - component: () => import('@/views/Login/Login.vue'), + component: () => import('@/views/login/login.vue'), name: 'SSOLogin', meta: { hidden: true, @@ -197,7 +197,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ }, { path: '/403', - component: () => import('@/views/Error/403.vue'), + component: () => import('@/views/error/403.vue'), name: 'NoAccess', meta: { hidden: true, @@ -207,7 +207,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ }, { path: '/404', - component: () => import('@/views/Error/404.vue'), + component: () => import('@/views/error/404.vue'), name: 'NoFound', meta: { hidden: true, @@ -217,7 +217,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ }, { path: '/500', - component: () => import('@/views/Error/500.vue'), + component: () => import('@/views/error/500.vue'), name: 'Error', meta: { hidden: true, From 9e4950e996ba529798e3e39b9638034eeed61cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sun, 4 Feb 2024 14:20:24 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E5=86=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/{Home/Index.vue => home/index.vue} | 0 src/views/{Login/Login.vue => login/login.vue} | 0 src/views/{Profile/Index.vue => profile/index.vue} | 0 src/views/{Redirect/Redirect.vue => redirect/redirect.vue} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename src/views/{Home/Index.vue => home/index.vue} (100%) rename src/views/{Login/Login.vue => login/login.vue} (100%) rename src/views/{Profile/Index.vue => profile/index.vue} (100%) rename src/views/{Redirect/Redirect.vue => redirect/redirect.vue} (100%) diff --git a/src/views/Home/Index.vue b/src/views/home/index.vue similarity index 100% rename from src/views/Home/Index.vue rename to src/views/home/index.vue diff --git a/src/views/Login/Login.vue b/src/views/login/login.vue similarity index 100% rename from src/views/Login/Login.vue rename to src/views/login/login.vue diff --git a/src/views/Profile/Index.vue b/src/views/profile/index.vue similarity index 100% rename from src/views/Profile/Index.vue rename to src/views/profile/index.vue diff --git a/src/views/Redirect/Redirect.vue b/src/views/redirect/redirect.vue similarity index 100% rename from src/views/Redirect/Redirect.vue rename to src/views/redirect/redirect.vue From a6f42fcb76ca3c93face56bdf375f3df9174233e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sun, 4 Feb 2024 14:28:00 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E5=88=A0=E9=99=A4home?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/Index copy.vue | 381 ----------------- src/views/Home/Index2.vue | 319 -------------- src/views/Home/components/material.vue | 336 --------------- src/views/Home/components/produce.vue | 286 ------------- src/views/Home/components/product.vue | 313 -------------- src/views/Home/components/supplierIndex.vue | 452 -------------------- src/views/Home/echarts-data.ts | 286 ------------- src/views/Home/types.ts | 55 --- src/views/home/index.vue | 14 - 9 files changed, 2442 deletions(-) delete mode 100644 src/views/Home/Index copy.vue delete mode 100644 src/views/Home/Index2.vue delete mode 100644 src/views/Home/components/material.vue delete mode 100644 src/views/Home/components/produce.vue delete mode 100644 src/views/Home/components/product.vue delete mode 100644 src/views/Home/components/supplierIndex.vue delete mode 100644 src/views/Home/echarts-data.ts delete mode 100644 src/views/Home/types.ts delete mode 100644 src/views/home/index.vue diff --git a/src/views/Home/Index copy.vue b/src/views/Home/Index copy.vue deleted file mode 100644 index 121ec6a8b..000000000 --- a/src/views/Home/Index copy.vue +++ /dev/null @@ -1,381 +0,0 @@ - - diff --git a/src/views/Home/Index2.vue b/src/views/Home/Index2.vue deleted file mode 100644 index c9429ab10..000000000 --- a/src/views/Home/Index2.vue +++ /dev/null @@ -1,319 +0,0 @@ - - - - diff --git a/src/views/Home/components/material.vue b/src/views/Home/components/material.vue deleted file mode 100644 index 83aadaa35..000000000 --- a/src/views/Home/components/material.vue +++ /dev/null @@ -1,336 +0,0 @@ - - - - diff --git a/src/views/Home/components/produce.vue b/src/views/Home/components/produce.vue deleted file mode 100644 index c289ec0c0..000000000 --- a/src/views/Home/components/produce.vue +++ /dev/null @@ -1,286 +0,0 @@ - - - - diff --git a/src/views/Home/components/product.vue b/src/views/Home/components/product.vue deleted file mode 100644 index 5124d9c11..000000000 --- a/src/views/Home/components/product.vue +++ /dev/null @@ -1,313 +0,0 @@ - - - - diff --git a/src/views/Home/components/supplierIndex.vue b/src/views/Home/components/supplierIndex.vue deleted file mode 100644 index c665f9867..000000000 --- a/src/views/Home/components/supplierIndex.vue +++ /dev/null @@ -1,452 +0,0 @@ - - - - diff --git a/src/views/Home/echarts-data.ts b/src/views/Home/echarts-data.ts deleted file mode 100644 index 15c7b4afd..000000000 --- a/src/views/Home/echarts-data.ts +++ /dev/null @@ -1,286 +0,0 @@ -import { EChartsOption } from 'echarts' - -const { t } = useI18n() - -export const lineOptions: EChartsOption = { - - xAxis: { - data: [ 1, 2, 3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 - ], - boundaryGap: false, - axisTick: { - show: false - } - }, - grid: { - left: 20, - right: 20, - bottom: 20, - top: 50, - containLabel: true - }, - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'cross' - }, - padding: [5, 10] - }, - yAxis: { - axisTick: { - show: false - } - }, - legend: { - data: ['销售','哈哈'], - top: 20 - }, - series: [ - { - name: '销售', - smooth: true, - type: 'line', - data: [100, 120, 161, 134, 105, 160, 165, 114, 163, 185, 118, 123], - animationDuration: 2800, - animationEasing: 'cubicInOut' - }, - { - name: '哈哈', - smooth: true, - type: 'line', - itemStyle: {}, - data: [120, 82, 91, 154, 162, 140, 145, 250, 134, 56, 99, 123], - animationDuration: 2800, - animationEasing: 'quadraticOut' - } - ] -} - -export const pieOptions: EChartsOption = { - // title: { - // text: t('analysis.userAccessSource'), - // left: 'center' - // }, - tooltip: { - trigger: 'item', - formatter: '{a}
{b} : {c} ({d}%)' - }, - legend: { - orient: 'vertical', - left: 'left', - top:20, - data: [ - t('analysis.directAccess'), - t('analysis.mailMarketing'), - t('analysis.allianceAdvertising'), - t('analysis.videoAdvertising'), - t('analysis.searchEngines') - ] - }, - series: [ - { - name: t('analysis.userAccessSource'), - type: 'pie', - radius: '55%', - center: ['50%', '60%'], - data: [ - { value: 335, name: t('analysis.directAccess') }, - { value: 310, name: t('analysis.mailMarketing') }, - { value: 234, name: t('analysis.allianceAdvertising') }, - { value: 135, name: t('analysis.videoAdvertising') }, - { value: 1548, name: t('analysis.searchEngines') } - ] - } - ] -} - -export const barOptions: EChartsOption = { - title: { - text: '', - left: 'center' - }, - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'shadow' - } - }, - grid: { - left: 50, - right: 20, - bottom: 20 - }, - xAxis: { - type: 'category', - data: [], - axisTick: { - alignWithLabel: true - } - }, - yAxis: { - type: 'value' - }, - series: [ - { - name: t('analysis.activeQuantity'), - data: [], - type: 'bar' - } - ] -} - -export const radarOption: EChartsOption = { - legend: { - data: [t('workplace.personal'), t('workplace.team')] - }, - radar: { - // shape: 'circle', - indicator: [ - { name: t('workplace.quote'), max: 65 }, - { name: t('workplace.contribution'), max: 160 }, - { name: t('workplace.hot'), max: 300 }, - { name: t('workplace.yield'), max: 130 }, - { name: t('workplace.follow'), max: 100 } - ] - }, - series: [ - { - name: `xxx${t('workplace.index')}`, - type: 'radar', - data: [ - { - value: [42, 30, 20, 35, 80], - name: t('workplace.personal') - }, - { - value: [50, 140, 290, 100, 90], - name: t('workplace.team') - } - ] - } - ] -} - -export const wordOptions = { - series: [ - { - type: 'wordCloud', - gridSize: 2, - sizeRange: [12, 50], - rotationRange: [-90, 90], - shape: 'pentagon', - width: 600, - height: 400, - drawOutOfBound: true, - textStyle: { - color: function () { - return ( - 'rgb(' + - [ - Math.round(Math.random() * 160), - Math.round(Math.random() * 160), - Math.round(Math.random() * 160) - ].join(',') + - ')' - ) - } - }, - emphasis: { - textStyle: { - shadowBlur: 10, - shadowColor: '#333' - } - }, - data: [ - { - name: 'Sam S Club', - value: 10000, - textStyle: { - color: 'black' - }, - emphasis: { - textStyle: { - color: 'red' - } - } - }, - { - name: 'Macys', - value: 6181 - }, - { - name: 'Amy Schumer', - value: 4386 - }, - { - name: 'Jurassic World', - value: 4055 - }, - { - name: 'Charter Communications', - value: 2467 - }, - { - name: 'Chick Fil A', - value: 2244 - }, - { - name: 'Planet Fitness', - value: 1898 - }, - { - name: 'Pitch Perfect', - value: 1484 - }, - { - name: 'Express', - value: 1112 - }, - { - name: 'Home', - value: 965 - }, - { - name: 'Johnny Depp', - value: 847 - }, - { - name: 'Lena Dunham', - value: 582 - }, - { - name: 'Lewis Hamilton', - value: 555 - }, - { - name: 'KXAN', - value: 550 - }, - { - name: 'Mary Ellen Mark', - value: 462 - }, - { - name: 'Farrah Abraham', - value: 366 - }, - { - name: 'Rita Ora', - value: 360 - }, - { - name: 'Serena Williams', - value: 282 - }, - { - name: 'NCAA baseball tournament', - value: 273 - }, - { - name: 'Point Break', - value: 265 - } - ] - } - ] -} diff --git a/src/views/Home/types.ts b/src/views/Home/types.ts deleted file mode 100644 index e6313d36c..000000000 --- a/src/views/Home/types.ts +++ /dev/null @@ -1,55 +0,0 @@ -export type WorkplaceTotal = { - project: number - access: number - todo: number -} - -export type Project = { - name: string - icon: string - message: string - personal: string - time: Date | number | string -} - -export type Notice = { - title: string - type: string - keys: string[] - date: Date | number | string -} - -export type Shortcut = { - name: string - icon: string - url: string -} - -export type RadarData = { - personal: number - team: number - max: number - name: string -} -export type AnalysisTotalTypes = { - users: number - messages: number - moneys: number - shoppings: number -} - -export type UserAccessSource = { - value: number - name: string -} - -export type WeeklyUserActivity = { - value: number - name: string -} - -export type MonthlySales = { - name: string - estimate: number - actual: number -} diff --git a/src/views/home/index.vue b/src/views/home/index.vue deleted file mode 100644 index 1cc81ac3a..000000000 --- a/src/views/home/index.vue +++ /dev/null @@ -1,14 +0,0 @@ - - From bedf7cb85a54391013abc669e7dd84a8a60b7918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sun, 4 Feb 2024 14:28:16 +0800 Subject: [PATCH 06/22] home --- src/views/home/Index copy.vue | 381 +++++++++++++++++ src/views/home/Index2.vue | 319 ++++++++++++++ src/views/home/components/material.vue | 336 +++++++++++++++ src/views/home/components/produce.vue | 286 +++++++++++++ src/views/home/components/product.vue | 313 ++++++++++++++ src/views/home/components/supplierIndex.vue | 452 ++++++++++++++++++++ src/views/home/echarts-data.ts | 286 +++++++++++++ src/views/home/index.vue | 14 + src/views/home/types.ts | 55 +++ 9 files changed, 2442 insertions(+) create mode 100644 src/views/home/Index copy.vue create mode 100644 src/views/home/Index2.vue create mode 100644 src/views/home/components/material.vue create mode 100644 src/views/home/components/produce.vue create mode 100644 src/views/home/components/product.vue create mode 100644 src/views/home/components/supplierIndex.vue create mode 100644 src/views/home/echarts-data.ts create mode 100644 src/views/home/index.vue create mode 100644 src/views/home/types.ts diff --git a/src/views/home/Index copy.vue b/src/views/home/Index copy.vue new file mode 100644 index 000000000..121ec6a8b --- /dev/null +++ b/src/views/home/Index copy.vue @@ -0,0 +1,381 @@ + + diff --git a/src/views/home/Index2.vue b/src/views/home/Index2.vue new file mode 100644 index 000000000..c9429ab10 --- /dev/null +++ b/src/views/home/Index2.vue @@ -0,0 +1,319 @@ + + + + diff --git a/src/views/home/components/material.vue b/src/views/home/components/material.vue new file mode 100644 index 000000000..83aadaa35 --- /dev/null +++ b/src/views/home/components/material.vue @@ -0,0 +1,336 @@ + + + + diff --git a/src/views/home/components/produce.vue b/src/views/home/components/produce.vue new file mode 100644 index 000000000..c289ec0c0 --- /dev/null +++ b/src/views/home/components/produce.vue @@ -0,0 +1,286 @@ + + + + diff --git a/src/views/home/components/product.vue b/src/views/home/components/product.vue new file mode 100644 index 000000000..5124d9c11 --- /dev/null +++ b/src/views/home/components/product.vue @@ -0,0 +1,313 @@ + + + + diff --git a/src/views/home/components/supplierIndex.vue b/src/views/home/components/supplierIndex.vue new file mode 100644 index 000000000..c665f9867 --- /dev/null +++ b/src/views/home/components/supplierIndex.vue @@ -0,0 +1,452 @@ + + + + diff --git a/src/views/home/echarts-data.ts b/src/views/home/echarts-data.ts new file mode 100644 index 000000000..15c7b4afd --- /dev/null +++ b/src/views/home/echarts-data.ts @@ -0,0 +1,286 @@ +import { EChartsOption } from 'echarts' + +const { t } = useI18n() + +export const lineOptions: EChartsOption = { + + xAxis: { + data: [ 1, 2, 3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 + ], + boundaryGap: false, + axisTick: { + show: false + } + }, + grid: { + left: 20, + right: 20, + bottom: 20, + top: 50, + containLabel: true + }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'cross' + }, + padding: [5, 10] + }, + yAxis: { + axisTick: { + show: false + } + }, + legend: { + data: ['销售','哈哈'], + top: 20 + }, + series: [ + { + name: '销售', + smooth: true, + type: 'line', + data: [100, 120, 161, 134, 105, 160, 165, 114, 163, 185, 118, 123], + animationDuration: 2800, + animationEasing: 'cubicInOut' + }, + { + name: '哈哈', + smooth: true, + type: 'line', + itemStyle: {}, + data: [120, 82, 91, 154, 162, 140, 145, 250, 134, 56, 99, 123], + animationDuration: 2800, + animationEasing: 'quadraticOut' + } + ] +} + +export const pieOptions: EChartsOption = { + // title: { + // text: t('analysis.userAccessSource'), + // left: 'center' + // }, + tooltip: { + trigger: 'item', + formatter: '{a}
{b} : {c} ({d}%)' + }, + legend: { + orient: 'vertical', + left: 'left', + top:20, + data: [ + t('analysis.directAccess'), + t('analysis.mailMarketing'), + t('analysis.allianceAdvertising'), + t('analysis.videoAdvertising'), + t('analysis.searchEngines') + ] + }, + series: [ + { + name: t('analysis.userAccessSource'), + type: 'pie', + radius: '55%', + center: ['50%', '60%'], + data: [ + { value: 335, name: t('analysis.directAccess') }, + { value: 310, name: t('analysis.mailMarketing') }, + { value: 234, name: t('analysis.allianceAdvertising') }, + { value: 135, name: t('analysis.videoAdvertising') }, + { value: 1548, name: t('analysis.searchEngines') } + ] + } + ] +} + +export const barOptions: EChartsOption = { + title: { + text: '', + left: 'center' + }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'shadow' + } + }, + grid: { + left: 50, + right: 20, + bottom: 20 + }, + xAxis: { + type: 'category', + data: [], + axisTick: { + alignWithLabel: true + } + }, + yAxis: { + type: 'value' + }, + series: [ + { + name: t('analysis.activeQuantity'), + data: [], + type: 'bar' + } + ] +} + +export const radarOption: EChartsOption = { + legend: { + data: [t('workplace.personal'), t('workplace.team')] + }, + radar: { + // shape: 'circle', + indicator: [ + { name: t('workplace.quote'), max: 65 }, + { name: t('workplace.contribution'), max: 160 }, + { name: t('workplace.hot'), max: 300 }, + { name: t('workplace.yield'), max: 130 }, + { name: t('workplace.follow'), max: 100 } + ] + }, + series: [ + { + name: `xxx${t('workplace.index')}`, + type: 'radar', + data: [ + { + value: [42, 30, 20, 35, 80], + name: t('workplace.personal') + }, + { + value: [50, 140, 290, 100, 90], + name: t('workplace.team') + } + ] + } + ] +} + +export const wordOptions = { + series: [ + { + type: 'wordCloud', + gridSize: 2, + sizeRange: [12, 50], + rotationRange: [-90, 90], + shape: 'pentagon', + width: 600, + height: 400, + drawOutOfBound: true, + textStyle: { + color: function () { + return ( + 'rgb(' + + [ + Math.round(Math.random() * 160), + Math.round(Math.random() * 160), + Math.round(Math.random() * 160) + ].join(',') + + ')' + ) + } + }, + emphasis: { + textStyle: { + shadowBlur: 10, + shadowColor: '#333' + } + }, + data: [ + { + name: 'Sam S Club', + value: 10000, + textStyle: { + color: 'black' + }, + emphasis: { + textStyle: { + color: 'red' + } + } + }, + { + name: 'Macys', + value: 6181 + }, + { + name: 'Amy Schumer', + value: 4386 + }, + { + name: 'Jurassic World', + value: 4055 + }, + { + name: 'Charter Communications', + value: 2467 + }, + { + name: 'Chick Fil A', + value: 2244 + }, + { + name: 'Planet Fitness', + value: 1898 + }, + { + name: 'Pitch Perfect', + value: 1484 + }, + { + name: 'Express', + value: 1112 + }, + { + name: 'Home', + value: 965 + }, + { + name: 'Johnny Depp', + value: 847 + }, + { + name: 'Lena Dunham', + value: 582 + }, + { + name: 'Lewis Hamilton', + value: 555 + }, + { + name: 'KXAN', + value: 550 + }, + { + name: 'Mary Ellen Mark', + value: 462 + }, + { + name: 'Farrah Abraham', + value: 366 + }, + { + name: 'Rita Ora', + value: 360 + }, + { + name: 'Serena Williams', + value: 282 + }, + { + name: 'NCAA baseball tournament', + value: 273 + }, + { + name: 'Point Break', + value: 265 + } + ] + } + ] +} diff --git a/src/views/home/index.vue b/src/views/home/index.vue new file mode 100644 index 000000000..1cc81ac3a --- /dev/null +++ b/src/views/home/index.vue @@ -0,0 +1,14 @@ + + diff --git a/src/views/home/types.ts b/src/views/home/types.ts new file mode 100644 index 000000000..e6313d36c --- /dev/null +++ b/src/views/home/types.ts @@ -0,0 +1,55 @@ +export type WorkplaceTotal = { + project: number + access: number + todo: number +} + +export type Project = { + name: string + icon: string + message: string + personal: string + time: Date | number | string +} + +export type Notice = { + title: string + type: string + keys: string[] + date: Date | number | string +} + +export type Shortcut = { + name: string + icon: string + url: string +} + +export type RadarData = { + personal: number + team: number + max: number + name: string +} +export type AnalysisTotalTypes = { + users: number + messages: number + moneys: number + shoppings: number +} + +export type UserAccessSource = { + value: number + name: string +} + +export type WeeklyUserActivity = { + value: number + name: string +} + +export type MonthlySales = { + name: string + estimate: number + actual: number +} From 090d49b1d7a655e451dcdd9eec51c196cb2d9ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sun, 4 Feb 2024 14:29:10 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E5=88=A0=E9=99=A4login?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Login/components/LoginForm.vue | 284 ------------------ src/views/Login/components/LoginFormTitle.vue | 26 -- src/views/Login/components/MobileForm.vue | 225 -------------- src/views/Login/components/QrCodeForm.vue | 30 -- src/views/Login/components/RegisterForm.vue | 142 --------- src/views/Login/components/SSOLogin.vue | 199 ------------ src/views/Login/components/index.ts | 8 - src/views/Login/components/useLogin.ts | 42 --- src/views/login/login.vue | 104 ------- 9 files changed, 1060 deletions(-) delete mode 100644 src/views/Login/components/LoginForm.vue delete mode 100644 src/views/Login/components/LoginFormTitle.vue delete mode 100644 src/views/Login/components/MobileForm.vue delete mode 100644 src/views/Login/components/QrCodeForm.vue delete mode 100644 src/views/Login/components/RegisterForm.vue delete mode 100644 src/views/Login/components/SSOLogin.vue delete mode 100644 src/views/Login/components/index.ts delete mode 100644 src/views/Login/components/useLogin.ts delete mode 100644 src/views/login/login.vue diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue deleted file mode 100644 index 6c235f45a..000000000 --- a/src/views/Login/components/LoginForm.vue +++ /dev/null @@ -1,284 +0,0 @@ - - - - diff --git a/src/views/Login/components/LoginFormTitle.vue b/src/views/Login/components/LoginFormTitle.vue deleted file mode 100644 index cdf4facce..000000000 --- a/src/views/Login/components/LoginFormTitle.vue +++ /dev/null @@ -1,26 +0,0 @@ - - diff --git a/src/views/Login/components/MobileForm.vue b/src/views/Login/components/MobileForm.vue deleted file mode 100644 index ebb36b84e..000000000 --- a/src/views/Login/components/MobileForm.vue +++ /dev/null @@ -1,225 +0,0 @@ - - - - diff --git a/src/views/Login/components/QrCodeForm.vue b/src/views/Login/components/QrCodeForm.vue deleted file mode 100644 index 31d28453e..000000000 --- a/src/views/Login/components/QrCodeForm.vue +++ /dev/null @@ -1,30 +0,0 @@ - - diff --git a/src/views/Login/components/RegisterForm.vue b/src/views/Login/components/RegisterForm.vue deleted file mode 100644 index 23b3bd428..000000000 --- a/src/views/Login/components/RegisterForm.vue +++ /dev/null @@ -1,142 +0,0 @@ - - diff --git a/src/views/Login/components/SSOLogin.vue b/src/views/Login/components/SSOLogin.vue deleted file mode 100644 index f31ab0e5f..000000000 --- a/src/views/Login/components/SSOLogin.vue +++ /dev/null @@ -1,199 +0,0 @@ - - diff --git a/src/views/Login/components/index.ts b/src/views/Login/components/index.ts deleted file mode 100644 index 204ad73d0..000000000 --- a/src/views/Login/components/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -import LoginForm from './LoginForm.vue' -import MobileForm from './MobileForm.vue' -import LoginFormTitle from './LoginFormTitle.vue' -import RegisterForm from './RegisterForm.vue' -import QrCodeForm from './QrCodeForm.vue' -import SSOLoginVue from './SSOLogin.vue' - -export { LoginForm, MobileForm, LoginFormTitle, RegisterForm, QrCodeForm, SSOLoginVue } diff --git a/src/views/Login/components/useLogin.ts b/src/views/Login/components/useLogin.ts deleted file mode 100644 index b4a02f8f1..000000000 --- a/src/views/Login/components/useLogin.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { Ref } from 'vue' - -export enum LoginStateEnum { - LOGIN, - REGISTER, - RESET_PASSWORD, - MOBILE, - QR_CODE, - SSO -} - -const currentState = ref(LoginStateEnum.LOGIN) - -export function useLoginState() { - function setLoginState(state: LoginStateEnum) { - currentState.value = state - } - const getLoginState = computed(() => currentState.value) - - function handleBackLogin() { - setLoginState(LoginStateEnum.LOGIN) - } - - return { - setLoginState, - getLoginState, - handleBackLogin - } -} - -export function useFormValid(formRef: Ref) { - async function validForm() { - const form = unref(formRef) - if (!form) return - const data = await form.validate() - return data as T - } - - return { - validForm - } -} diff --git a/src/views/login/login.vue b/src/views/login/login.vue deleted file mode 100644 index a0025ab66..000000000 --- a/src/views/login/login.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - - From 677158701afb1a196837a70a0a49d4fb7f1e9922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sun, 4 Feb 2024 14:29:23 +0800 Subject: [PATCH 08/22] login --- src/views/login/components/LoginForm.vue | 284 ++++++++++++++++++ src/views/login/components/LoginFormTitle.vue | 26 ++ src/views/login/components/MobileForm.vue | 225 ++++++++++++++ src/views/login/components/QrCodeForm.vue | 30 ++ src/views/login/components/RegisterForm.vue | 142 +++++++++ src/views/login/components/SSOLogin.vue | 199 ++++++++++++ src/views/login/components/index.ts | 8 + src/views/login/components/useLogin.ts | 42 +++ src/views/login/login.vue | 104 +++++++ 9 files changed, 1060 insertions(+) create mode 100644 src/views/login/components/LoginForm.vue create mode 100644 src/views/login/components/LoginFormTitle.vue create mode 100644 src/views/login/components/MobileForm.vue create mode 100644 src/views/login/components/QrCodeForm.vue create mode 100644 src/views/login/components/RegisterForm.vue create mode 100644 src/views/login/components/SSOLogin.vue create mode 100644 src/views/login/components/index.ts create mode 100644 src/views/login/components/useLogin.ts create mode 100644 src/views/login/login.vue diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue new file mode 100644 index 000000000..6c235f45a --- /dev/null +++ b/src/views/login/components/LoginForm.vue @@ -0,0 +1,284 @@ + + + + diff --git a/src/views/login/components/LoginFormTitle.vue b/src/views/login/components/LoginFormTitle.vue new file mode 100644 index 000000000..cdf4facce --- /dev/null +++ b/src/views/login/components/LoginFormTitle.vue @@ -0,0 +1,26 @@ + + diff --git a/src/views/login/components/MobileForm.vue b/src/views/login/components/MobileForm.vue new file mode 100644 index 000000000..ebb36b84e --- /dev/null +++ b/src/views/login/components/MobileForm.vue @@ -0,0 +1,225 @@ + + + + diff --git a/src/views/login/components/QrCodeForm.vue b/src/views/login/components/QrCodeForm.vue new file mode 100644 index 000000000..31d28453e --- /dev/null +++ b/src/views/login/components/QrCodeForm.vue @@ -0,0 +1,30 @@ + + diff --git a/src/views/login/components/RegisterForm.vue b/src/views/login/components/RegisterForm.vue new file mode 100644 index 000000000..23b3bd428 --- /dev/null +++ b/src/views/login/components/RegisterForm.vue @@ -0,0 +1,142 @@ + + diff --git a/src/views/login/components/SSOLogin.vue b/src/views/login/components/SSOLogin.vue new file mode 100644 index 000000000..f31ab0e5f --- /dev/null +++ b/src/views/login/components/SSOLogin.vue @@ -0,0 +1,199 @@ + + diff --git a/src/views/login/components/index.ts b/src/views/login/components/index.ts new file mode 100644 index 000000000..204ad73d0 --- /dev/null +++ b/src/views/login/components/index.ts @@ -0,0 +1,8 @@ +import LoginForm from './LoginForm.vue' +import MobileForm from './MobileForm.vue' +import LoginFormTitle from './LoginFormTitle.vue' +import RegisterForm from './RegisterForm.vue' +import QrCodeForm from './QrCodeForm.vue' +import SSOLoginVue from './SSOLogin.vue' + +export { LoginForm, MobileForm, LoginFormTitle, RegisterForm, QrCodeForm, SSOLoginVue } diff --git a/src/views/login/components/useLogin.ts b/src/views/login/components/useLogin.ts new file mode 100644 index 000000000..b4a02f8f1 --- /dev/null +++ b/src/views/login/components/useLogin.ts @@ -0,0 +1,42 @@ +import { Ref } from 'vue' + +export enum LoginStateEnum { + LOGIN, + REGISTER, + RESET_PASSWORD, + MOBILE, + QR_CODE, + SSO +} + +const currentState = ref(LoginStateEnum.LOGIN) + +export function useLoginState() { + function setLoginState(state: LoginStateEnum) { + currentState.value = state + } + const getLoginState = computed(() => currentState.value) + + function handleBackLogin() { + setLoginState(LoginStateEnum.LOGIN) + } + + return { + setLoginState, + getLoginState, + handleBackLogin + } +} + +export function useFormValid(formRef: Ref) { + async function validForm() { + const form = unref(formRef) + if (!form) return + const data = await form.validate() + return data as T + } + + return { + validForm + } +} diff --git a/src/views/login/login.vue b/src/views/login/login.vue new file mode 100644 index 000000000..a0025ab66 --- /dev/null +++ b/src/views/login/login.vue @@ -0,0 +1,104 @@ + + + + From c3d0e89b2b89912d905109c093b29c4bbd10104c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sun, 4 Feb 2024 14:29:58 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E5=88=A0=E9=99=A4profile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Profile/components/BasicInfo.vue | 92 ------------------ src/views/Profile/components/ProfileUser.vue | 99 -------------------- src/views/Profile/components/ResetPwd.vue | 73 --------------- src/views/Profile/components/UserAvatar.vue | 39 -------- src/views/Profile/components/UserSocial.vue | 94 ------------------- src/views/Profile/components/index.ts | 7 -- src/views/profile/index.vue | 64 ------------- 7 files changed, 468 deletions(-) delete mode 100644 src/views/Profile/components/BasicInfo.vue delete mode 100644 src/views/Profile/components/ProfileUser.vue delete mode 100644 src/views/Profile/components/ResetPwd.vue delete mode 100644 src/views/Profile/components/UserAvatar.vue delete mode 100644 src/views/Profile/components/UserSocial.vue delete mode 100644 src/views/Profile/components/index.ts delete mode 100644 src/views/profile/index.vue diff --git a/src/views/Profile/components/BasicInfo.vue b/src/views/Profile/components/BasicInfo.vue deleted file mode 100644 index e2189b156..000000000 --- a/src/views/Profile/components/BasicInfo.vue +++ /dev/null @@ -1,92 +0,0 @@ - - diff --git a/src/views/Profile/components/ProfileUser.vue b/src/views/Profile/components/ProfileUser.vue deleted file mode 100644 index b493499f3..000000000 --- a/src/views/Profile/components/ProfileUser.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - - diff --git a/src/views/Profile/components/ResetPwd.vue b/src/views/Profile/components/ResetPwd.vue deleted file mode 100644 index 477be91f4..000000000 --- a/src/views/Profile/components/ResetPwd.vue +++ /dev/null @@ -1,73 +0,0 @@ - - diff --git a/src/views/Profile/components/UserAvatar.vue b/src/views/Profile/components/UserAvatar.vue deleted file mode 100644 index c20168fa7..000000000 --- a/src/views/Profile/components/UserAvatar.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - - diff --git a/src/views/Profile/components/UserSocial.vue b/src/views/Profile/components/UserSocial.vue deleted file mode 100644 index 2f021abfd..000000000 --- a/src/views/Profile/components/UserSocial.vue +++ /dev/null @@ -1,94 +0,0 @@ - - diff --git a/src/views/Profile/components/index.ts b/src/views/Profile/components/index.ts deleted file mode 100644 index 9e1883cf4..000000000 --- a/src/views/Profile/components/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import BasicInfo from './BasicInfo.vue' -import ProfileUser from './ProfileUser.vue' -import ResetPwd from './ResetPwd.vue' -import UserAvatarVue from './UserAvatar.vue' -import UserSocial from './UserSocial.vue' - -export { BasicInfo, ProfileUser, ResetPwd, UserAvatarVue, UserSocial } diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue deleted file mode 100644 index e813f0435..000000000 --- a/src/views/profile/index.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - From 4082f9ce1987932904fea654fe467e4d0680cf6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sun, 4 Feb 2024 14:30:11 +0800 Subject: [PATCH 10/22] profile --- src/views/profile/components/BasicInfo.vue | 92 ++++++++++++++++++ src/views/profile/components/ProfileUser.vue | 99 ++++++++++++++++++++ src/views/profile/components/ResetPwd.vue | 73 +++++++++++++++ src/views/profile/components/UserAvatar.vue | 39 ++++++++ src/views/profile/components/UserSocial.vue | 94 +++++++++++++++++++ src/views/profile/components/index.ts | 7 ++ src/views/profile/index.vue | 64 +++++++++++++ 7 files changed, 468 insertions(+) create mode 100644 src/views/profile/components/BasicInfo.vue create mode 100644 src/views/profile/components/ProfileUser.vue create mode 100644 src/views/profile/components/ResetPwd.vue create mode 100644 src/views/profile/components/UserAvatar.vue create mode 100644 src/views/profile/components/UserSocial.vue create mode 100644 src/views/profile/components/index.ts create mode 100644 src/views/profile/index.vue diff --git a/src/views/profile/components/BasicInfo.vue b/src/views/profile/components/BasicInfo.vue new file mode 100644 index 000000000..e2189b156 --- /dev/null +++ b/src/views/profile/components/BasicInfo.vue @@ -0,0 +1,92 @@ + + diff --git a/src/views/profile/components/ProfileUser.vue b/src/views/profile/components/ProfileUser.vue new file mode 100644 index 000000000..b493499f3 --- /dev/null +++ b/src/views/profile/components/ProfileUser.vue @@ -0,0 +1,99 @@ + + + + diff --git a/src/views/profile/components/ResetPwd.vue b/src/views/profile/components/ResetPwd.vue new file mode 100644 index 000000000..477be91f4 --- /dev/null +++ b/src/views/profile/components/ResetPwd.vue @@ -0,0 +1,73 @@ + + diff --git a/src/views/profile/components/UserAvatar.vue b/src/views/profile/components/UserAvatar.vue new file mode 100644 index 000000000..c20168fa7 --- /dev/null +++ b/src/views/profile/components/UserAvatar.vue @@ -0,0 +1,39 @@ + + + + diff --git a/src/views/profile/components/UserSocial.vue b/src/views/profile/components/UserSocial.vue new file mode 100644 index 000000000..2f021abfd --- /dev/null +++ b/src/views/profile/components/UserSocial.vue @@ -0,0 +1,94 @@ + + diff --git a/src/views/profile/components/index.ts b/src/views/profile/components/index.ts new file mode 100644 index 000000000..9e1883cf4 --- /dev/null +++ b/src/views/profile/components/index.ts @@ -0,0 +1,7 @@ +import BasicInfo from './BasicInfo.vue' +import ProfileUser from './ProfileUser.vue' +import ResetPwd from './ResetPwd.vue' +import UserAvatarVue from './UserAvatar.vue' +import UserSocial from './UserSocial.vue' + +export { BasicInfo, ProfileUser, ResetPwd, UserAvatarVue, UserSocial } diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue new file mode 100644 index 000000000..e813f0435 --- /dev/null +++ b/src/views/profile/index.vue @@ -0,0 +1,64 @@ + + + From aa6f5a32e8853ed27e582854d37bfde2d919340a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sun, 4 Feb 2024 14:58:42 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/infra/codegen/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/infra/codegen/index.vue b/src/views/infra/codegen/index.vue index 4f99ce808..3018fb097 100644 --- a/src/views/infra/codegen/index.vue +++ b/src/views/infra/codegen/index.vue @@ -156,7 +156,7 @@ import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' import * as CodegenApi from '@/api/infra/codegen' import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig' -import ImportTable from './ImportTable.vue' +import ImportTable from './importTable.vue' import PreviewCode from './PreviewCode.vue' defineOptions({ name: 'InfraCodegen' }) From 65838b25bbe013db97449f76c58d827e8020a5cd Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Sun, 4 Feb 2024 15:37:29 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 7528c1ec9..1dea2d7e2 100644 --- a/nginx.conf +++ b/nginx.conf @@ -61,7 +61,7 @@ http { proxy_cache_valid 200 304 12h; proxy_cache_key $host$uri$is_args$args; try_files $uri $uri/ /index.html; - root /opt/sfms3.0/sfms3.0; + root /usr/share/nginx/html; index index.html index.htm; } } From 85717b4d12481aa6ad7d2b2cdfbc2ec265c1999f Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Sun, 4 Feb 2024 15:55:52 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.conf b/nginx.conf index 1dea2d7e2..bf59d15af 100644 --- a/nginx.conf +++ b/nginx.conf @@ -39,9 +39,9 @@ http { listen 25100; server_name_in_redirect off; server_name dev.ccwin-in.com; - access_log logs/sfms3.0.log main; + access_log /var/log/nginx/access main; + error_log /var/log/nginx/error.log; location /api/ { - access_log logs/sfms3.0.log main; proxy_pass http://sfms3.0/; proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for; From 8557d4f6f492f431d794e8bb789116d279998910 Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Sun, 4 Feb 2024 15:56:24 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index bf59d15af..b0cc29718 100644 --- a/nginx.conf +++ b/nginx.conf @@ -39,7 +39,7 @@ http { listen 25100; server_name_in_redirect off; server_name dev.ccwin-in.com; - access_log /var/log/nginx/access main; + access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log; location /api/ { proxy_pass http://sfms3.0/; From 285c335f05db759d6dffd7b0a4ac142d4b509b21 Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Sun, 4 Feb 2024 16:58:01 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- .env.test | 2 +- Dockerfile | 6 ++++-- nginx.conf | 2 +- package.json | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.env.production b/.env.production index a6c1280b0..31f9c9f27 100644 --- a/.env.production +++ b/.env.production @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=dist +VITE_OUT_DIR=sfms3.0 # 自定义接口路径 VITE_INTERFACE_URL='http://10.62.193.15:25100/magic/web/index.html' diff --git a/.env.test b/.env.test index 78536f89d..0c997f086 100644 --- a/.env.test +++ b/.env.test @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=dist +VITE_OUT_DIR=sfms3.0 # 自定义接口路径 VITE_INTERFACE_URL='http://dev.ccwin-in.com:25110/magic/web/index.html' diff --git a/Dockerfile b/Dockerfile index 902b6a496..ccf15bc1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ # 设置基础镜像 FROM nginx -# 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面 -COPY dist/ /usr/share/nginx/html/ + +WORKDIR /opt/sfms3.0 COPY nginx.conf /etc/nginx/nginx.conf +# 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面 +COPY sfms3.0/ /opt/sfms3.0 diff --git a/nginx.conf b/nginx.conf index b0cc29718..0ec811aa4 100644 --- a/nginx.conf +++ b/nginx.conf @@ -61,7 +61,7 @@ http { proxy_cache_valid 200 304 12h; proxy_cache_key $host$uri$is_args$args; try_files $uri $uri/ /index.html; - root /usr/share/nginx/html; + root /opt/sfms3.0; index index.html index.htm; } } diff --git a/package.json b/package.json index cf2eff10c..9f3a5a8c0 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "private": false, "scripts": { "dev": "vite", - "test": "vite build --mode test", - "prod": "vite build --mode production", + "test": "vite build --mode test --max-old-space-size=4096", + "prod": "vite build --mode production --max-old-space-size=4096", "preview": "vite preview", "lint": "eslint --fix --ext .js,.vue src" }, From 242576b2c58ed2d81dab3e7bd86eb6392b8df7bf Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Sun, 4 Feb 2024 16:58:43 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9f3a5a8c0..cf2eff10c 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "private": false, "scripts": { "dev": "vite", - "test": "vite build --mode test --max-old-space-size=4096", - "prod": "vite build --mode production --max-old-space-size=4096", + "test": "vite build --mode test", + "prod": "vite build --mode production", "preview": "vite preview", "lint": "eslint --fix --ext .js,.vue src" }, From 225cdd15f83c80b57a72e1cb69c2cdd4f4315e5a Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Sun, 4 Feb 2024 17:17:39 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.conf b/nginx.conf index 0ec811aa4..903bcf965 100644 --- a/nginx.conf +++ b/nginx.conf @@ -39,8 +39,8 @@ http { listen 25100; server_name_in_redirect off; server_name dev.ccwin-in.com; - access_log /var/log/nginx/access.log main; - error_log /var/log/nginx/error.log; + access_log /opt/sfms3.0/access.log main; + error_log /opt/sfms3.0/error.log; location /api/ { proxy_pass http://sfms3.0/; proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; From c560e65c38b309c27ff4738c20c15c03b010a4d3 Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Mon, 5 Feb 2024 09:29:43 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ccf15bc1d..635005bc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # 设置基础镜像 -FROM nginx +FROM nginx:WIN-1.25.3 WORKDIR /opt/sfms3.0 -COPY nginx.conf /etc/nginx/nginx.conf +COPY nginx.conf /usr/local/nginx/conf/nginx.conf # 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面 COPY sfms3.0/ /opt/sfms3.0 From c8c39206b7d9ee2f9cc25abcd41b68b5c435ff79 Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Mon, 5 Feb 2024 09:41:58 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9nginx=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/nginx.conf b/nginx.conf index 903bcf965..97a27585c 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,12 +1,6 @@ #user root; worker_processes 2; -#error_log logs/error.log; -#error_log logs/error.log notice; -#error_log logs/error.log info; - -#pid logs/nginx.pid; - events { worker_connections 1024; } @@ -38,9 +32,7 @@ http { server { listen 25100; server_name_in_redirect off; - server_name dev.ccwin-in.com; - access_log /opt/sfms3.0/access.log main; - error_log /opt/sfms3.0/error.log; + server_name dev.ccwin-in.com localhost; location /api/ { proxy_pass http://sfms3.0/; proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; From adee03fa3c3eaf5a8f96b96cfe80bf3108e091ef Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Mon, 5 Feb 2024 10:00:32 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9nginx=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 97a27585c..ed96c3692 100644 --- a/nginx.conf +++ b/nginx.conf @@ -32,7 +32,7 @@ http { server { listen 25100; server_name_in_redirect off; - server_name dev.ccwin-in.com localhost; + server_name dev.ccwin-in.com; location /api/ { proxy_pass http://sfms3.0/; proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; From 93911cdbb6081fdad9b91691d0c590a05adc337c Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Mon, 5 Feb 2024 10:34:34 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- nginx.conf | 2 +- src/router/index.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 635005bc8..2ec690981 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,5 +3,5 @@ FROM nginx:WIN-1.25.3 WORKDIR /opt/sfms3.0 COPY nginx.conf /usr/local/nginx/conf/nginx.conf -# 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面 +# 将dist文件中的内容复制到 /opt/sfms3.0 这个目录下面 COPY sfms3.0/ /opt/sfms3.0 diff --git a/nginx.conf b/nginx.conf index ed96c3692..407755758 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,4 +1,4 @@ -#user root; +user root; worker_processes 2; events { diff --git a/src/router/index.ts b/src/router/index.ts index 8f66ca31f..02d913f86 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,11 +1,11 @@ import type { App } from 'vue' import type { RouteRecordRaw } from 'vue-router' -import { createRouter, createWebHistory } from 'vue-router' +import { createRouter, createWebHashHistory } from 'vue-router' import remainingRouter from './modules/remaining' // 创建路由实例 const router = createRouter({ - history: createWebHistory(), // createWebHashHistory URL带#，createWebHistory URL不带# + history: createWebHashHistory(), // createWebHashHistory URL带#，createWebHistory URL不带# strict: true, routes: remainingRouter as RouteRecordRaw[], scrollBehavior: () => ({ left: 0, top: 0 }) From 6b33ad88d2fcaededb130241df5b8e730b7cc140 Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Mon, 5 Feb 2024 10:43:18 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 02d913f86..8f66ca31f 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,11 +1,11 @@ import type { App } from 'vue' import type { RouteRecordRaw } from 'vue-router' -import { createRouter, createWebHashHistory } from 'vue-router' +import { createRouter, createWebHistory } from 'vue-router' import remainingRouter from './modules/remaining' // 创建路由实例 const router = createRouter({ - history: createWebHashHistory(), // createWebHashHistory URL带#，createWebHistory URL不带# + history: createWebHistory(), // createWebHashHistory URL带#，createWebHistory URL不带# strict: true, routes: remainingRouter as RouteRecordRaw[], scrollBehavior: () => ({ left: 0, top: 0 })