From c8d15c5b7674e9967100fce70383c535b88426be Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Wed, 9 Oct 2024 11:13:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + electron/config/config.local.js | 2 +- electron/config/config.prod.js | 2 +- frontend/.env | 2 +- frontend/.env.development | 2 +- frontend/.env.production | 4 +- frontend/components.d.ts | 9 --- frontend/package.json | 5 +- package.json | 3 +- public/dist/assets/Index-630507e4.js | 1 - public/dist/assets/Index-812274cb.css | 1 - public/dist/assets/index-94991f0a.js | 7 -- public/dist/assets/index-b7b2ffb7.css | 1 - public/dist/index.html | 107 -------------------------- 14 files changed, 11 insertions(+), 136 deletions(-) delete mode 100644 public/dist/assets/Index-630507e4.js delete mode 100644 public/dist/assets/Index-812274cb.css delete mode 100644 public/dist/assets/index-94991f0a.js delete mode 100644 public/dist/assets/index-b7b2ffb7.css delete mode 100644 public/dist/index.html diff --git a/.gitignore b/.gitignore index 2d49627..b1e7bae 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ package-lock.json data/ .vscode/launch.json public/electron/ +public/dist/ pnpm-lock.yaml diff --git a/electron/config/config.local.js b/electron/config/config.local.js index 69938ca..18a910d 100644 --- a/electron/config/config.local.js +++ b/electron/config/config.local.js @@ -16,7 +16,7 @@ module.exports = (appInfo) => { /** * 应用程序顶部菜单 */ - config.openAppMenu = true; + config.openAppMenu = false; /** * jobs diff --git a/electron/config/config.prod.js b/electron/config/config.prod.js index 5c5218d..3ec4f37 100644 --- a/electron/config/config.prod.js +++ b/electron/config/config.prod.js @@ -9,7 +9,7 @@ module.exports = (appInfo) => { /** * 开发者工具 */ - config.openDevTools = false; + config.openDevTools = true; /** * 应用程序顶部菜单 diff --git a/frontend/.env b/frontend/.env index cdcf40a..6ec8e14 100644 --- a/frontend/.env +++ b/frontend/.env @@ -5,7 +5,7 @@ VITE_GLOB_APP_TITLE=PQS-9100自动检测平台 VITE_PORT=18091 # 启动时自动打开浏览器 -VITE_OPEN=true +VITE_OPEN=false # 打包后是否生成包分析文件 VITE_REPORT=false diff --git a/frontend/.env.development b/frontend/.env.development index cd292f2..52e29f0 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -2,7 +2,7 @@ VITE_USER_NODE_ENV=development # 公共基础路径 -VITE_PUBLIC_PATH=/ +VITE_PUBLIC_PATH=./ # 路由模式 # Optional: hash | history diff --git a/frontend/.env.production b/frontend/.env.production index ab062ea..ff73dbb 100644 --- a/frontend/.env.production +++ b/frontend/.env.production @@ -2,7 +2,7 @@ VITE_USER_NODE_ENV=production # 公共基础路径 -VITE_PUBLIC_PATH=/ +VITE_PUBLIC_PATH=./ # 路由模式 # Optional: hash | history @@ -22,4 +22,4 @@ VITE_DROP_CONSOLE=true VITE_PWA=true # 线上环境接口地址 -VITE_API_URL="https://mock.mengxuegu.com/mock/629d727e6163854a32e8307e" +VITE_API_URL="http://192.168.1.125:18092/" diff --git a/frontend/components.d.ts b/frontend/components.d.ts index 1d2ecf3..2075153 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -11,11 +11,8 @@ declare module 'vue' { 404: typeof import('./src/components/ErrorMessage/404.vue')['default'] 500: typeof import('./src/components/ErrorMessage/500.vue')['default'] ColSetting: typeof import('./src/components/ProTable/components/ColSetting.vue')['default'] - ComplexProTable: typeof import('./src/components/proTable/complexProTable/index.vue')['default'] Default: typeof import('./src/components/echarts/pie/default.vue')['default'] - Detail: typeof import('./src/components/proTable/useProTable/detail.vue')['default'] Dialog: typeof import('./src/components/Dialog/index.vue')['default'] - Document: typeof import('./src/components/proTable/document/index.vue')['default'] ElAside: typeof import('element-plus/es')['ElAside'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] @@ -60,7 +57,6 @@ declare module 'vue' { ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] ElTree: typeof import('element-plus/es')['ElTree'] - ElUpload: typeof import('element-plus/es')['ElUpload'] Grid: typeof import('./src/components/Grid/index.vue')['default'] GridItem: typeof import('./src/components/Grid/components/GridItem.vue')['default'] ImportExcel: typeof import('./src/components/ImportExcel/index.vue')['default'] @@ -74,10 +70,5 @@ declare module 'vue' { SvgIcon: typeof import('./src/components/staticExtend/SvgIcon/src/SvgIcon.vue')['default'] SwitchDark: typeof import('./src/components/SwitchDark/index.vue')['default'] TableColumn: typeof import('./src/components/ProTable/components/TableColumn.vue')['default'] - TreeProTable: typeof import('./src/components/proTable/treeProTable/index.vue')['default'] - UseProTable: typeof import('./src/components/proTable/useProTable/index.vue')['default'] - UserDrawer: typeof import('./src/components/proTable/components/UserDrawer.vue')['default'] - UseSelectFilter: typeof import('./src/components/proTable/useSelectFilter/index.vue')['default'] - UseTreeFilter: typeof import('./src/components/proTable/useTreeFilter/index.vue')['default'] } } diff --git a/frontend/package.json b/frontend/package.json index 8999bf8..99a75ea 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -26,12 +26,14 @@ "element-plus": "^2.7.8", "md5": "^2.3.0", "mitt": "^3.0.1", + "mkdirp": "^3.0.1", "nprogress": "^0.2.0", "pinia": "^2.2.1", "pinia-plugin-persistedstate": "^3.2.1", "print-js": "^1.6.0", "qs": "^6.11.2", "screenfull": "^6.0.2", + "semver": "^7.3.5", "sortablejs": "^1.15.0", "vue": "^3.4.29", "vue-i18n": "^9.4.0", @@ -75,8 +77,5 @@ "vite-plugin-pwa": "^0.16.5", "vite-plugin-svg-icons": "^2.0.1", "vue-tsc": "^2.0.21" - }, - "engines": { - "node": ">=16.0.0" } } diff --git a/package.json b/package.json index 104bc71..7208b69 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "electron-egg", "ElectronEgg" ], - "author": "哆啦好梦, Inc <530353222@qq.com>", + "author": "hongawen, Inc <83944980@qq.com>", "license": "Apache", "devDependencies": { "@electron/rebuild": "^3.2.13", @@ -62,3 +62,4 @@ "lodash": "^4.17.21" } } + diff --git a/public/dist/assets/Index-630507e4.js b/public/dist/assets/Index-630507e4.js deleted file mode 100644 index 66195fb..0000000 --- a/public/dist/assets/Index-630507e4.js +++ /dev/null @@ -1 +0,0 @@ -import{_ as a,o as t,c as s,a as e}from"./index-94991f0a.js";const o={data:()=>({})},c={id:"hero"},n=[e('
A fast, desktop software development framework
',3)];const d=a(o,[["render",function(a,e,o,d,r,p){return t(),s("section",c,n)}],["__scopeId","data-v-505540b8"]]);export{d as default}; diff --git a/public/dist/assets/Index-812274cb.css b/public/dist/assets/Index-812274cb.css deleted file mode 100644 index eee8430..0000000 --- a/public/dist/assets/Index-812274cb.css +++ /dev/null @@ -1 +0,0 @@ -section[data-v-505540b8]{padding:42px 32px}#hero[data-v-505540b8]{padding:150px 32px;text-align:center;height:100%}.tagline[data-v-505540b8]{font-size:52px;line-height:1.25;font-weight:700;letter-spacing:-1.5px;max-width:960px;margin:0 auto}html:not(.dark) .accent[data-v-505540b8],.dark .tagline[data-v-505540b8]{background:-webkit-linear-gradient(315deg,#42d392 25%,#647eff);background-clip:text;-webkit-background-clip:text;-webkit-text-fill-color:transparent}.description[data-v-505540b8]{max-width:960px;line-height:1.5;color:var(--vt-c-text-2);transition:color .5s;font-size:22px;margin:24px auto 40px}.actions a[data-v-505540b8]{font-size:16px;display:inline-block;background-color:var(--vt-c-bg-mute);padding:8px 18px;font-weight:500;border-radius:8px;transition:background-color .5s,color .5s;text-decoration:none}.actions .setup[data-v-505540b8]{color:var(--vt-c-text-code);background:-webkit-linear-gradient(315deg,#42d392 25%,#647eff)}.actions .setup[data-v-505540b8]:hover{background-color:var(--vt-c-gray-light-4);transition-duration:.2s} diff --git a/public/dist/assets/index-94991f0a.js b/public/dist/assets/index-94991f0a.js deleted file mode 100644 index f1abab4..0000000 --- a/public/dist/assets/index-94991f0a.js +++ /dev/null @@ -1,7 +0,0 @@ -function e(e,t){const n=Object.create(null),r=e.split(",");for(let o=0;of?J(e,s,l,!0,!1,p):F(t,r,o,s,l,i,c,a,p)},z=(e,t,r,o,s,l,i,c,a)=>{let u=0;const f=t.length;let p=e.length-1,d=f-1;for(;u<=p&&u<=d;){const n=e[u],o=t[u]=a?Ir(t[u]):Mr(t[u]);if(!Or(n,o))break;y(n,o,r,null,s,l,i,c,a),u++}for(;u<=p&&u<=d;){const n=e[p],o=t[d]=a?Ir(t[d]):Mr(t[d]);if(!Or(n,o))break;y(n,o,r,null,s,l,i,c,a),p--,d--}if(u>p){if(u<=d){const e=d+1,n=eUo(e,s)))?r.push(s):n.push(s));const i=e.matched[l];i&&(t.matched.find((e=>Uo(e,i)))||o.push(i))}return[n,r,o]}(e,t);n=Js(r.reverse(),"beforeRouteLeave",e,t);for(const s of r)s.leaveGuards.forEach((r=>{n.push(Zs(r,e,t))}));const c=b.bind(null,e,t);return n.push(c),I(n).then((()=>{n=[];for(const r of s.list())n.push(Zs(r,e,t));return n.push(c),I(n)})).then((()=>{n=Js(o,"beforeRouteUpdate",e,t);for(const r of o)r.updateGuards.forEach((r=>{n.push(Zs(r,e,t))}));return n.push(c),I(n)})).then((()=>{n=[];for(const r of i)if(r.beforeEnter)if(Ao(r.beforeEnter))for(const o of r.beforeEnter)n.push(Zs(o,e,t));else n.push(Zs(r.beforeEnter,e,t));return n.push(c),I(n)})).then((()=>(e.matched.forEach((e=>e.enterCallbacks={})),n=Js(i,"beforeRouteEnter",e,t),n.push(c),I(n)))).then((()=>{n=[];for(const r of l.list())n.push(Zs(r,e,t));return n.push(c),I(n)})).catch((e=>cs(e,8)?e:Promise.reject(e)))}function x(e,t,n){i.list().forEach((r=>_((()=>r(e,t,n)))))}function E(e,t,n,r,s){const l=m(e,t);if(l)return l;const i=t===rs,a=Ro?history.state:{};n&&(r||i?o.replace(e.fullPath,jo({scroll:i&&a&&a.scroll},s)):o.push(e.fullPath,s)),c.value=e,F(e,t,n,i),j()}let C;function S(){C||(C=o.listen(((e,t,n)=>{if(!M.listening)return;const r=d(e),s=v(r);if(s)return void y(jo(s,{replace:!0}),r).catch($o);a=r;const l=c.value;var i,u;Ro&&(i=Qo(l.fullPath,n.delta),u=Ko(),Yo.set(i,u)),w(r,l).catch((e=>cs(e,12)?e:cs(e,2)?(y(e.to,r).then((e=>{cs(e,20)&&!n.delta&&n.type===Wo.pop&&o.go(-1,!1)})).catch($o),Promise.reject()):(n.delta&&o.go(-n.delta,!1),R(e,r,l)))).then((e=>{(e=e||E(r,l,!1))&&(n.delta&&!cs(e,8)?o.go(-n.delta,!1):n.type===Wo.pop&&cs(e,20)&&o.go(-1,!1)),x(r,l,e)})).catch($o)})))}let O,k=Ys(),P=Ys();function R(e,t,n){j(e);const r=P.list();return r.length?r.forEach((r=>r(e,t,n))):console.error(e),Promise.reject(e)}function j(e){return O||(O=!e,S(),k.list().forEach((([t,n])=>e?n(e):t())),k.reset()),e}function F(t,n,r,o){const{scrollBehavior:s}=e;if(!Ro||!s)return Promise.resolve();const l=!r&&function(e){const t=Yo.get(e);return Yo.delete(e),t}(Qo(t.fullPath,0))||(o||!r)&&history.state&&history.state.scroll||null;return Ft().then((()=>s(t,n,l))).then((e=>e&&Xo(e))).catch((e=>R(e,t,n)))}const $=e=>o.go(e);let A;const T=new Set,M={currentRoute:c,listening:!0,addRoute:function(e,n){let r,o;return ns(e)?(r=t.getRecordMatcher(e),o=n):o=e,t.addRoute(o,r)},removeRoute:function(e){const n=t.getRecordMatcher(e);n&&t.removeRoute(n)},hasRoute:function(e){return!!t.getRecordMatcher(e)},getRoutes:function(){return t.getRoutes().map((e=>e.record))},resolve:d,options:e,push:g,replace:function(e){return g(jo(h(e),{replace:!0}))},go:$,back:()=>$(-1),forward:()=>$(1),beforeEach:s.add,beforeResolve:l.add,afterEach:i.add,onError:P.add,isReady:function(){return O&&c.value!==rs?Promise.resolve():new Promise(((e,t)=>{k.add([e,t])}))},install(e){e.component("RouterLink",tl),e.component("RouterView",sl),e.config.globalProperties.$router=this,Object.defineProperty(e.config.globalProperties,"$route",{enumerable:!0,get:()=>mt(c)}),Ro&&!A&&c.value===rs&&(A=!0,g(o.location).catch((e=>{})));const t={};for(const r in rs)Object.defineProperty(t,r,{get:()=>c.value[r],enumerable:!0});e.provide(Ks,this),e.provide(Xs,Je(t)),e.provide(Qs,c);const n=e.unmount;T.add(e),e.unmount=function(){T.delete(e),T.size<1&&(a=rs,C&&C(),C=null,c.value=rs,A=!1,O=!1),n()}}};function I(e){return e.reduce(((e,t)=>e.then((()=>_(t)))),Promise.resolve())}return M}({history:((ul=location.host?ul||location.pathname+location.search:"").includes("#")||(ul+="#"),ts(ul)),routes:cl});var ul;const fl=((...e)=>{const t=(Eo||(Eo=fr(xo))).createApp(...e),{mount:n}=t;return t.mount=e=>{const r=function(e){if(g(e)){return document.querySelector(e)}return e}(e);if(!r)return;const o=t._component;m(o)||o.render||o.template||(o.template=r.innerHTML),r.innerHTML="";const s=n(r,!1,r instanceof SVGElement);return r instanceof Element&&(r.removeAttribute("v-cloak"),r.setAttribute("data-v-app","")),s},t})(So);fl.config.productionTip=!1;for(const pl in Po)fl.component(pl,Po[pl]);fl.use(al).mount("#app");export{Co as _,Tr as a,Cr as c,_r as o};
diff --git a/public/dist/assets/index-b7b2ffb7.css b/public/dist/assets/index-b7b2ffb7.css
deleted file mode 100644
index 515ba0d..0000000
--- a/public/dist/assets/index-b7b2ffb7.css
+++ /dev/null
@@ -1 +0,0 @@
-#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-align:center;color:#2c3e50;height:100%}
diff --git a/public/dist/index.html b/public/dist/index.html
deleted file mode 100644
index f66fd07..0000000
--- a/public/dist/index.html
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
-
-
-