扫码功能修改

log/2023-9-7.log

@@ -0,0 +1,5 @@
+[2023-09-07 14:03:49.266] [info]  [P] card_reading-89 : [M] [object Object][R]undefined
+[2023-09-07 15:10:57.379] [info]  [P] card_reading-90 : [M] {"code":-2,"message":"医保电子凭证编码错误,请重新扫码","orgId":"35020319001"}[R]undefined
+[2023-09-07 15:17:50.913] [info]  [P] card_reading-90 : [M] {"code":-2,"message":"医保电子凭证编码错误,请重新扫码","orgId":"35020319001"}
+[2023-09-07 15:19:10.178] [info]  [P] card_reading-90 : [M]{"code":-2,"message":"医保电子凭证编码错误,请重新扫码","orgId":"35020319001"}
+[2023-09-07 15:20:20.722] [info]  [P]card_reading-90 : [M]{"code":-2,"message":"医保电子凭证编码错误,请重新扫码","orgId":"35020319001"}

npminstall-debug.log

@@ -0,0 +1,193 @@
+{
+  root: 'D:\\web\\product\\electron\\sign-xklr',
+  registry: 'https://registry.npmmirror.com',
+  pkgs: [],
+  production: false,
+  cacheStrict: false,
+  cacheDir: null,
+  env: {
+    npm_config_registry: 'https://registry.npmmirror.com',
+    npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\15432\\\\.cnpmrc","--disturl=https://npmmirror.com/mirrors/node","--registry=https://registry.npmmirror.com"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\15432\\\\.cnpmrc","--disturl=https://npmmirror.com/mirrors/node","--registry=https://registry.npmmirror.com"]}',
+    npm_config_user_agent: 'npminstall/7.5.2 npm/? node/v14.21.3 win32 ia32',
+    NODE: 'C:\\Program Files (x86)\\nodejs\\',
+    npm_node_execpath: 'C:\\Program Files (x86)\\nodejs\\',
+    npm_execpath: 'C:\\Users\\15432\\AppData\\Roaming\\npm\\node_modules\\cnpm\\node_modules\\npminstall\\bin\\install.js',
+    npm_config_userconfig: 'C:\\Users\\15432\\.cnpmrc',
+    npm_config_disturl: 'https://npmmirror.com/mirrors/node',
+    npm_config_r: 'https://registry.npmmirror.com',
+    COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
+    NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
+    NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
+    PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
+    CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver',
+    OPERADRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/operadriver',
+    CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip',
+    ELECTRON_MIRROR: 'https://cdn.npmmirror.com/binaries/electron/',
+    ELECTRON_BUILDER_BINARIES_MIRROR: 'https://cdn.npmmirror.com/binaries/electron-builder-binaries/',
+    SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass',
+    SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc',
+    NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v',
+    PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
+    PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
+    PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright',
+    SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli',
+    SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
+    RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2',
+    RE2_DOWNLOAD_SKIP_PATH: 'true',
+    PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma',
+    npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3',
+    npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar',
+    npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp',
+    npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips',
+    npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs',
+    npm_rootpath: 'D:\\web\\product\\electron\\sign-xklr',
+    INIT_CWD: 'D:\\web\\product\\electron\\sign-xklr',
+    npm_config_cache: 'C:\\Users\\15432\\.npminstall_tarball'
+  },
+  binaryMirrors: {
+    ENVS: {
+      COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
+      NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
+      NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
+      PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
+      CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver',
+      OPERADRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/operadriver',
+      CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip',
+      ELECTRON_MIRROR: 'https://cdn.npmmirror.com/binaries/electron/',
+      ELECTRON_BUILDER_BINARIES_MIRROR: 'https://cdn.npmmirror.com/binaries/electron-builder-binaries/',
+      SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass',
+      SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc',
+      NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v',
+      PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
+      PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
+      PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright',
+      SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli',
+      SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
+      RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2',
+      RE2_DOWNLOAD_SKIP_PATH: 'true',
+      PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma',
+      npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3',
+      npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar',
+      npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp',
+      npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips',
+      npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs'
+    },
+    '@ali/s2': { host: 'https://cdn.npmmirror.com/binaries/looksgood-s2' },
+    sharp: { replaceHostFiles: [Array], replaceHostMap: [Object] },
+    '@tensorflow/tfjs-node': {
+      replaceHostFiles: [Array],
+      replaceHostRegExpMap: [Object],
+      replaceHostMap: [Object]
+    },
+    cypress: {
+      host: 'https://cdn.npmmirror.com/binaries/cypress',
+      newPlatforms: [Object]
+    },
+    'utf-8-validate': {
+      host: 'https://cdn.npmmirror.com/binaries/utf-8-validate/v{version}'
+    },
+    xprofiler: {
+      remote_path: './xprofiler/v{version}/',
+      host: 'https://cdn.npmmirror.com/binaries'
+    },
+    leveldown: { host: 'https://cdn.npmmirror.com/binaries/leveldown/v{version}' },
+    couchbase: { host: 'https://cdn.npmmirror.com/binaries/couchbase/v{version}' },
+    gl: { host: 'https://cdn.npmmirror.com/binaries/gl/v{version}' },
+    sqlite3: {
+      host: 'https://cdn.npmmirror.com/binaries/sqlite3',
+      remote_path: 'v{version}'
+    },
+    '@journeyapps/sqlcipher': { host: 'https://cdn.npmmirror.com/binaries' },
+    grpc: {
+      host: 'https://cdn.npmmirror.com/binaries',
+      remote_path: '{name}/v{version}'
+    },
+    'grpc-tools': { host: 'https://cdn.npmmirror.com/binaries' },
+    wrtc: {
+      host: 'https://cdn.npmmirror.com/binaries',
+      remote_path: '{name}/v{version}'
+    },
+    fsevents: { host: 'https://cdn.npmmirror.com/binaries/fsevents' },
+    nodejieba: { host: 'https://cdn.npmmirror.com/binaries/nodejieba' },
+    canvas: { host: 'https://cdn.npmmirror.com/binaries/canvas' },
+    'skia-canvas': { host: 'https://cdn.npmmirror.com/binaries/skia-canvas' },
+    'flow-bin': {
+      replaceHost: 'https://github.com/facebook/flow/releases/download/v',
+      host: 'https://cdn.npmmirror.com/binaries/flow/v'
+    },
+    'jpegtran-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/jpegtran-bin'
+    },
+    'cwebp-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/cwebp-bin'
+    },
+    'zopflipng-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/zopflipng-bin'
+    },
+    'optipng-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/optipng-bin'
+    },
+    mozjpeg: {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/mozjpeg-bin'
+    },
+    gifsicle: {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/gifsicle-bin'
+    },
+    'pngquant-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/pngquant-bin',
+      replaceHostMap: [Object]
+    },
+    'pngcrush-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/pngcrush-bin'
+    },
+    'jpeg-recompress-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/jpeg-recompress-bin'
+    },
+    'advpng-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/advpng-bin'
+    },
+    'pngout-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/pngout-bin'
+    },
+    'jpegoptim-bin': {
+      replaceHost: [Array],
+      host: 'https://cdn.npmmirror.com/binaries/jpegoptim-bin'
+    },
+    argon2: { host: 'https://cdn.npmmirror.com/binaries/argon2' },
+    'ali-zeromq': { host: 'https://cdn.npmmirror.com/binaries/ali-zeromq' },
+    'ali-usb_ctl': { host: 'https://cdn.npmmirror.com/binaries/ali-usb_ctl' },
+    'gdal-async': { host: 'https://cdn.npmmirror.com/binaries/node-gdal-async' },
+    'libpg-query': { host: 'https://cdn.npmmirror.com/binaries' }
+  },
+  forbiddenLicenses: null,
+  flatten: false,
+  proxy: undefined,
+  prune: false,
+  disableFallbackStore: false,
+  workspacesMap: Map(0) {},
+  enableWorkspace: false,
+  workspaceRoot: 'D:\\web\\product\\electron\\sign-xklr',
+  isWorkspaceRoot: true,
+  isWorkspacePackage: false,
+  strictSSL: true,
+  ignoreScripts: false,
+  ignoreOptionalDependencies: false,
+  detail: false,
+  forceLinkLatest: false,
+  trace: false,
+  engineStrict: false,
+  registryOnly: false,
+  client: false,
+  autoFixVersion: [Function: autoFixVersion]
+}

