修改登录接口

.gitignore

@@ -27,3 +27,4 @@ pnpm-debug.log*
 
 #Electron-builder output
 /dist_electron
+/log

log/2023-8-28.log

@@ -1,3 +0,0 @@
-[2023-08-28 10:01:18.540] [info]  38:D:\web\product\electron\doctor-electron\dist\electron
-[2023-08-28 10:01:19.718] [info]  76:undefined
-[2023-08-28 10:01:20.890] [info]  82:[object Object]

log/2023-9-18.log

@@ -1,64 +0,0 @@
-[2023-09-18 11:30:56.632] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2023-09-18 11:35:21.205] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2023-09-18 11:39:45.588] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2023-09-18 13:29:20.701] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2023-09-18 13:29:53.494] [info]  76:undefined
-[2023-09-18 13:29:54.710] [info]  updater-118:HttpError: 500 Internal Server Error
-"method: GET url: http://testapi.xklr.net:8601/appUpdate/doctor/latest.yml?noCache=1hajc8fjc\n\n          Data:\n          {\"code\":401,\"msg\":\"登录已过期,请重新登录!\",\"data\":null,\"data2\":null}\n          "
-Headers: {
-  "content-type": "application/json",
-  "date": "Mon, 18 Sep 2023 05:29:54 GMT",
-  "vary": "Origin, Access-Control-Request-Method, Access-Control-Request-Headers, Origin, Access-Control-Request-Method, Access-Control-Request-Headers",
-  "content-length": "78"
-}
-[2023-09-18 13:29:54.927] [info]  76:undefined
-[2023-09-18 13:29:55.015] [info]  updater-118:HttpError: 500 Internal Server Error
-"method: GET url: http://testapi.xklr.net:8601/appUpdate/doctor/latest.yml?noCache=1hajc8gvg\n\n          Data:\n          {\"code\":401,\"msg\":\"登录已过期,请重新登录!\",\"data\":null,\"data2\":null}\n          "
-Headers: {
-  "content-type": "application/json",
-  "date": "Mon, 18 Sep 2023 05:29:54 GMT",
-  "vary": "Origin, Access-Control-Request-Method, Access-Control-Request-Headers, Origin, Access-Control-Request-Method, Access-Control-Request-Headers",
-  "content-length": "78"
-}
-[2023-09-18 13:30:31.858] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2023-09-18 13:30:33.426] [info]  76:undefined
-[2023-09-18 13:30:34.543] [info]  updater-118:HttpError: 500 Internal Server Error
-"method: GET url: http://testapi.xklr.net:8601/appUpdate/doctor/latest.yml?noCache=1hajc9mil\n\n          Data:\n          {\"code\":401,\"msg\":\"登录已过期,请重新登录!\",\"data\":null,\"data2\":null}\n          "
-Headers: {
-  "content-type": "application/json",
-  "date": "Mon, 18 Sep 2023 05:30:33 GMT",
-  "vary": "Origin, Access-Control-Request-Method, Access-Control-Request-Headers, Origin, Access-Control-Request-Method, Access-Control-Request-Headers",
-  "content-length": "78"
-}
-[2023-09-18 13:31:34.758] [info]  76:undefined
-[2023-09-18 13:31:34.816] [info]  updater-118:HttpError: 500 Internal Server Error
-"method: GET url: http://testapi.xklr.net:8601/appUpdate/doctor/latest.yml?noCache=1hajcbif7\n\n          Data:\n          {\"code\":401,\"msg\":\"登录已过期,请重新登录!\",\"data\":null,\"data2\":null}\n          "
-Headers: {
-  "content-type": "application/json",
-  "date": "Mon, 18 Sep 2023 05:31:34 GMT",
-  "vary": "Origin, Access-Control-Request-Method, Access-Control-Request-Headers, Origin, Access-Control-Request-Method, Access-Control-Request-Headers",
-  "content-length": "78"
-}
-[2023-09-18 13:33:05.754] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2023-09-18 13:33:07.428] [info]  76:undefined
-[2023-09-18 13:33:08.557] [info]  updater-118:HttpError: 500 Internal Server Error
-"method: GET url: http://testapi.xklr.net:8601/appUpdate/doctor/latest.yml?noCache=1hajcecv8\n\n          Data:\n          {\"code\":401,\"msg\":\"登录已过期,请重新登录!\",\"data\":null,\"data2\":null}\n          "
-Headers: {
-  "content-type": "application/json",
-  "date": "Mon, 18 Sep 2023 05:33:07 GMT",
-  "vary": "Origin, Access-Control-Request-Method, Access-Control-Request-Headers, Origin, Access-Control-Request-Method, Access-Control-Request-Headers",
-  "content-length": "78"
-}
-[2023-09-18 13:33:41.991] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2023-09-18 13:33:43.591] [info]  76:undefined
-[2023-09-18 13:33:44.726] [info]  updater-118:HttpError: 500 Internal Server Error
-"method: GET url: http://testapi.xklr.net:8601/appUpdate/doctor/latest.yml?noCache=1hajcfg9b\n\n          Data:\n          {\"code\":401,\"msg\":\"登录已过期,请重新登录!\",\"data\":null,\"data2\":null}\n          "
-Headers: {
-  "content-type": "application/json",
-  "date": "Mon, 18 Sep 2023 05:33:44 GMT",
-  "vary": "Origin, Access-Control-Request-Method, Access-Control-Request-Headers, Origin, Access-Control-Request-Method, Access-Control-Request-Headers",
-  "content-length": "78"
-}
-[2023-09-18 13:34:30.436] [info]  76:undefined
-[2023-09-18 13:34:30.690] [info]  89:[object Object]
-[2023-09-18 13:34:30.692] [info]  updater-118:Error: ENOENT: no such file or directory, open 'D:\web\product\electron\doctor-xklr\dist\electron\dev-app-update.yml'

