111

package.json

@@ -7,12 +7,11 @@
         "start": "electron-vite preview",
         "dev": "electron-vite dev",
         "build": "electron-vite build",
-        "npm:build": "npm run build",
         "postinstall": "electron-builder install-app-deps",
         "build:unpack": "electron-builder --dir",
-        "build:win": "electron-builder --win",
-        "build:mac": "electron-builder --mac",
-        "build:linux": "electron-builder --linux"
+        "build:mac": "npm run build && electron-builder --mac",
+        "build:win": "npm run build && electron-builder --win",
+        "build:linux": "npm run build && electron-builder --linux"
     },
     "dependencies": {
         "@electron-toolkit/preload": "^3.0.0",

src/renderer/src/layout/index.vue

@@ -32,13 +32,14 @@
 <script setup>
 import { onMounted, ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { getProjectInfo } from '../store/app'
 import { toPage } from '../utils/tools'
 
 //初始组合式
 const store = useAppStore()
 const useRoutes = useRoute()
+const router = useRouter()
 
 //项目信息
 const projectInfo = ref(store.projectInfo)
@@ -53,7 +54,10 @@ const isMain = ref(false)
 onMounted(async () => {
     const { code } = await getProjectInfo()
     if (code !== 200) {
-        toPage('/project', { source: '' })
+        await router.push({
+            path: '/project',
+            query: { source: '' },
+        })
     }
     isMain.value = true
     setIpcRenderer()
@@ -62,9 +66,9 @@ onMounted(async () => {
 //设置通信监听
 const setIpcRenderer = () => {
     window.electron.ipcRenderer.on('open-file', (event, { data }) => {
-        toPage('/project', {
-            path: data,
-            source: '',
+        router.push({
+            path: '/project',
+            query: { path: data, source: '' },
         })
     })
 }
@@ -72,8 +76,9 @@ const setIpcRenderer = () => {
 //项目管理
 const handleProject = () => {
     const { path } = useRoutes
-    toPage('/project', {
-        source:  path ?? '',
+    router.push({
+        path: '/project',
+        query: { source:  path ?? '' },
     })
 }
 

src/renderer/src/views/home.vue

@@ -37,6 +37,7 @@
 <script setup>
 import { onMounted, ref } from 'vue'
 import { useAppStore } from '~src/store'
+import { useRouter } from 'vue-router'
 import { exec_sql } from '../utils/dbConnect'
 import card2Png from '~src/assets/card2.png'
 import { filterSize, isNullES } from 'js-fast-way'
@@ -44,10 +45,10 @@ import { filterSize, isNullES } from 'js-fast-way'
 //日期操作
 import dayjs from 'dayjs'
 import 'dayjs/locale/zh-cn'
-import { toPage } from '../utils/tools'
 dayjs.locale('zh-cn')
 
 //初始组合式
+const router = useRouter()
 const store = useAppStore()
 
 //项目信息
@@ -197,7 +198,7 @@ const getHistogram = async () => {
 
 //点击进馆查询
 const toQueryClick = () => {
-    toPage('/query')
+    router.push({ path: '/query' })
 }
 
 //打开开发者工具

src/renderer/src/views/init.vue

@@ -23,9 +23,12 @@
 
 <script setup>
 import { onMounted, ref } from 'vue'
-import { read_config_file, showOpenDialog, toPage, write_config_file } from '../utils/tools'
+import { useRouter } from 'vue-router'
+import { read_config_file, showOpenDialog, write_config_file } from '../utils/tools'
 import { formValidate } from 'js-fast-way'
 
+const router = useRouter()
+
 //基础表单
 const formRef = ref(null)
 const formModel = ref({})
@@ -64,6 +67,9 @@ const confirmSave = async () => {
         return
     }
     window.$message.success('保存成功')
-    toPage('/project', { source: '' })
+    await router.push({
+        path: '/project',
+        query: { source:  '' },
+    })
 }
 </script>

src/renderer/src/views/project.vue

@@ -24,11 +24,12 @@
 import { onMounted, ref, watch } from 'vue'
 import { useAppStore } from '../store'
 import { getProjectInfo } from '../store/app'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { getArrValue, getObjValue, isArrIndex, isNullES } from 'js-fast-way'
 import { delMessage, exists_file, showOpenDialog, toPage, write_file } from '../utils/tools'
 
 //初始组合式
+const router = useRouter()
 const useRoutes = useRoute()
 const store = useAppStore()
 
@@ -173,7 +174,7 @@ const delClick = async (item) => {
 const toBackPage = () => {
     const source = pageSource.value
     if (!isNullES(source)) {
-        toPage(source)
+        router.push({ path: source })
     }
 }
 </script>

src/renderer/src/views/query.vue

@@ -74,13 +74,14 @@
 <script setup>
 import { nextTick, onMounted, ref } from 'vue'
 import { useAppStore } from '~src/store'
+import { useRouter } from 'vue-router'
 import { sql_count, sql_table } from '../utils/dbConnect'
 import { getArrValue, isNullES } from 'js-fast-way'
 import QueryFileRoll from '../components/query/file-roll.vue'
-import { toPage } from '../utils/tools'
 
 //初始组合式
 const store = useAppStore()
+const router = useRouter()
 
 //项目信息
 const projectInfo = ref(store.projectInfo)
@@ -237,7 +238,7 @@ const fileRollDrawerClose = () => {
 
 //返回主页
 const toHomePage = () => {
-    window.location.href = '/'
+    router.push({ path: '/home' })
 }
 </script>