wanglaoye пре 1 година
родитељ
комит
23f07cdf64

+ 3 - 0
log/2023-7-17.log

@@ -0,0 +1,3 @@
+[2023-07-17 13:28:41.570] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-07-17 13:28:42.421] [info]  76:undefined
+[2023-07-17 13:28:43.809] [info]  82:[object Object]

+ 15 - 0
log/2023-8-8.log

@@ -0,0 +1,15 @@
+[2023-08-08 19:44:53.955] [info]  38:D:\web\product\electron\新建文件夹\doctor-electron\dist\electron
+[2023-08-08 19:44:54.878] [info]  76:undefined
+[2023-08-08 19:44:56.029] [info]  82:[object Object]
+[2023-08-08 20:30:31.619] [info]  38:D:\web\product\electron\新建文件夹\doctor-electron\dist\electron
+[2023-08-08 20:30:32.622] [info]  76:undefined
+[2023-08-08 20:30:33.787] [info]  82:[object Object]
+[2023-08-08 20:31:42.969] [info]  38:D:\web\product\electron\新建文件夹\doctor-electron\dist\electron
+[2023-08-08 20:31:44.242] [info]  76:undefined
+[2023-08-08 20:31:45.628] [info]  82:[object Object]
+[2023-08-08 20:43:17.079] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-08 20:43:18.276] [info]  76:undefined
+[2023-08-08 20:43:19.412] [info]  82:[object Object]
+[2023-08-08 21:06:39.064] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-08 21:06:40.046] [info]  76:undefined
+[2023-08-08 21:06:41.188] [info]  82:[object Object]

+ 253 - 0
log/2023-8-9.log

