Michael Wang 3 anos atrás
pai
commit
9ee8bd48f6
7 arquivos alterados com 37 adições e 20 exclusões
  1. 1 1
      .eslintrc.js
  2. 1 1
      package.json
  3. 1 0
      src/background.ts
  4. 10 1
      src/lib/config.ts
  5. 14 14
      src/lib/sync.ts
  6. 9 2
      src/router/index.ts
  7. 1 1
      vue.config.js

+ 1 - 1
.eslintrc.js

@@ -8,7 +8,7 @@ module.exports = {
     "eslint:recommended",
     "@vue/typescript/recommended",
     "@vue/prettier",
-    "@vue/prettier/@typescript-eslint",
+    // "@vue/prettier/@typescript-eslint",
   ],
   parserOptions: {
     ecmaVersion: 2020,

+ 1 - 1
package.json

@@ -1,5 +1,5 @@
 {
-  "name": "testvue",
+  "name": "stmms-proxy",
   "version": "0.1.0",
   "private": true,
   "scripts": {

+ 1 - 0
src/background.ts

@@ -4,6 +4,7 @@ import path from "path";
 import { app, protocol, BrowserWindow } from "electron";
 import { createProtocol } from "vue-cli-plugin-electron-builder/lib";
 import installExtension, { VUEJS3_DEVTOOLS } from "electron-devtools-installer";
+import config from "./lib/config";
 const isDevelopment = process.env.NODE_ENV !== "production";
 
 // Scheme must be registered before the app is ready

+ 10 - 1
src/lib/config.ts

@@ -1,8 +1,17 @@
 import fs, { readFileSync } from "fs";
 import path from "path";
+import process from "process";
 import moment from "moment";
 
-const configJson = readFileSync(path.join(__dirname, "../config.json"));
+let configJson;
+// if (process.env.IS_ELECTRON) {
+//   const dirName = process.env.PORTABLE_EXECUTABLE_DIR;
+
+//   configJson = readFileSync(path.join(dirName || "", "config.json"));
+// } else {
+configJson = readFileSync(path.join(__dirname, "../config.json"));
+// }
+
 const store = JSON.parse(configJson.toString());
 
 export default store;

+ 14 - 14
src/lib/sync.ts

@@ -13,25 +13,25 @@ export async function queryStudentCount(store) {
 export async function replaceStudents(students) {
   db.init();
   await db.batchQuery(
-    "select 1 from eb_exam_student",
-    []
-    // "replace into eb_exam_student(id, exam_id, school_id\
-    //           , exam_number, secret_number, name, student_code, subject_code, subject_name, campus_name\
-    //           , package_code, batch_code, sheet_count, slice_count, answers, is_upload\
-    //           , is_absent, is_manual_absent, is_breach, is_exception\
-    //           , objective_score, subjective_score, objective_score_list, subjective_score_list, subjective_status\
-    //           , exam_site, exam_room, remark, college, class_name, teacher, paper_type) \
-    //           values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?,?,?,?,?,?,?,?,?,?)",
-    // students
+    // "select 1 from eb_exam_student",
+    // []
+    "replace into eb_exam_student(id, exam_id, school_id\
+              , exam_number, secret_number, name, student_code, subject_code, subject_name, campus_name\
+              , package_code, batch_code, sheet_count, slice_count, answers, is_upload\
+              , is_absent, is_manual_absent, is_breach, is_exception\
+              , objective_score, subjective_score, objective_score_list, subjective_score_list, subjective_status\
+              , exam_site, exam_room, remark, college, class_name, teacher, paper_type) \
+              values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?,?,?,?,?,?,?,?,?,?)",
+    students
   );
 }
 
 export async function replacePackage(packageData) {
   db.init();
   await db.batchQuery(
-    "select 1 from eb_exam_student",
-    []
-    // "replace into eb_exam_package(exam_id, code, pic_count) values (?,?,?)",
-    // packageData
+    // "select 1 from eb_exam_student",
+    // []
+    "replace into eb_exam_package(exam_id, code, pic_count) values (?,?,?)",
+    packageData
   );
 }

+ 9 - 2
src/router/index.ts

@@ -1,4 +1,9 @@
-import { createRouter, createWebHistory, RouteRecordRaw } from "vue-router";
+import {
+  createRouter,
+  createWebHashHistory,
+  createWebHistory,
+  RouteRecordRaw,
+} from "vue-router";
 
 const routes: Array<RouteRecordRaw> = [
   {
@@ -39,7 +44,9 @@ const routes: Array<RouteRecordRaw> = [
 ];
 
 const router = createRouter({
-  history: createWebHistory(process.env.BASE_URL),
+  history: process.env.IS_ELECTRON
+    ? createWebHashHistory(process.env.BASE_URL)
+    : createWebHistory(process.env.BASE_URL),
   routes,
 });
 

+ 1 - 1
vue.config.js

@@ -22,7 +22,7 @@ module.exports = {
       preload: "src/preload.ts",
       externals: [],
       builderOptions: {
-        extraFiles: ["extra/**"],
+        // extraFiles: ["extra/**", "preload.js"],
         win: {
           target: "portable",
           signAndEditExecutable: false,