Merge branch 'master' of http://dev.ccwin-in.com:3000/zhucheng/zhucheng-ui

.env.production

@@ -31,7 +31,7 @@ VITE_SOURCEMAP=false
 VITE_BASE_PATH=/
 
 # 输出路径
-VITE_OUT_DIR=dist-pro
+VITE_OUT_DIR=zhucheng
 
 # 积木报表请求路径
 # VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:26110'

.env.test

@@ -4,10 +4,10 @@ NODE_ENV=test
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://dev.ccwin-in.com:26110'
+VITE_BASE_URL='http://dev.ccwin-in.com:28009/api'
 
 # 上传路径
-VITE_UPLOAD_URL='http://dev.ccwin-in.com:26110/api/infra/file/upload'
+VITE_UPLOAD_URL='http://dev.ccwin-in.com:28009/api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=
@@ -28,10 +28,10 @@ VITE_SOURCEMAP=false
 VITE_BASE_PATH=/
 
 # 输出路径
-VITE_OUT_DIR=dist-test
+VITE_OUT_DIR=zhucheng
 
 # 自定义接口路径
-VITE_INTERFACE_URL='http://dev.ccwin-in.com:26112/magic/web/index.html'
+VITE_INTERFACE_URL='http://dev.ccwin-in.com:28009/magic/web/index.html'
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:26112'
+VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:28009'

Dockerfile

@@ -0,0 +1,7 @@
+# 设置基础镜像
+FROM nginx:WIN-1.25.3
+
+WORKDIR /opt/zhucheng
+COPY nginx.conf /usr/local/nginx/conf/nginx.conf
+# 将dist文件中的内容复制到 /opt/zhucheng 这个目录下面
+COPY zhucheng/ /opt/zhucheng

nginx.conf

@@ -0,0 +1,61 @@
+user  root;
+worker_processes  2;
+
+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 zhucheng {
+		server localhost:28009 weight=10 max_fails=3 fail_timeout=10s;
+	}
+	server {
+		listen       28000;
+		server_name_in_redirect off;
+		server_name    dev.ccwin-in.com;
+		location /api/ {
+			proxy_pass http://zhucheng/;
+			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/zhucheng;
+			index index.html index.htm;
+		}
+	}
+}
+

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,
@@ -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,
@@ -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,

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' })

src/views/pszc/cdannealing/index.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CdAnnealing,CdAnnealingRules } from './cdAnnealing.data'
-import * as CdAnnealingApi from '@/api/pszc/cdAnnealing'
+import * as CdAnnealingApi from '@/api/pszc/cdannealing'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'CdAnnealing' })

src/views/pszc/cdelectricdata/index.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CdElectricdata,CdElectricdataRules } from './cdElectricdata.data'
-import * as CdElectricdataApi from '@/api/pszc/cdElectricdata'
+import * as CdElectricdataApi from '@/api/pszc/cdelectricdata'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'CdElectricdata' })

src/views/pszc/cdnatgasdata/index.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CdNatgasdata,CdNatgasdataRules } from './cdNatgasdata.data'
-import * as CdNatgasdataApi from '@/api/pszc/cdNatgasdata'
+import * as CdNatgasdataApi from '@/api/pszc/cdnatgasdata'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'CdNatgasdata' })

src/views/pszc/cdpuncherdata/index.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CdPuncherdata,CdPuncherdataRules } from './cdPuncherdata.data'
-import * as CdPuncherdataApi from '@/api/pszc/cdPuncherdata'
+import * as CdPuncherdataApi from '@/api/pszc/cdpuncherdata'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'CdPuncherdata' })

src/views/pszc/cdslotfurnace/index.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CdSlotfurnace,CdSlotfurnaceRules } from './cdSlotfurnace.data'
-import * as CdSlotfurnaceApi from '@/api/pszc/cdSlotfurnace'
+import * as CdSlotfurnaceApi from '@/api/pszc/cdslotfurnace'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'CdSlotfurnace' })