@@ -0,0 +1,253 @@
+[2023-08-09 09:40:36.895] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 09:40:37.887] [info]  76:undefined
+[2023-08-09 09:40:38.998] [info]  82:[object Object]
+[2023-08-09 10:12:38.458] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:12:39.548] [info]  76:undefined
+[2023-08-09 10:12:40.677] [info]  82:[object Object]
+[2023-08-09 10:17:35.344] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:17:36.330] [info]  76:undefined
+[2023-08-09 10:17:37.644] [info]  82:[object Object]
+[2023-08-09 10:18:25.586] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:18:26.606] [info]  76:undefined
+[2023-08-09 10:18:27.700] [info]  82:[object Object]
+[2023-08-09 10:19:38.409] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:19:39.364] [info]  76:undefined
+[2023-08-09 10:19:40.435] [info]  82:[object Object]
+[2023-08-09 10:20:01.408] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:20:02.372] [info]  76:undefined
+[2023-08-09 10:20:03.453] [info]  82:[object Object]
+[2023-08-09 10:25:15.143] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:25:16.076] [info]  76:undefined
+[2023-08-09 10:25:17.173] [info]  82:[object Object]
+[2023-08-09 10:25:46.263] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:25:47.149] [info]  76:undefined
+[2023-08-09 10:25:48.235] [info]  82:[object Object]
+[2023-08-09 10:27:18.072] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:27:19.174] [info]  76:undefined
+[2023-08-09 10:27:20.249] [info]  82:[object Object]
+[2023-08-09 10:27:42.436] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:27:43.458] [info]  76:undefined
+[2023-08-09 10:27:44.560] [info]  82:[object Object]
+[2023-08-09 10:41:58.877] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:41:59.863] [info]  76:undefined
+[2023-08-09 10:42:00.991] [info]  82:[object Object]
+[2023-08-09 10:42:12.074] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:42:13.048] [info]  76:undefined
+[2023-08-09 10:42:14.138] [info]  82:[object Object]
+[2023-08-09 10:45:26.721] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:45:27.772] [info]  76:undefined
+[2023-08-09 10:45:28.867] [info]  82:[object Object]
+[2023-08-09 10:46:34.044] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:46:35.065] [info]  76:undefined
+[2023-08-09 10:46:36.149] [info]  82:[object Object]
+[2023-08-09 10:46:50.252] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:46:51.164] [info]  76:undefined
+[2023-08-09 10:46:52.259] [info]  82:[object Object]
+[2023-08-09 10:47:15.776] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:47:16.877] [info]  76:undefined
+[2023-08-09 10:47:17.953] [info]  82:[object Object]
+[2023-08-09 10:47:26.745] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:47:27.782] [info]  76:undefined
+[2023-08-09 10:47:28.861] [info]  82:[object Object]
+[2023-08-09 10:50:13.872] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:50:14.888] [info]  76:undefined
+[2023-08-09 10:50:15.972] [info]  82:[object Object]
+[2023-08-09 10:50:20.397] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:50:21.425] [info]  76:undefined
+[2023-08-09 10:50:24.125] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:50:25.090] [info]  76:undefined
+[2023-08-09 10:50:26.158] [info]  82:[object Object]
+[2023-08-09 10:58:38.470] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:58:39.671] [info]  76:undefined
+[2023-08-09 10:58:40.764] [info]  82:[object Object]
+[2023-08-09 10:59:17.086] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 10:59:18.027] [info]  76:undefined
+[2023-08-09 10:59:19.135] [info]  82:[object Object]
+[2023-08-09 11:19:07.099] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 11:19:08.062] [info]  76:undefined
+[2023-08-09 11:19:09.161] [info]  82:[object Object]
+[2023-08-09 11:19:21.983] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 11:19:22.962] [info]  76:undefined
+[2023-08-09 11:19:24.056] [info]  82:[object Object]
+[2023-08-09 11:21:08.619] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 11:21:09.588] [info]  76:undefined
+[2023-08-09 11:21:10.678] [info]  82:[object Object]
+[2023-08-09 11:23:10.647] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 11:23:11.633] [info]  76:undefined
+[2023-08-09 11:23:12.746] [info]  82:[object Object]
+[2023-08-09 11:28:14.465] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 11:28:15.423] [info]  76:undefined
+[2023-08-09 11:28:17.542] [info]  82:[object Object]
+[2023-08-09 11:28:57.480] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 11:28:58.506] [info]  76:undefined
+[2023-08-09 11:28:59.587] [info]  82:[object Object]
+[2023-08-09 11:31:18.116] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 11:31:19.152] [info]  76:undefined
+[2023-08-09 11:31:20.271] [info]  82:[object Object]
+[2023-08-09 11:31:36.185] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 11:31:37.149] [info]  76:undefined
+[2023-08-09 11:31:38.225] [info]  82:[object Object]
+[2023-08-09 11:35:05.711] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 11:35:06.669] [info]  76:undefined
+[2023-08-09 11:35:07.766] [info]  82:[object Object]
+[2023-08-09 11:47:15.416] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 11:47:16.331] [info]  76:undefined
+[2023-08-09 11:47:17.446] [info]  82:[object Object]
+[2023-08-09 11:49:42.601] [info]  76:undefined
+[2023-08-09 11:49:42.629] [info]  82:[object Object]
+[2023-08-09 11:56:30.951] [info]  76:undefined
+[2023-08-09 11:56:31.007] [info]  82:[object Object]
+[2023-08-09 12:02:22.210] [info]  76:undefined
+[2023-08-09 12:02:22.544] [info]  82:[object Object]
+[2023-08-09 12:44:00.253] [info]  76:undefined
+[2023-08-09 12:44:00.350] [info]  82:[object Object]
+[2023-08-09 12:54:17.915] [info]  76:undefined
+[2023-08-09 12:54:18.180] [info]  82:[object Object]
+[2023-08-09 12:55:48.213] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 12:55:49.210] [info]  76:undefined
+[2023-08-09 12:55:50.344] [info]  82:[object Object]
+[2023-08-09 12:56:35.875] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 12:56:36.869] [info]  76:undefined
+[2023-08-09 12:56:38.008] [info]  82:[object Object]
+[2023-08-09 13:01:29.756] [info]  76:undefined
+[2023-08-09 13:01:29.822] [info]  82:[object Object]
+[2023-08-09 13:01:46.519] [info]  76:undefined
+[2023-08-09 13:01:46.807] [info]  82:[object Object]
+[2023-08-09 13:02:20.528] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:02:21.627] [info]  76:undefined
+[2023-08-09 13:02:22.736] [info]  82:[object Object]
+[2023-08-09 13:03:02.519] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:03:03.584] [info]  76:undefined
+[2023-08-09 13:03:04.681] [info]  82:[object Object]
+[2023-08-09 13:07:29.208] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:07:30.184] [info]  76:undefined
+[2023-08-09 13:07:31.312] [info]  82:[object Object]
+[2023-08-09 13:10:08.337] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:10:09.423] [info]  76:undefined
+[2023-08-09 13:10:10.575] [info]  82:[object Object]
+[2023-08-09 13:13:16.228] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:13:17.406] [info]  76:undefined
+[2023-08-09 13:13:18.527] [info]  82:[object Object]
+[2023-08-09 13:16:40.887] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:16:41.857] [info]  76:undefined
+[2023-08-09 13:16:42.969] [info]  82:[object Object]
+[2023-08-09 13:21:09.882] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:21:10.930] [info]  76:undefined
+[2023-08-09 13:21:12.070] [info]  82:[object Object]
+[2023-08-09 13:22:15.637] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:22:16.622] [info]  76:undefined
+[2023-08-09 13:22:17.776] [info]  82:[object Object]
+[2023-08-09 13:30:39.609] [info]  76:undefined
+[2023-08-09 13:30:39.703] [info]  82:[object Object]
+[2023-08-09 13:31:05.320] [info]  76:undefined
+[2023-08-09 13:31:05.404] [info]  82:[object Object]
+[2023-08-09 13:31:48.252] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:31:49.269] [info]  76:undefined
+[2023-08-09 13:31:50.401] [info]  82:[object Object]
+[2023-08-09 13:32:07.501] [info]  76:undefined
+[2023-08-09 13:32:07.572] [info]  82:[object Object]
+[2023-08-09 13:32:30.662] [info]  76:undefined
+[2023-08-09 13:32:30.725] [info]  82:[object Object]
+[2023-08-09 13:33:10.639] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:33:11.743] [info]  76:undefined
+[2023-08-09 13:33:12.885] [info]  82:[object Object]
+[2023-08-09 13:33:46.086] [info]  76:undefined
+[2023-08-09 13:33:46.153] [info]  82:[object Object]
+[2023-08-09 13:34:52.486] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:34:53.555] [info]  76:undefined
+[2023-08-09 13:34:54.687] [info]  82:[object Object]
+[2023-08-09 13:36:09.186] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:36:10.294] [info]  76:undefined
+[2023-08-09 13:36:11.401] [info]  82:[object Object]
+[2023-08-09 13:38:31.465] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:38:32.685] [info]  76:undefined
+[2023-08-09 13:38:33.820] [info]  82:[object Object]
+[2023-08-09 13:44:31.080] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:44:32.103] [info]  76:undefined
+[2023-08-09 13:44:33.230] [info]  82:[object Object]
+[2023-08-09 13:56:09.682] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 13:56:10.829] [info]  76:undefined
+[2023-08-09 13:56:11.953] [info]  82:[object Object]
+[2023-08-09 13:57:43.700] [info]  76:undefined
+[2023-08-09 13:57:43.791] [info]  82:[object Object]
+[2023-08-09 14:02:56.856] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:02:58.970] [info]  76:undefined
+[2023-08-09 14:03:00.107] [info]  82:[object Object]
+[2023-08-09 14:03:10.872] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:03:11.912] [info]  76:undefined
+[2023-08-09 14:03:13.024] [info]  82:[object Object]
+[2023-08-09 14:07:47.006] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:07:48.250] [info]  76:undefined
+[2023-08-09 14:07:49.393] [info]  82:[object Object]
+[2023-08-09 14:08:43.211] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:08:44.244] [info]  76:undefined
+[2023-08-09 14:08:45.394] [info]  82:[object Object]
+[2023-08-09 14:09:43.923] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:09:45.033] [info]  76:undefined
+[2023-08-09 14:09:46.169] [info]  82:[object Object]
+[2023-08-09 14:13:27.331] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:13:28.383] [info]  76:undefined
+[2023-08-09 14:13:29.513] [info]  82:[object Object]
+[2023-08-09 14:16:13.946] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:16:14.967] [info]  76:undefined
+[2023-08-09 14:16:16.075] [info]  82:[object Object]
+[2023-08-09 14:19:37.618] [info]  76:undefined
+[2023-08-09 14:19:37.679] [info]  82:[object Object]
+[2023-08-09 14:31:04.294] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:31:05.428] [info]  76:undefined
+[2023-08-09 14:31:06.542] [info]  82:[object Object]
+[2023-08-09 14:33:05.746] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:33:07.244] [info]  76:undefined
+[2023-08-09 14:33:08.429] [info]  82:[object Object]
+[2023-08-09 14:34:34.792] [info]  76:undefined
+[2023-08-09 14:34:34.838] [info]  82:[object Object]
+[2023-08-09 14:35:50.163] [info]  76:undefined
+[2023-08-09 14:35:50.217] [info]  82:[object Object]
+[2023-08-09 14:36:30.339] [info]  76:undefined
+[2023-08-09 14:36:30.398] [info]  82:[object Object]
+[2023-08-09 14:36:52.402] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:36:53.368] [info]  76:undefined
+[2023-08-09 14:36:54.472] [info]  82:[object Object]
+[2023-08-09 14:37:33.663] [info]  76:undefined
+[2023-08-09 14:37:33.700] [info]  82:[object Object]
+[2023-08-09 14:38:02.473] [info]  76:undefined
+[2023-08-09 14:38:02.512] [info]  82:[object Object]
+[2023-08-09 14:38:08.963] [info]  76:undefined
+[2023-08-09 14:38:09.003] [info]  82:[object Object]
+[2023-08-09 14:38:38.864] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:38:39.845] [info]  76:undefined
+[2023-08-09 14:38:40.998] [info]  82:[object Object]
+[2023-08-09 14:38:58.626] [info]  76:undefined
+[2023-08-09 14:38:58.666] [info]  82:[object Object]
+[2023-08-09 14:40:36.252] [info]  76:undefined
+[2023-08-09 14:40:36.284] [info]  82:[object Object]
+[2023-08-09 14:41:41.588] [info]  76:undefined
+[2023-08-09 14:41:41.649] [info]  82:[object Object]
+[2023-08-09 14:41:44.792] [info]  76:undefined
+[2023-08-09 14:41:44.869] [info]  82:[object Object]
+[2023-08-09 14:44:32.619] [info]  76:undefined
+[2023-08-09 14:44:32.651] [info]  82:[object Object]
+[2023-08-09 14:50:36.641] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:50:37.807] [info]  76:undefined
+[2023-08-09 14:50:38.951] [info]  82:[object Object]
+[2023-08-09 14:53:46.959] [info]  76:undefined
+[2023-08-09 14:53:47.012] [info]  82:[object Object]
+[2023-08-09 14:54:03.438] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:54:04.382] [info]  76:undefined
+[2023-08-09 14:54:05.516] [info]  82:[object Object]
+[2023-08-09 14:59:45.171] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 14:59:46.206] [info]  76:undefined
+[2023-08-09 14:59:47.336] [info]  82:[object Object]
+[2023-08-09 15:09:10.541] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 15:09:11.678] [info]  76:undefined
+[2023-08-09 15:09:12.800] [info]  82:[object Object]
+[2023-08-09 15:11:36.474] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 15:11:37.418] [info]  76:undefined
+[2023-08-09 15:11:38.555] [info]  82:[object Object]
+[2023-08-09 15:12:47.716] [info]  76:undefined
+[2023-08-09 15:12:47.772] [info]  82:[object Object]
+[2023-08-09 15:12:53.112] [info]  76:undefined
+[2023-08-09 15:12:53.170] [info]  82:[object Object]
+[2023-08-09 15:13:47.740] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
+[2023-08-09 15:13:48.697] [info]  76:undefined
+[2023-08-09 15:13:49.798] [info]  82:[object Object]

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "xklr",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "private": false,
   "author": "wly",
   "scripts": {

+ 0 - 18
src/main/appEvent.js

@@ -1,18 +0,0 @@
-import { app, BrowserWindow} from 'electron'
-export default function appEvent() {
-
-  app.on('activate', function () {
-    // On macOS it's common to re-create a window in the app when the
-    // dock icon is clicked and there are no other windows open.
-    if (BrowserWindow.getAllWindows().length === 0) createWindow()
-  })
-
-  // Quit when all windows are closed, except on macOS. There, it's common
-  // for applications and their menu bar to stay active until the user quits
-  // explicitly with Cmd + Q.
-  app.on('window-all-closed', () => {
-    if (process.platform !== 'darwin') {
-      app.quit()
-    }
-  })
-}

+ 20 - 19
src/main/main.js

@@ -2,17 +2,12 @@ import { app, shell, BrowserWindow, protocol, globalShortcut, ipcMain } from 'el
 import { LOAD_URL, ACHEME } from './config'
 import { createProtocol } from "vue-cli-plugin-electron-builder/lib";
 import path from 'path'
-
-import appEvent from './appEvent'
-import mainWinEvent from './mainWin'
-
-
-import createSettingWindow from './windows/settingwin'
-import createIndexwin from './windows/index'
-import checkUpdate from './windows/updater'
+import mainWinEvent from './windows/mainwin'
+import createIndexwin from './windows/indexwin'
+import createSettingwin from './windows/settingwin'
+import updatewin from './windows/updaterwin'
 import tray from './windows/tray'
 
-
 const isdev = process.env.NODE_ENV == "development"
 protocol.registerSchemesAsPrivileged([
   {
@@ -75,15 +70,10 @@ async function createWindow() {
     createProtocol(ACHEME);
     mainWindow.loadURL(LOAD_URL + '/#/ball');
     // mainWindow.loadURL(`file://${__dirname}/app/index.html`);
-
   }
   mainWinEvent(mainWindow)
-  checkUpdate()
+  updatewin()
 }
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-
 app.whenReady().then(async () => {
   // if (isdev && !process.env.IS_TEST) {
   // Install Vue Devtools
@@ -129,7 +119,7 @@ app.whenReady().then(async () => {
   // ]);
   // 注册一个快捷键监听器
   const ctrll = globalShortcut.register('CommandOrControl+L', () => {
-    createSettingWindow(BrowserWindow)
+    createSettingwin(BrowserWindow)
   })
   const ctrlk = globalShortcut.register('CommandOrControl+K', () => {
     app.relaunch()
@@ -150,12 +140,23 @@ app.whenReady().then(async () => {
     }
   });
   await createIndexwin(BrowserWindow)
-
-
   //任务托盘
   tray({ type: 'new' });
   //app
-  appEvent();
+  app.on('activate', function () {
+    // On macOS it's common to re-create a window in the app when the
+    // dock icon is clicked and there are no other windows open.
+    if (BrowserWindow.getAllWindows().length === 0) createWindow()
+  })
+
+  // Quit when all windows are closed, except on macOS. There, it's common
+  // for applications and their menu bar to stay active until the user quits
+  // explicitly with Cmd + Q.
+  app.on('window-all-closed', () => {
+    if (process.platform !== 'darwin') {
+      app.quit()
+    }
+  })
   //检测更新
   // checkUpdate()
 })

+ 5 - 2
src/main/windows/index.js

@@ -18,9 +18,10 @@ const createIndexwin = function (BrowserWindow) {
         icon: iconSrc,
         height: 423,
         width: 310,
+        minHeight:423,
+        minWidth:310,
         show: false,
         titleBarStyle: "hiddenInset",
-        frame: false,
         fullscreenable: false,
         minimizable: false,
         maximizable: false,
@@ -29,11 +30,13 @@ const createIndexwin = function (BrowserWindow) {
         autoHideMenuBar: false,
         enableLargerThanScreen: false,
         resizable: true,
+        frame: false,
+        // thickFrame:true,
         // closable: false,
         hasShadow: process.platform !== "darwin",
         alwaysOnTop: true,
         webPreferences: {
-            devTools: false,//isdev
+            devTools: isdev,//isdev
             contextIsolation: false,
             sandbox: false,
             nodeIntegration: true,

+ 1 - 1
src/main/mainWin.js

@@ -1,5 +1,5 @@
 import { shell,screen, ipcMain } from 'electron'
-import tray from './windows/tray'
+import tray from './tray'
 export default function mainWinEvent(mw) {
 
   //设置悬浮球位置

+ 2 - 2
src/main/windows/settingwin.js

@@ -9,7 +9,7 @@ const loadURL = isdev
 const iconSrc = __static + "/images/icon.ico";
 // console.log(loadURL)
 let settingWindow = null;
-const createSettingWindow = function (BrowserWindow) {
+const createSettingwin = function (BrowserWindow) {
     if (settingWindow !== null) {
         return false
     }
@@ -58,4 +58,4 @@ const createSettingWindow = function (BrowserWindow) {
     });
     // return settingWindow;
 };
-export default createSettingWindow;
+export default createSettingwin;

+ 2 - 4
src/main/windows/tray.js

@@ -1,6 +1,6 @@
 import { app, Menu, Tray, BrowserWindow } from 'electron'
 import createSettingWindow from './settingwin'
-import checkUpdate from './updater'
+import updatewin from './updaterwin'
 const iconSrc = __static + "/images/icon.ico";
 let ntray = null
 export default async function tray({ type, menu }) {
@@ -16,7 +16,7 @@ export default async function tray({ type, menu }) {
       label: '检查更新',
       click: function () {
         console.log('更新')
-        checkUpdate()
+        updatewin()
       }
     },
     {
@@ -51,6 +51,4 @@ export default async function tray({ type, menu }) {
   let n = Menu.buildFromTemplate(trayMenu)
   ntray.setToolTip('星空路人医生端')
   ntray.setContextMenu(n)
-
-
 }

+ 2 - 3
src/main/windows/updater.js

@@ -7,15 +7,14 @@ const isdev = process.env.NODE_ENV == "development"
 const loadURL = isdev
     ? `${process.env.WEBPACK_DEV_SERVER_URL}#/update`
     : `${LOAD_URL}#update`;
-
 const iconSrc = __static + "/images/icon.ico";
 // 服务器地址
 const server = 'http://testadmin.xklr.net:8601'
 const url = isdev ? __dirname : `${server}/appupdatedoc/`
-console.log(15, url)
+// console.log(15, url)
 let updateWin = null;
 // 自动检测更新
-export default function checkUpdate() {
+export default function updatewin() {
     try {
         if (updateWin !== null) {
             return false

+ 1 - 0
src/renderer/App.vue

@@ -47,6 +47,7 @@ export default {
     },
     fn() {
       let t = this
+      console.log(this.$route.path)
       ipcRenderer.on('reply', function (event, type) {
         // console.log(type);
         if (type == '注销') {

+ 8 - 0
src/renderer/api/patient.js

@@ -22,6 +22,14 @@ export default {
       isDataAll:true
     })
   },
+  find_visit_sum1(data){
+    return instance({
+      url: '/patient/find_visit_sum',
+      method: 'post',
+      isDataAll:true,
+      isgetInfo:true
+    })
+  },
   //居家检测
 	find_home_data(data) {
 		return instance({

+ 2 - 2
src/renderer/pages/home/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="">
+  <div class="" style="">
     <router-view />
   </div>
 </template>
@@ -29,7 +29,7 @@ export default {
   created() {
     let t=this
     ipcRenderer.on('isclick', (e,o)=>{
-      console.log(o)
+      // console.log(o)
       t.isclick=o
     })
     let windowSize = localStorage.getItem('windowSize') ? JSON.parse(localStorage.getItem('windowSize')) : {}

+ 1 - 3
src/renderer/pages/login/index.vue

@@ -50,7 +50,7 @@ export default {
       else callback()
     }
     let formInline = process.env.NODE_ENV == "development" ? {
-      username: '18812312312', password: 'cxsrmyyyljkjtfhfy@202098'
+      username: '18812312312', password: '123456' //'cxsrmyyyljkjtfhfy@202098'
     } : {
       username: localStorage.getItem('useraccount') || '',
       password: localStorage.getItem('password') || '',
@@ -113,10 +113,8 @@ export default {
                   t.$api.getHospitalInfo(),
                   t.findVisitSum()
                 ]).then((resall) => {
-                  console.log(resall)
                  let timer = setInterval(() => {
                     t.findVisitSum().then((res)=>{
-                      // console.log(119,res)
                       if(res.code==401){
                         clearInterval(timer)
                       }

+ 160 - 0
src/renderer/pages/patientdetail/model/check.vue

@@ -0,0 +1,160 @@
+<template>
+  <div style="background: rgb(246,248,249);">
+    <div class="p-2">
+      <div class="p-2 bg-white" style="box-shadow: 0px 2px 13px 2px rgba(211,212,214,0.45);border-radius: 8px;">
+        <div class="fs-14 text-dark font-bold  border-bottom mb-1" style="">
+          每次诊间
+        </div>
+        <div class="fs-12">
+          <div v-for="key in Object.keys(everykeyName)" class="d-inline-block mr-1 ">
+            <div class="centerd">
+              {{ everykeyName[key] }}
+                <span style="line-height: 1;" v-if="pdata.every[key] == '1'" class="iconfont CheckMark fs-14 font-blod text-primary"></span>
+              <span style="line-height: 1;" v-else icon="close-line" class="iconfont CloseDefault fs-14 text-error"></span >
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="p-2 bg-white mt-2" style="box-shadow: 0px 2px 13px 2px rgba(211,212,214,0.45);border-radius: 8px;">
+        <div class="fs-14 text-dark font-bold  border-bottom mb-1" style="">
+          季度监测
+        </div>
+        <div class="fs-12">
+          <div v-for="key in Object.keys(pdata.quarter)" class="d-inline-block mr-1 ">
+            <div class="centerd">
+              {{ quarterkeyName[key] }}
+                <span style="line-height: 1;" v-if="pdata.quarter[key] == '1'" class="iconfont CheckMark fs-14 font-blod text-primary"></span>
+              <span style="line-height: 1;" v-else icon="close-line" class="iconfont CloseDefault fs-14 text-error"></span >
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="p-2 bg-white mt-2" style="box-shadow: 0px 2px 13px 2px rgba(211,212,214,0.45);border-radius: 8px;">
+        <div class="fs-14 text-dark font-bold  border-bottom mb-1" style="">
+          年度监测
+        </div>
+        <div class="fs-12">
+          <div v-for="key in Object.keys(pdata.year)" class="d-inline-block mr-1 ">
+            <div class="centerd">
+              {{ annualkeyName[key] }}
+                <span style="line-height: 1;" v-if="pdata.year[key] == '1'" class="iconfont CheckMark fs-14 font-blod text-primary"></span>
+              <span style="line-height: 1;" v-else icon="close-line" class="iconfont CloseDefault fs-14 text-error"></span >
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex'
+
+const everykeyName = {
+  height: '身高',
+  weight: '体重',
+  Waist: '腰围',
+  bloodPressure: '血压',
+  bloodGlucose: '血糖',
+  endBloodGlucose: '餐后血糖',
+  dpap: '足背动脉'
+}
+
+const quarterkeyName = {
+  urine2: '微量白蛋白',
+  urine1: '肌酐',
+  bloodGlucose3: '糖化血红蛋白',
+  kidney3: '尿素氮',
+  bloodFat: '血脂',
+  hcy: '同型半胱氨酸'
+}
+
+const annualkeyName = {
+  bre: '血常规',
+  rut: '尿常规',
+  ogtt: 'OGTT糖耐量试验/胰岛素释放试验/C 肽释放试验',
+  visceralFat: '内脏脂肪检测',
+  arteriosclerosis: '外周神经传导检测/感觉阈值测定',
+  electrolyte: '血电解质/血钾',
+  ecg: '心电图',
+  ctr:"胸片(心胸比)",
+  eye:"眼底照相",
+  carotidArtery:"颈动脉超声",
+  cardiogram1:"超声心动图",
+  cardiogram2:"动态心电图",
+  abp:"动态血压",
+  arteriosclerosis:"脉硬化检测"
+}
+
+
+export default {
+  name: 'Reminder',
+  components: {},
+  props: {
+    dialogshow: {
+      type: Boolean,
+      default() {
+        return false
+      },
+    },
+    pdata: {
+      type: Object,
+      default() {
+        return { every: {}, quarter: {}, year: {} }
+      },
+    },
+  },
+  computed: {
+    ...mapGetters({
+      userinfo: 'user/userinfo',
+      hospitalinfo: 'user/hospitalinfo',
+    }),
+  },
+  watch: {
+    dialogshow: {
+      handler(val) {
+        console.log(this.pdata)
+      },
+    },
+    pdata: {
+      handler(val) {
+        console.log(val)
+      },
+      deep: true
+    },
+  },
+  data() {
+    return {
+      everykeyName,
+      quarterkeyName,
+      annualkeyName,
+
+      dataObj: {}
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('close', 'reminder')
+    },
+  },
+}
+</script>
+  
+<style scoped>
+.title2 {
+  font-size: 14px;
+  margin-top: 10px;
+}
+
+.el-col {
+  margin-bottom: 0;
+}
+
+.el-card__body {
+  padding-bottom: 0;
+}
+
+.el-descriptions-item__content {
+  font-size: 16px !important;
+}
+</style>
+  

+ 41 - 22
src/renderer/pages/patientdetail/model/view.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mys" style="" v-if="i " >
+  <div class="mys" style="" v-if="i">
     <div class="mx-1 mb-5 position-relative" v-if="propData.patient">
       <div class="centerY">
         <div class="bule_line"></div>
@@ -294,6 +294,22 @@
             </div>
           </div>
         </el-collapse-item>
+        <!-- 监测指标 -->
+        <el-collapse-item title="" name="6">
+          <template #title>
+            <div class="centerY px-2 fs-14">
+              <div class="bule_line"></div>
+              <div>
+                <span class="font-bold text-dark ml-2 fs-14 line-height1">监测指标</span>
+                <span class="ml-1 text-gry fs-12"> (<span class="iconfont CheckMark fs-12 font-blod text-primary"></span>已检查 /
+                  <span icon="close-line" class="iconfont CloseDefault fs-12 text-error"></span>未检查)</span>
+              </div>
+            </div>
+          </template>
+          <div class="p-2 fs-14 mt-n2" style="color: #818181;">
+            <CheckModel :pdata="propData.yearCheck" />
+          </div>
+        </el-collapse-item>
         <!-- 眼底 -->
         <el-collapse-item title="" v-if="propData.eye.eyeData && propData.eye.eyeData.id" name="3">
           <template #title>
@@ -321,17 +337,19 @@
                 <div class="fs-12 text-dark w-80 pl-1">
                   <div>
                     (左眼) <span v-if="propData.eye.eyeData.leftMaculaLutea">{{ propData.eye.eyeData.leftMaculaLutea
-                    }}、</span> <span v-if="propData.eye.eyeData.leftPathology">{{ JSON.parse(propData.eye.eyeData.leftPathology).join('、') }};</span>
-                    <span v-if="propData.eye.eyeData.isRead==0">
-                        未阅片
+                    }}、</span> <span v-if="propData.eye.eyeData.leftPathology">{{
+  JSON.parse(propData.eye.eyeData.leftPathology).join('、') }};</span>
+                    <span v-if="propData.eye.eyeData.isRead == 0">
+                      未阅片
                     </span>
                   </div>
                   <div>
                     (右眼) <span v-if="propData.eye.eyeData.rightMaculaLutea">{{ propData.eye.eyeData.rightMaculaLutea
                     }}、</span>
-                    <span v-if="propData.eye.eyeData.rightPathology">{{ JSON.parse(propData.eye.eyeData.rightPathology).join('、') }};</span>
-                     <span v-if="propData.eye.eyeData.isRead==0">
-                        未阅片
+                    <span v-if="propData.eye.eyeData.rightPathology">{{
+                      JSON.parse(propData.eye.eyeData.rightPathology).join('、') }};</span>
+                    <span v-if="propData.eye.eyeData.isRead == 0">
+                      未阅片
                     </span>
                   </div>
                 </div>
@@ -411,9 +429,9 @@
           </div>
         </el-collapse-item>
       </el-collapse>
-      <div class="centerY fs-12 mt-2" >
+      <div class="centerY fs-12 mt-2">
         <div class="ml-auto text-primary cursor-pointer" v-if="wwwurl"
-          @click="open(wwwurl+'/index?idCard=' + propData.patient.idCard)">
+          @click="open(wwwurl + '/index?idCard=' + propData.patient.idCard)">
           去网页版查看患者更多信息 >
         </div>
       </div>
@@ -428,9 +446,10 @@ import { getAge, timeTrans } from '@/utils/common'
 import * as echarts from 'echarts';
 const { keyValue, healthIndex, CHRONIC_DISEASE_TYPE } = conf;
 import { ipcRenderer } from "electron";
-
+import CheckModel from './check.vue'
 export default {
   name: 'modelview',
+  components: { CheckModel },
   props: {
     propData: {
       type: Object,
@@ -470,23 +489,23 @@ export default {
       echarts1data: {},
       accessType: 1,
       img_host: '',
-      i:0,
-      wwwurl:''
+      i: 0,
+      wwwurl: ''
     };
   },
   watch: {
     propData: {
       handler(val) {
-        this.wwwurl = localStorage.getItem('locationpath')?JSON.parse(localStorage.getItem('locationpath')).webURL:''
+        this.wwwurl = localStorage.getItem('locationpath') ? JSON.parse(localStorage.getItem('locationpath')).webURL : ''
         console.log(val)
-        this.i =0 ;
-        this.i =1;
+        this.i = 0;
+        this.i = 1;
         this.settingData()
       }
     }
   },
   mounted() {
-    
+
   },
   beforeDestroy() {
   },
@@ -498,17 +517,17 @@ export default {
       val.map((item) => {
         if (item == 1) {
           if (this.propData.physical && this.propData.physical.length) {
-              this.chartOption1(this.echarts1data, 'echarts1');
-              this.chartOption2(this.echarts1data, 'echarts2');
+            this.chartOption1(this.echarts1data, 'echarts1');
+            this.chartOption2(this.echarts1data, 'echarts2');
           }
 
         } else if (item == 5) {
           if (this.homedata.gxyList && this.homedata.gxyList.length) {
-              this.chartOption3(this.homedata.gxyList, 'echarts3')
-              this.chartOption4(this.homedata.gxyList, 'echarts4')
+            this.chartOption3(this.homedata.gxyList, 'echarts3')
+            this.chartOption4(this.homedata.gxyList, 'echarts4')
           }
           if (this.homedata.tnbList && this.homedata.tnbList.length) {
-              this.chartOption5(this.homedata.tnbList, 'echarts5')
+            this.chartOption5(this.homedata.tnbList, 'echarts5')
           }
         }
       })
@@ -543,7 +562,7 @@ export default {
         });
       }
     },
-    
+
     initChart(dom, option) {
       this.$nextTick(() => {
         let chart = echarts.init(document.getElementById(dom))

+ 4 - 2
src/renderer/store/modules/user.js

@@ -50,6 +50,7 @@ const mutations = {
    * @param {*} userinfo
    */
   setUserInfo(state, userinfo) {
+    console.log(userinfo)
     state.userinfo = userinfo
   },
   /**
@@ -111,6 +112,7 @@ const actions = {
     }
     if (token) {
       commit('setToken1', token)
+      
     } else {
       const err = `登录接口异常,未正确返回${tokenName}...`
       Message({
@@ -149,7 +151,7 @@ const actions = {
       throw err
     } else {
       if (data.username) {
-        localStorage.setItem('userinfo', data)
+        localStorage.setItem('userinfo', JSON.stringify(data))
         if (data.type !== 0) {
           data.username = data.username + type[data.type]
         }
@@ -160,11 +162,11 @@ const actions = {
       }
       commit('setUserInfo', data)
       // await store.dispatch('getHospitalInfo')
-
     }
     return Promise.resolve(data)
   },
   async getHospitalInfo({ commit, dispatch }) {
+    console.log(store.getters['user/userinfo'])
     if (store.getters['user/userinfo'].isSystem == 1) {
       return false
     }

+ 1 - 2
vue.config.js

@@ -124,7 +124,7 @@ module.exports = {
                             target: "nsis",
                             // 这个意思是打出来32 bit + 64 bit的包,但是要注意:这样打包出来的安装包体积比较大,所以建议直接打32的安装包。
                             arch: [
-                                "x64",
+                                // "x64",
                                 'ia32'
                             ],
                         },
@@ -157,7 +157,6 @@ module.exports = {
                 nsis: {
                     // 是否一键安装,建议为 false,可以让用户点击下一步、下一步、下一步的形式安装程序,如果为true,当用户双击构建好的程序,自动安装程序并打开,即:一键安装(one-click installer)
                     oneClick: true,
-                  
                     // 允许请求提升。 如果为false,则用户必须使用提升的权限重新启动安装程序。
                     allowElevation: true,
                     // 允许修改安装目录,建议为 true,是否允许用户改变安装目录,默认是不允许