log/2023-9-22.log

@@ -1,5 +0,0 @@
-[2023-09-22 15:27:06.070] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2023-09-22 15:32:37.071] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2023-09-22 15:36:27.297] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2023-09-22 15:36:38.103] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2023-09-22 15:37:16.939] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron

log/2024-1-22.log

@@ -1,2 +0,0 @@
-[2024-01-22 10:16:58.033] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-01-22 10:23:05.677] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron

log/2024-1-25.log

@@ -1,2 +0,0 @@
-[2024-01-25 11:36:24.439] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-01-25 11:37:05.523] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron

log/2024-3-13.log

@@ -1,56 +0,0 @@
-[2024-03-13 10:12:39.355] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:15:05.618] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:15:07.108] [info]  76:undefined
-[2024-03-13 10:15:09.080] [info]  updater-118:HttpError: 500 
-"method: GET url: http://192.168.1.103:10066//appUpdate/doctor/latest.yml?noCache=1hoqpf24d\n\n          Data:\n          {\"code\":401,\"msg\":\"登录已过期,请重新登录!\",\"data\":null,\"data2\":null}\n          "
-Headers: {
-  "vary": "Origin, Access-Control-Request-Method, Access-Control-Request-Headers, Origin, Access-Control-Request-Method, Access-Control-Request-Headers",
-  "content-type": "application/json",
-  "transfer-encoding": "chunked",
-  "date": "Wed, 13 Mar 2024 02:15:07 GMT",
-  "connection": "close"
-}
-[2024-03-13 10:15:42.005] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:15:43.418] [info]  76:undefined
-[2024-03-13 10:15:44.563] [info]  updater-118:HttpError: 500 
-"method: GET url: http://192.168.1.103:10066/appUpdate/doctor/latest.yml?noCache=1hoqpg5kv\n\n          Data:\n          {\"code\":401,\"msg\":\"登录已过期,请重新登录!\",\"data\":null,\"data2\":null}\n          "
-Headers: {
-  "vary": "Origin, Access-Control-Request-Method, Access-Control-Request-Headers, Origin, Access-Control-Request-Method, Access-Control-Request-Headers",
-  "content-type": "application/json",
-  "transfer-encoding": "chunked",
-  "date": "Wed, 13 Mar 2024 02:15:42 GMT",
-  "connection": "close"
-}
-[2024-03-13 10:17:50.138] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:17:51.483] [info]  76:undefined
-[2024-03-13 10:17:52.751] [info]  82:[object Object]
-[2024-03-13 10:43:14.448] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:43:15.989] [info]  76:undefined
-[2024-03-13 10:43:17.129] [info]  82:[object Object]
-[2024-03-13 10:44:46.396] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:44:48.011] [info]  76:undefined
-[2024-03-13 10:44:49.155] [info]  82:[object Object]
-[2024-03-13 10:46:01.265] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:46:02.922] [info]  76:undefined
-[2024-03-13 10:46:04.041] [info]  82:[object Object]
-[2024-03-13 10:47:18.797] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:47:20.416] [info]  76:undefined
-[2024-03-13 10:47:21.581] [info]  82:[object Object]
-[2024-03-13 10:47:46.344] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:47:47.918] [info]  76:undefined
-[2024-03-13 10:47:49.111] [info]  82:[object Object]
-[2024-03-13 10:48:31.077] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:48:32.593] [info]  76:undefined
-[2024-03-13 10:48:33.717] [info]  82:[object Object]
-[2024-03-13 10:55:30.319] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:55:31.686] [info]  76:undefined
-[2024-03-13 10:55:32.986] [info]  82:[object Object]
-[2024-03-13 10:55:54.646] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:55:56.109] [info]  76:undefined
-[2024-03-13 10:55:57.222] [info]  82:[object Object]
-[2024-03-13 10:56:05.439] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:56:07.359] [info]  76:undefined
-[2024-03-13 10:56:08.514] [info]  82:[object Object]
-[2024-03-13 10:56:17.871] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-03-13 10:56:19.300] [info]  76:undefined
-[2024-03-13 10:56:20.426] [info]  82:[object Object]