package.json

@@ -95,7 +95,7 @@
     }
   },
   "husky": {
-    "hooks": {
-    }
-  }
+    "hooks": {}
+  },
+  "__npminstall_done": false
 }

resources/dll/dlllog(Nation)/Nationlog20230829.txt

@@ -1,36 +0,0 @@
-Hij0YHg5zuDnlr1IjPY8i4nvRNpup+dIK8zUwKPixgdMN9Ec8YXkmfzwVEhzOzwpnaZq1TPa8hrKfxWaf2BlsZPCXQYLowdJJ+rMX/I0Uiw=
-qQCT60ahFztVIdbQq6sbVgqfTGIzRhdRHd64MkadZUcDB9nXWegdICxCqPMTDsfHjeIew/AnFiwzIB1Kjz2p3kUV9XDY8eIGr2nIEUFfSSs=
-UnB+FeyfRxI2oP7/6M87C9WA2A6jBViuC5FP7onhuXQvnxhe6AjXayumPaoRtaspPMoG/azy0FPTWoPQNt3AOQ8bu0lOG7JQ1OX//v/dsUFgVKa0Ljnpwd1SMEip2HVMSYx3fRBWjObM5mymx7rpEMGXwBo/8xU/jtqzLE+LEvjHaZeyb3jdBhJxEBrKPLHZt0fNjU7wjZsM+PEMo5ul4KTpnQl9U2uIo3BjQoB+KH6kQQtBUd9RS9kf4KO4mhMv6cPVvS9Fl0omxOQb64ps3+rssfWfgrvf8TfProaA3qE=
-eh+u+hv6wZE7FlISPc/t8lCajo8baSTFMH53dO/DtkA=
-glA/Kp4ilxuSAZm/zYKl7I6RwCI57M5qURaL/ykTy3oJ6Z4BpvlXJFS82yATW8GT
-xer15eljMRG21ld6M1TAi6SHhtB9hY65aszWskpMrsf82AI5mYAlZUQuspZPEXTJ
-1X30fsYiNmPEM3ew87gw5XA0Cr2Iz/IclvWUL5R82/A=
-D2O87Wj+2nQHiSADCZpY3w==
-C5bRWm5wCxSy6/vCsrCYk2Y2jUGYqu0TaclxtAtJbnIw7hjM2dS7TJWligTDafH1Qy2FGtCXC1MZDfzUnAxMUg/a4EtuALf5BrdhapOQrGnP0MNxMJJSSROSpA7FOE9E
-SLkTkRw1Y0xet/7h1I3zct0OM3XnfiHu/lrJqlo7fuq6c+BkR6juS8cCMSe4gC+H+NPmFTxciyMnHF1FX6nWwQXrKieQ3zCKQe0vlhemkyU=
-yMY380BJ3tlYSgiuJCU/F6sqf7TViUNDL4NZrbm9W0Oazbm//t74ks5rmCfvHx4OqjsQ09cfS1680rWIHQ6HsuI1Ify1h0IQq0w1FgG9WiI=
-uBMwVuO1J9BlLBeCnO+lm1S/fxHuM72XSxVfcpqJUS/VDydBBA1kCksPw33J+9qQcRDsKyqYhnZdpBuoIZM86Wz6SqC0q7GQvxySX9/bfO1oqbaqlZYP9pmh4H5PYjYAJ7NgoK1AWcIx5cPm+EUvch4OaNs2FKIQot3dMtS/LEU5OfQgLhDXawlJ0SNGFu6PJzDCk3Jf8IfR36cZWyxVZWIpGjG2A/V9GsBlIDTLDhxwym0xvAoSjfiqS13OoLqIKG8gXOugJ7pB+AaqUkstpjnKNFFy0Tk0XC+CclKvvOk=
-pt96c/0mCP/v9ukq+rU0m8EbpFdmLCukoMvpjW1SuCs=
-AjdkG/MgwKTN0zT5cwHANOfqPclPOVENIGu0Gw8n0+0kUelymTuQveIZEQhwu3an
-P9qrj/VZQxUoiPFiSCyqa4zjYrYYQleQznQn7rIBVXsknz0Lo0CCPYIV0bdF+HiG
-UB0LHTgYq5Z9A91gpAe3UUhWz+5eMzACEwcgofYRJNw=
-xdjkEwnpT6mcMHzhjJG3sg==
-3zm0e5ZE/kyseWs8GL/tMWTPE/a/Ulom6LDsjLrIWEwp3JtSoqVxOBZIrZDyP5ZziJy0yOWUyTW7brBxzJfQWXRhkLoBCCkCgnwC5m8mKzdLK4K2VEZ67+K4z4ENFrJi
-FZdD1p5sDl2WSDLUgPqQ0oLBosAq2XsKZ4pREs0lppnY7lWacDaQLl9MsEWe06oYBuXyrWfOi1b4M48g6PV2PPFX6NbKy5F7tD6Non9Pmgw=
-jqZnly9+kUCVHzQcroUzMrQx+A4c3zbPlHXRmiXsrDXJMcrTKEc/eYSGUGjiD6vnIZykUtH6A818ehyQicjybx+Vbt8pdOXq+M95oW/sE24=
-Z7DYGGWp9SA+79iOHqq+h9+FfE/rrrsJpPTDUIZjDx9dgtYFbBfa+jeOuYksg0BYyyBqsnYX0VYms4X1v6Vk2qk0hVlqTvUFGuytV3O8d9m6u20iSuQeaFTmrXhubGZ4HDwVyLmAAKFz8OQLZ4xoNLVIyjoD/Hche11sXAMmLR7/6jpwViQD+CLe72DPQU9m65IgpRHWpEVxLUXwPbmwaq28kOOwcHM87MzWqJHGZw6A77WdO9QwgH7aYl7+cNG2CRf2LUp8K2JW3vmDShHoXNdiqlInE9PNc1bKSpta5P8=
-Na7HqPZ96EgdyatIWaek41hFYkfTE5tJ0HQQBOWml5o=
-CPZUVys7izRKJtKzVL/rl6aY4wrRf9Ov1JxgmAb8wK48eGsyhscCGpqrcH0YyEM5
-e4g7od0lopAvw+yiEnwHtsg0HMIBaB0Fa4GLjYtpi82K8Gts6Z1gSXckM18I+bao
-4KAcRWSSiAuzWtaUChgaADpsnJLZex7ICXpUqHda7xQ=
-3mAKQfxG5fYcxhZVHxXoRw==
-h4kEVkN2Ab/Tse+L00g2D9heFO+hjkRkyZ/3FpNNS+qugG1Tztk84SR++TlHWA8oVH/UMCtYndIZOMKcOqEd2tBkWeagEsraer86UVKyM0hxoou+ggNa5PzgHVftJ3CF
-TVwkGPVuMRp1suQk7VJ9EsiYxb00ceaCIYR5kIGyZrX8JE2hmGBaLwdHZ7uP+2guj35ADgDcdKVADuc4mCgTJPM0gyQMBuuz95EFUVakOlw=
-PZCbRVnrHN8122R7YzknUutdVOlOVSmAk4ruKXzqQYAke9g0nwo6qnLUeu7wdXlxhtQND6oPr7sJ7qYiZgeOgbLe16KHvOo1hZnUxNRIp48=
-regAHLveI1kUkPIE4F97JDhzsWWhtZoXXa77EE1jQUJuf45pQJQy7aun74/TA+NaaclQT3NTZvot6GRr0lHbQijI443ub/pMEpNica5XtJfTBu1rcIPo9IF2rxgAs43UXutgKph5XWlv1Tnsu0+itoAk0pFbrZcKUpHr69YIDxnkDWPJRyyr3uCKKWf70jqphE2XL4tyiw9wsJdmoUxVV4axvmkv4qxOb/XAtAX6IEc6ffISf61IlvCPuw+h0j2tljqgOcrAQZ+BECUWf56HsasfOaXGo4Y01jQAYmCJe3w=
-dC17jPpf41RyPUcvOp/+bjTh+/h8iNLxsBCrZMaZPZs=
-3IMrfHdibSs/Imxs81mnjktlPXFzaKFvvuxgWkZv/ThgoG1n7X+R/gtJx7DUrSQ5
-3ME+Bmdm78CgdNVV+EOlNDdA3FrCyip+MBsgesgN6GzlHIykVQgO2J/QnIUlj5Hx
-tJgYSmROg8Yij0ZHUV1tm5MXUEc9TKC47UstjTNa3mQ=
-/NAAXSu139UYFq+FR9X7iA==
-ZY54WMsSQIVejuMF8Y9oJnysLZhKWIxI6hOft+l6rAtLAVzP+jHos8vXLscl3cV3zU6eecvi7RYrNTVjChp5TMnmCZketKf7HwvQ6J/nXECt/TofRad6a+J727xMv0bV