src/views/pszc/cdsmelterfurnace/index.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CdSmelterfurnace,CdSmelterfurnaceRules } from './cdSmelterfurnace.data'
-import * as CdSmelterfurnaceApi from '@/api/pszc/cdSmelterfurnace'
+import * as CdSmelterfurnaceApi from '@/api/pszc/cdsmelterfurnace'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'CdSmelterfurnace' })

src/views/pszc/cdstepfurnace/index.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CdStepfurnace,CdStepfurnaceRules } from './cdStepfurnace.data'
-import * as CdStepfurnaceApi from '@/api/pszc/cdStepfurnace'
+import * as CdStepfurnaceApi from '@/api/pszc/cdstepfurnace'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'CdStepfurnace' })

src/views/pszc/cdwatermeter/index.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CdWatermeter,CdWatermeterRules } from './cdWatermeter.data'
-import * as CdWatermeterApi from '@/api/pszc/cdWatermeter'
+import * as CdWatermeterApi from '@/api/pszc/cdwatermeter'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'CdWatermeter' })

src/views/pszc/hrannularfurnace90/index.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { HrAnnularfurnace90,HrAnnularfurnace90Rules } from './hrAnnularfurnace90.data'
-import * as HrAnnularfurnace90Api from '@/api/pszc/hrAnnularfurnace90'
+import * as HrAnnularfurnace90Api from '@/api/pszc/hrannularfurnace90'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'HrAnnularfurnace90' })

src/views/pszc/hrelongatordata90/index.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { HrElongatordata90,HrElongatordata90Rules } from './hrElongatordata90.data'
-import * as HrElongatordata90Api from '@/api/pszc/hrElongatordata90'
+import * as HrElongatordata90Api from '@/api/pszc/hrelongatordata90'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'HrElongatordata90' })

src/views/pszc/hrnatgasdata/index.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { HrNatgasdata,HrNatgasdataRules } from './hrNatgasdata.data'
-import * as HrNatgasdataApi from '@/api/pszc/hrNatgasdata'
+import * as HrNatgasdataApi from '@/api/pszc/hrnatgasdata'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'HrNatgasdata' })

src/views/pszc/hrpuncherdata90/index.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { HrPuncherdata90,HrPuncherdata90Rules } from './hrPuncherdata90.data'
-import * as HrPuncherdata90Api from '@/api/pszc/hrPuncherdata90'
+import * as HrPuncherdata90Api from '@/api/pszc/hrpuncherdata90'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'HrPuncherdata90' })

src/views/pszc/hrpuncherdata90/operationtimedata90/index.vue

@@ -66,7 +66,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { HrPuncherdata90,HrPuncherdata90Rules } from './hrPuncherdata90.data'
-import * as HrPuncherdata90Api from '@/api/pszc/hrPuncherdata90'
+import * as HrPuncherdata90Api from '@/api/pszc/hrpuncherdata90'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'

src/views/pszc/hrpuncherdata90/rollcountdata90/index.vue

@@ -66,7 +66,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { HrPuncherdata90,HrPuncherdata90Rules } from './hrPuncherdata90.data'
-import * as HrPuncherdata90Api from '@/api/pszc/hrPuncherdata90'
+import * as HrPuncherdata90Api from '@/api/pszc/hrpuncherdata90'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'

src/views/pszc/hrpuncherdata90/rolltimedata90/index.vue

@@ -66,7 +66,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { HrPuncherdata90,HrPuncherdata90Rules } from './hrPuncherdata90.data'
-import * as HrPuncherdata90Api from '@/api/pszc/hrPuncherdata90'
+import * as HrPuncherdata90Api from '@/api/pszc/hrpuncherdata90'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'

src/views/pszc/hrsizingmilldata90/index.vue

@@ -67,7 +67,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { HrSizingmilldata90,HrSizingmilldata90Rules } from './hrSizingmilldata90.data'
-import * as HrSizingmilldata90Api from '@/api/pszc/hrSizingmilldata90'
+import * as HrSizingmilldata90Api from '@/api/pszc/hrsizingmilldata90'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'