log/2024-5-23.log

@@ -1,50 +0,0 @@
-[2024-05-23 09:57:22.671] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 09:59:15.816] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 11:53:09.010] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 11:53:40.683] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 11:53:56.583] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 11:56:18.738] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:34:08.174] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:35:20.662] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:36:42.259] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:40:49.527] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:41:25.007] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:41:42.998] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:41:47.770] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:41:53.615] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:48:04.576] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:48:51.341] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:49:45.316] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:50:11.211] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:50:28.082] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:51:50.565] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:51:57.601] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:53:17.532] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:53:27.938] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:53:32.938] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:53:52.406] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:53:59.008] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:54:26.627] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:55:04.667] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:55:23.442] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:55:30.789] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 13:55:35.960] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:08:54.879] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:09:10.300] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:09:22.498] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:11:30.553] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:13:06.566] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:18:30.337] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:20:38.896] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:20:50.003] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:21:23.874] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:22:54.181] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:23:03.813] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:23:09.584] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:23:20.303] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:23:31.464] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:23:46.610] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 14:30:01.089] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 15:39:13.995] [info]  38:D:\web\product\electron\doctor-xklr\dist\electron
-[2024-05-23 15:39:14.785] [info]  76:undefined
-[2024-05-23 15:39:15.007] [info]  82:[object Object]

package.json