src/main/main.js

@@ -54,7 +54,7 @@ async function createWindow() {
       // partition: String(+new Date()),
       nodeIntegration: true,
       enableRemoteModule: true,
-      devTools: isdev,
+      devTools: true,
       contextIsolation: false,
       webviewTag: true,
       //   preload: path.join(__dirname, '../preload/index.js'),

src/main/windows/mainWin.js

@@ -62,9 +62,16 @@ export default function mainWin(mw) {
     //通过webContents发送事件到渲染线程，同时将打印机列表也传过去
     mw.webContents.send('getPrinterList', list);
   });
-  ipcMain.on('setlog', (event,option) =>{
+  ipcMain.on('setlog', (event, option) => {
     // console.log(option,logger[option.type], option.msg)
-      logger[option.type]("[P] "+ option.row +" : [M] "+ option.msg+ '[R]'+option.res)
+    let str = "[P]" + option.row + " :"
+    if (option.msg) {
+      str += " [M]" + option.msg
+    }
+    if (option.res) {
+      str += " [R]" + option.res
+    }
+    logger[option.type](str)
   })
-  
+
 }

src/main/windows/updater.js

@@ -9,7 +9,7 @@ const loadURL = isdev
 const iconSrc = __static + "/images/icon.ico";
 // 服务器地址
 const server = 'http://testadmin.xklr.net:8601'
-const url = isdev ? __dirname : `${server}/appUpdatePatientSign/`
+const url = isdev ? __dirname : `${server}/appUpdateSign/`
 console.log(15, url)
 let updateWin = null;
 // 自动检测更新
@@ -61,7 +61,7 @@ export default function checkUpdate() {
             if (!option.url) {
                 updateWin.webContents.send('state1', 5)
             } else {
-                autoUpdater.setFeedURL(option.url + '/appUpdatePatientSign/')
+                autoUpdater.setFeedURL(option.url + '/appUpdateSign/')
                 autoUpdater.checkForUpdates()
             }
         })

