diff --git a/package.json b/package.json index fdb2638..277fb7c 100644 --- a/package.json +++ b/package.json @@ -2,13 +2,12 @@ "name": "soonworkerdisk", "version": "0.0.1", "author": "24kycj <1637269896@qq.com>", - "description": "KaShu SoonWorkerDisk", + "description": "Cardsoon SoonWorkerDisk", "homepage": "https://www.cardsoon.com/index.php/cn", "license": "MIT", "main": "./dist/electron/main.js", "scripts": { - "build": "node .electron-vue/build.js && electron-builder", - "build:linux": "node .electron-vue/build.js && electron-builder --linux", + "build": "node .electron-vue/build.js && electron-builder --arm64", "build:dir": "node .electron-vue/build.js && electron-builder --dir", "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js", "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js", @@ -23,47 +22,31 @@ "postinstall": "npm run lint:fix" }, "build": { - "productName": "soonworkerdisk", - "appId": "com.kashu.soonworkerdisk", + "productName": "soonworkerD", + "appId": "com.cardsoon.soonworkerD", "extraFiles": [ { - "from": "./User Templates", - "to": "." + "from": "User Templates", + "to": "./User Templates" }, { - "from": "./cardsoonServer", - "to": "." + "from": "cardsoonServer", + "to": "./CardsoonServer" } - ], - "directories": { - "output": "build" - }, - "files": [ - "dist/electron/**/*" - ], - "dmg": { - "contents": [ - { - "x": 410, - "y": 150, - "type": "link", - "path": "/Applications" - }, - { - "x": 130, - "y": 150, - "type": "file" - } - ] - }, - "mac": { - "icon": "build/icons/icon.icns" - }, - "win": { - "icon": "build/icons/icon.ico" - }, - "linux": { - "icon": "build/icons" + ], + "linux": { + "maintainer": "Jerry Xu ", + "category": "Utility", + "target": [ + "AppImage", + "deb", + "rpm" + ], + "icon": "public/images/favicon.svg" + }, + "copyright": "Copyright@2023 cardsoon.com", + "directories": { + "output": "build" } }, "dependencies": { @@ -134,4 +117,4 @@ "webpack-hot-middleware": "^2.22.2", "webpack-merge": "^4.1.3" } -} \ No newline at end of file +} diff --git a/src/renderer/components/workAdd/workAdd.vue b/src/renderer/components/workAdd/workAdd.vue index e41d713..8b0773a 100644 --- a/src/renderer/components/workAdd/workAdd.vue +++ b/src/renderer/components/workAdd/workAdd.vue @@ -210,6 +210,9 @@ const dayjs = require('dayjs') import fileEmpty from './files/fileEmpty' import files from './files/file' + +const exePath = path.dirname(process.execPath) +// const exePath = process.cwd(); export default { name: 'UserInfo', components: { fileEmpty, files }, @@ -720,7 +723,7 @@ export default { }, // 获取模板文件列表 getTemplates() { - const filePath = path.join(process.cwd(), 'User Templates'); + const filePath = path.join(exePath, 'User Templates'); fs.readdir(filePath, (err, files) => { if (err) { console.log(err) @@ -892,7 +895,8 @@ export default { }, setSure() { this.setShow = false - this.$store.commit('setData', { name: 'setForm', data: this.setForm }) + that.$store.dispatch('chat/setDatas', {name: 'workStatus', data: true}) + this.$store.dispatch('setDatas', { name: 'setForm', data: this.setForm }) } } } diff --git a/src/renderer/store/modules/chat.js b/src/renderer/store/modules/chat.js index 4bf47a9..80c5db9 100644 --- a/src/renderer/store/modules/chat.js +++ b/src/renderer/store/modules/chat.js @@ -313,6 +313,10 @@ const mutations = { } const actions = { + // 改变state值 + setDatas: ({ commit }, data) => { + commit('setData', data) + }, // 初始化websocket initWebSocket({ state, commit, dispatch, rootState }) { if (typeof WebSocket === 'undefined') return console.log('您的浏览器不支持websocket') @@ -450,7 +454,13 @@ const actions = { } if (error.printer_error) { error.printer_error = '0x' + error.printer_error.toString(16) - commit('setData', { name: 'printer_error', data: { type: 'error', confirm: printer_errors[error.printer_error], req: 'continue_task' } }) + let continues = ['0x11', '0x12', '0x13', '0x14', '0x15', '0x16', '0x17', '0x18', '0x19', '0x1a', '0x1b', '0x1c', '0x1d', '0x1e', '0x1f', '0x21'] + let req = continues.indexOf(error.printer_error) > -1 ? 'continue_task' : '' + if (req) { + commit('setData', { name: 'printer_error', data: { type: 'error', confirm: printer_errors[error.printer_error], req: req } }) + } else { + commit('setData', { name: 'printer_error', data: { type: 'error', notify: printer_errors[error.printer_error] } }) + } } } } else { @@ -524,10 +534,6 @@ const actions = { closeWebsocket: () => { // 关闭 if (websock) websock.close() - }, - // 改变工作状态 - changeWorkStatus: ({ commit }, data) => { - commit('setData', { name: 'workStatus', data: data }) } } diff --git a/src/renderer/store/modules/user.js b/src/renderer/store/modules/user.js index ca1aeb0..bf9c6d2 100644 --- a/src/renderer/store/modules/user.js +++ b/src/renderer/store/modules/user.js @@ -18,6 +18,7 @@ const user = { avatar: 'https://image.baidu.com/search/detail?ct=503316480&z=&tn=baiduimagedetail&ipn=d&word=admin&step_word=&lid=8980923753406439282&ie=utf-8&in=&cl=2&lm=-1&st=-1&hd=&latest=©right=&cs=1902119677,258344230&os=3526618670,2431782315&simid=3426573763,123057590&pn=11&rn=1&di=7410818322373017601&ln=1928&fr=&fmq=1730735680169_R&ic=&s=undefined&se=&sme=&tab=0&width=&height=&face=undefined&is=0,0&istype=2&ist=&jit=&bdtype=0&spn=0&pi=0&gsm=1e&objurl=https%3A%2F%2Fclearhub.tech%2Fwp-content%2Fuploads%2F2018%2F11%2F12.png&rpstart=0&rpnum=0&adpicid=0&nojc=undefined&dyTabStr=MCwzLDEsMiwxMyw3LDYsNSwxMiw5', roles: ['admin'], + oneLogin: false, // 高级设置 setForm: setFormDefault, }, @@ -41,6 +42,10 @@ const user = { }, actions: { + // 改变state值 + setDatas: ({ commit }, data) => { + commit('setData', data) + }, // 登录 Login({ commit }, userInfo) { const username = userInfo.username.trim() diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue index cbe8647..3450599 100644 --- a/src/renderer/views/dashboard/index.vue +++ b/src/renderer/views/dashboard/index.vue @@ -1,8 +1,5 @@