@@ -1,11 +1,11 @@
 {
   "name": "doctor-xklr",
   "productName": "星空路人-医生端",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "private": false,
   "author": "wly",
   "scripts": {
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service electron:build",
+    "build": "vue-cli-service electron:build",
     "serve": "vue-cli-service electron:serve",
     "test:unit": "vue-cli-service test:unit",
     "test:e2e": "vue-cli-service test:e2e",

src/main/main.js

@@ -35,7 +35,7 @@ async function createWindow() {
     height: 80, //悬浮窗口的高度 比实际DIV的高度要多2px 因为有1px的边框
     icon: iconSrc,
     show: true,
-    skipTaskbar: isdev, // 任务栏中不显示窗口
+    skipTaskbar: true, // 任务栏中不显示窗口
     autoHideMenuBar: false,
     transparent: true, //设置透明
     resizable: isdev,
@@ -43,7 +43,7 @@ async function createWindow() {
     hasShadow: process.platform !== "darwin", //不显示阴影
     alwaysOnTop: true, //窗口是否总是显示在其他窗口之前\
     webPreferences: {
-      devTools: false,
+      devTools: isdev,
       sandbox: false,
       enableRemoteModule: true,
       nodeIntegration: true,

src/main/windows/indexwin.js

@@ -33,7 +33,7 @@ const createIndexwin = function (BrowserWindow) {
         hasShadow: process.platform !== "darwin", //不显示阴影
         alwaysOnTop: true,
         webPreferences: {
-            devTools: false,
+            devTools: isdev,
             sandbox: false,
             enableRemoteModule: true,
             nodeIntegration: true,
@@ -51,6 +51,7 @@ const createIndexwin = function (BrowserWindow) {
     // //移动窗口
     let sizeobj= indexwin.getContentBounds(),ifclick=false
     ipcMain.on('move-application1', (event, option) => { //移动
+
         ifclick=false
         indexwin.setSize(sizeobj.width, sizeobj.height);
         indexwin && indexwin.setPosition(option.posX-5, option.posY-5)

src/main/windows/settingwin.js

@@ -34,7 +34,7 @@ const createSettingwin = function (BrowserWindow) {
         hasShadow: process.platform !== "darwin",
         alwaysOnTop: true,
         webPreferences: {
-            devTools: false,
+            devTools: isdev,
             contextIsolation: false,
             sandbox: false,
             nodeIntegration: true,

src/renderer/api/user.js

@@ -2,7 +2,7 @@ import instance from './request'
 export default {
   login: function(data) {
     return instance({
-      url: '/user/login',
+      url: '/user/login1',
       method: 'post',
       data,
       // isAction:true,

src/renderer/pages/ball/index.vue

@@ -3,7 +3,7 @@
     <!-- <div class="cursor-pointer"
       style="width: 100vw;height:100vh;background-color: transparent;position: absolute;left: 0;right: 0;z-index: 0;-webkit-app-region: drag;">
     </div> -->
-    <div :class="['box1 cursor-pointer', class1]" @dblclick="showblock1" style="padding: 12.5px 12px;z-index: 999;">
+    <div :class="['box1 cursor-pointer', class1]" @click="throttle" style="padding: 12.5px 12px;z-index: 999;">
       <div :class="['ball', 'ballhover', 'position-relative']" @click="goMainPage">
         <!-- -->
         <div class="amin" v-for="(item, index) in aminstyle" :key="index" :style="{ ...item }">
@@ -78,7 +78,8 @@ export default {
       class1: '',
       aminstyle,
       baseX: 0,
-      baseY: 0
+      baseY: 0,
+      a1:0
     }
   },
   computed: {
@@ -91,11 +92,23 @@ export default {
   mounted() {
     let t = this
     ipcRenderer.on('vuex-state-set-web', (event, res) => {
-      t[res.type](res.data||{})
+      t[res.type](res.data || {})
     })
     this.move()
   },
   methods: {
+    throttle() {
+      let t=this
+      if(t.a1>=1){
+        t.showblock1();
+        console.log(1)
+      }else{
+        t.a1+=1
+      }
+      let timer=setTimeout(()=>{
+        t.a1=0
+      },500)
+    },
     ...mapActions({
       setPatientnum: 'patient/setPatientnum',
       setUserInfo: 'user/setUserInfo',
@@ -106,7 +119,9 @@ export default {
       return num
     },
     showblock1() {
+      console.log(2)
       let t = this
+      t.a1=0
       t.showblock = !t.showblock
       if (t.showblock) {
         ipcRenderer.send('index-show')
@@ -425,5 +440,4 @@ body {
 
 .ballcontent {
   border-radius: 6px;
-}
-</style>
+}</style>

src/renderer/pages/patientdetail/model/view.vue

@@ -49,12 +49,12 @@
       </div>
       <!-- 管理等级 -->
       <div class="centerY mt-2">
-        <div class="w-50 pr-2">
-          <div class="centerY py-2" v-if="propData.gljb.gxyVisit && propData.gljb.gxyVisit.id">
+        <div class="w-50 pr-2" v-if="propData.gljb.gxyVisit && propData.gljb.gxyVisit.id">
+          <div class="centerY py-2" >
             <div class="bule_line"></div>
             <span class="font-bold text-dark ml-2 fs-14 line-height1">高血压管理等级</span>
           </div>
-          <div class="" v-if="propData.gljb.gxyVisit && propData.gljb.gxyVisit.id">
+          <div class="">
             <div class="fs-12 w-100 mr-2 border-box overflow"
               style="line-height:1.5;border: 1px solid #1890ff;border-radius:4px;background:#fff;">
               <div class="text-center fs-12 font-bold "
@@ -73,12 +73,12 @@
             </div>
           </div>
         </div>
-        <div class="w-50">
-          <div class="centerY py-2" v-if="propData.gljb.tnbVisit && propData.gljb.tnbVisit.id">
+        <div class="w-50" v-if="propData.gljb.tnbVisit && propData.gljb.tnbVisit.id">
+          <div class="centerY py-2" >
             <div class="bule_line"></div>
             <span class="font-bold text-dark ml-2 fs-14 line-height1">糖尿病管理等级</span>
           </div>
-          <div class="" v-if="propData.gljb.tnbVisit && propData.gljb.tnbVisit.id">
+          <div class="">
             <div class="fs-12 w-100 border-box overflow"
               style="line-height:1.5;border: 1px solid #1890ff;border-radius:4px;background:#fff;">
               <div class="fs-12" style="line-height:1">
@@ -165,7 +165,7 @@
           </div>
         </el-collapse-item>
         <!-- 随访 -->
-        <el-collapse-item title="" name="2" v-if="propData.gljb?.gxyVisit.id || propData.gljb?.tnbVisit.id">
+        <el-collapse-item title="" name="2" v-if="propData.gljb?.gxyVisit?.id || propData.gljb?.tnbVisit?.id">
           <template #title>
             <div class="centerY px-2">
               <div class="bule_line"></div>
@@ -212,7 +212,7 @@
                 </div>
               </div>
             </div>
-            <div v-if="propData.gljb.gxyVisit?.id">
+            <div v-if="propData.gljb?.gxyVisit?.id">
               <div class="centerY  text-dark"><span class="iconfont gonggaotongzhi mr-1"></span>高血压随访</div>
               <div class="centerY">
                 <div class="w-50">摄盐程度:
@@ -238,7 +238,7 @@
                 </div>
               </div>
             </div>
-            <div v-if="propData.gljb.tnbVisit?.id">
+            <div v-if="propData.gljb?.tnbVisit?.id">
               <div class="centerY text-dark"><span class="iconfont gonggaotongzhi mr-1"></span>糖尿病随访</div>
               <div class="centerY">
                 <div class="w-45">主食:

src/renderer/pages/patientlist/index.vue

@@ -9,7 +9,7 @@
         查询
       </el-button>
     </div>
-    <div class="listenscroll" style="height: calc(100vh - 80px);overflow-y: auto; width: 100%;overflow-x: hidden;">
+    <div class="listenscroll" style="height: calc(100vh - 90px);overflow-y: auto; width: 100%;overflow-x: hidden;">
       <div class="mx-3" v-if="dataArray.length" >
         <el-card class="listbox mb-2" :body-style="{ padding: '0', borderRadius: '20px' }"  v-for="item, index in [...dataArray]" :key="index">
           <div class="cursor-pointer p-2"  @click="navto(item)">
@@ -131,7 +131,8 @@ export default {
       this.initList();
     },
     scrollChange(e) {
-      if (e.target.scrollTop > 0 && (e.target.scrollHeight - e.target.scrollTop) <= 340) {
+      console.log(e.target.scrollHeight - e.target.scrollTop)
+      if (e.target.scrollTop > 0 && (e.target.scrollHeight - e.target.scrollTop) <= e.target.scrollHeight ) {
         if (this.bottoming_out !== 1 && this.bottoming_out !== 3) {
           this.bottoming_out = 1;
           this.setPage()

src/renderer/pages/version/versionInfo.json

@@ -1 +1 @@
-{"buildTime":"2024-06-20","version":"1.2.9"}
+{"buildTime":"2025-04-17","version":"1.3.0"}