src/renderer/components/nav/index.vue

@@ -102,8 +102,10 @@ export default {
 </script>
 <style lang="less">
 #nav {
-  user-select: none;
-  -webkit-app-region: drag;
+ 
+  padding-top:1px;
+  padding-left:1px;
+  background-color: rgb(236, 237, 238);
 }
 
 img {
@@ -111,6 +113,8 @@ img {
 }
 
 .bg-nav {
+  user-select: none;
+  -webkit-app-region: drag;
   background-color: rgb(236, 237, 238);
 }
 

src/renderer/pages/home/index.vue

@@ -2,7 +2,7 @@
   <div class="">
     <Box>
       <Nav v-if="!isfullscreen" />
-      <div :style="{height:!isfullscreen? 'calc(100vh - 42px)':'calc(100vh - 0px)'}" v-loading="loadingState" element-loading-text="正在查询..." element-loading-spinner="el-icon-loading"
+      <div :style="{height:!isfullscreen? 'calc(100vh - 33px)':'calc(100vh - 0px)'}" v-loading="loadingState" element-loading-text="正在查询..." element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)">
         <Title />
         <router-view />

src/renderer/pages/index/index.vue

@@ -28,13 +28,12 @@
   </div>
 </template>
 <script>
-import { physicalCard,medical_dll } from '@/utils/card_reading.js'
+import { physicalCard, medical_dll } from '@/utils/card_reading.js'
 import { mapActions, mapGetters } from 'vuex'
 import { ipcRenderer } from "electron";
 import { logfn } from '@/utils/common';
 export default {
   name: 'Index',
- 
   data() {
     return {
       hospitalId: 0,
@@ -55,7 +54,7 @@ export default {
     }
   },
   created() {
-    
+    // this.setloadingState(true)
   },
   methods: {
     ...mapActions({
@@ -73,8 +72,7 @@ export default {
           offset: 80
         });
         return 0
-      }else{
-        
+      } else {
         return 1
       }
     },
@@ -82,12 +80,12 @@ export default {
       let t = this
       try {
         t.$api.getPatientInfo({ "hospitalId": this.hospitalId, "idCard": idCard }).then((res) => {
-          console.log(res)
+          // console.log(res)
           if (!res.data) {
             if (!type) {
-              logfn(ipcRenderer, { type: 'info', row: 'index-89', msg: idCard + '身份证查询失败', res: res })
+              logfn({ type: 'info', row: 'index-89', msg: idCard + '身份证查询失败', res: res })
             } else {
-              logfn(ipcRenderer, { type: 'info', row: 'index-91', msg: idCard + '电子医保查询失败', res: res })
+              logfn({ type: 'info', row: 'index-91', msg: idCard + '电子医保查询失败', res: res })
             }
             t.$notify({
               title: '查询出错',
@@ -100,18 +98,18 @@ export default {
           }
         })
       } catch (error) {
-        logfn(ipcRenderer, { type: 'error', row: 'index-104', msg:error})
+        logfn({ type: 'error', row: 'index-104', msg: error })
       } finally {
         t.setloadingState(false)
       }
     },
     WLYtest_search() {
       let hasid = this.gethospitalId()
-      if(!hasid){
+      if (!hasid) {
         return false
       }
       console.log(process.env)
-      if (1||process.env.NODE_ENV == "development") {
+      if (1 || process.env.NODE_ENV == "development") {
         this.dialogVisible = true
       } else {
         this.seach1()
@@ -121,12 +119,12 @@ export default {
       this.dialogVisible = false
       this.setloadingState(true)
       setTimeout(() => {
-        this.cb(this.testidcard )
+        this.cb(this.testidcard)
       }, 1000)
     },
     seach1() {
       let hasid = this.gethospitalId()
-      if(!hasid){
+      if (!hasid) {
         return false
       }
       let t = this
@@ -139,7 +137,7 @@ export default {
             t.cb(data.idCard, 0)
           },
           error: (error) => {
-            logfn(ipcRenderer, { type: 'error', row: 'index-143', msg:error})
+            logfn( { type: 'error', row: 'index-143', msg: error })
             t.setloadingState(false)
           },
           t: this,
@@ -147,50 +145,50 @@ export default {
       }
     },
     seach2() {
+      this.setloadingState(true)
       let hasid = this.gethospitalId()
       if (!hasid) {
+        this.setloadingState(false)
         return false
       }
       let t = this
-      this.setloadingState(true)
-      medical_dll('', (res) => {
-        console.log(res)
-        // res = {
-        //   "data": {
-        //     "extra": "",
-        //     "idNo": "533222199909090123",
-        //     "idType": "01",
-        //     "ecToken": "ADBHJRS5I01E0F3438C00000B959FA88",
-        //     "insuOrg": "430000",
-        //     "userName": "张三",
-        //     "ecIndexNo": "",
-        //     "gender": "",
-        //     "birthday": "",
-        //     "nationality": "",
-        //     "email": ""
-        //   },
-        //   "code": 0,
-        //   "message": "处理成功"
-        // }
-        if (res.code == 0) {
-          t.cb(res.data.idNo,1)
-        }
-        t.setloadingState(false)
-      }, () => {
-        t.setloadingState(false)
-      })
+      setTimeout(() => {
+        medical_dll('', (res) => {
+          console.log(res)
+          // res = {
+          //   "data": {
+          //     "extra": "",
+          //     "idNo": "533222199909090123",
+          //     "idType": "01",
+          //     "ecToken": "ADBHJRS5I01E0F3438C00000B959FA88",
+          //     "insuOrg": "430000",
+          //     "userName": "张三",
+          //     "ecIndexNo": "",
+          //     "gender": "",
+          //     "birthday": "",
+          //     "nationality": "",
+          //     "email": ""
+          //   },
+          //   "code": 0,
+          //   "message": "处理成功"
+          // }
+          if (res.code == 0) {
+            t.setloadingState(false)
+            t.cb(res.data.idNo, 1)
+          }else{
+            t.setloadingState(false)
+          }
+        }, () => {
+          t.setloadingState(false)
+        })
+      }, 500)
     },
-    navto({idCard,hospitalId}) {
-      // console.log(idCard,hospitalId)
-      this.$router.push('/home/search?idCard='+idCard+'&hospitalId='+hospitalId)
-      // this.$router.push({
-      //   name: '/home/search',
-			// 		query: {idCard,hospitalId}
-      // })
+    navto({ idCard, hospitalId }) {
+      this.$router.push('/home/search?idCard=' + idCard + '&hospitalId=' + hospitalId)
     }
   }
 }
-</script>
+</script> 
 <style lang="less" scoped>
 .bg-1 {
   background: linear-gradient(200deg, #11998f, #2fc568);

src/renderer/pages/search/index.vue

@@ -84,7 +84,7 @@ export default {
           }
         })
       } catch (error) {
-        logfn(ipcRenderer, { type: 'error', row: 'search-86', msg:error})
+        logfn({ type: 'error', row: 'search-86', msg:error})
       } finally {
         t.setloadingState(false)
       }

src/renderer/utils/card_reading.js

@@ -1,9 +1,10 @@
 import axios from 'axios';
 const edge = require('electron-edge-js');
 import { ipcRenderer } from "electron";
-const dll_url =  process.env.NODE_ENV == "development"
-    ? "./resources/dll/XKLRLibrary.dll"
-    : process.resourcesPath + '/dll/XKLRLibrary.dll'//`C:/Users/15432/AppData/Local/Programs/PatientSign/resources/dll/XKLRLibrary.dll`;
+import { logfn } from '@/utils/common';
+const dll_url = process.env.NODE_ENV == "development"
+  ? "./resources/dll/XKLRLibrary.dll"
+  : process.resourcesPath + '/dll/XKLRLibrary.dll'//`C:/Users/15432/AppData/Local/Programs/PatientSign/resources/dll/XKLRLibrary.dll`;
 export const card_read = [
   {
     name: '浙江省医保局通用IC读卡器', id: 2, type: 'MT3', protApi: '9539/dareway',
@@ -52,6 +53,7 @@ const config = {
     }
   },
   "electronic_medical": {
+    // "url": "http://10.249.83.229/localcfc/api/hsecfc/localQrCodeQuery",
     "url": "http://10.249.81.107/localcfc/api/hsecfc/localQrCodeQuery",
     "indata": {
       "data": {
@@ -69,30 +71,32 @@ const config = {
   }
 }
 //电子医保 扫码 内部.
-export function medical_dll(url,cb,err){
+export function medical_dll(url, cb, err) {
   try {
-    url =url|| config.electronic_medical.url
+    url = url || config.electronic_medical.url
     // console.log(url)
     const NationEcTrans = edge.func({
       assemblyFile: dll_url,
       typeName: "XKLRLibrary.XKLRNationECCode",
-      methodName: "NationEcTrans"
+      methodName: "XKLRNationEcTrans"
     })
     // console.log(13)
     NationEcTrans(url, (error, value) => {
       // console.log(error, value)
-      const res= JSON.parse(value);
-      if(value.length>0){
+      console.log(value)
+      const res = JSON.parse(value);
+      if (value.length > 0) {
         cb(res)
+        logfn({ type: 'info', row: 'card_reading-90', msg: res })
       }
-      if(error){
+      if (error) {
         err()
-        ipcRenderer.send('setlog', { type: 'error', row: 'card_reading-99', msg: error })
+        logfn({ type: 'error', row: 'card_reading-94', msg: error })
       }
     })
   } catch (error) {
     err()
-    ipcRenderer.send('setlog', { type: 'error', row: 'card_reading-103', msg: error })
+    logfn({ type: 'error', row: 'card_reading-99', msg: error })
   }
 }
 

src/renderer/utils/common.js

@@ -1,4 +1,4 @@
-
+import { ipcRenderer } from "electron";
 let getFormatDate = function (value) {
   if (value === undefined || value === "") {
     return '';
@@ -102,7 +102,7 @@ export function getIDCardInfo(idCard) {
 }
 
 
-export function logfn(ipc,option){
+export function logfn(option){
   option['type']=option.type||'info';
   console.log(option.msg)
   if(option.msg){
@@ -111,5 +111,5 @@ export function logfn(ipc,option){
   if(option.res){
     option['res']=JSON.stringify(option.res)
   }
-  ipc.send('setlog',{...option} )
+  ipcRenderer.send('setlog',{...option} )
 }