Przeglądaj źródła

修改优化页面

xklr/wly 4 miesięcy temu
rodzic
commit
aeec63132e

+ 2 - 0
log/2024-1-22.log

@@ -0,0 +1,2 @@
+[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

+ 2 - 0
log/2024-1-25.log

@@ -0,0 +1,2 @@
+[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

+ 56 - 0
log/2024-3-13.log

@@ -0,0 +1,56 @@
+[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]

+ 50 - 0
log/2024-5-23.log

@@ -0,0 +1,50 @@
+[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]

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "doctor-xklr",
   "productName": "星空路人-医生端",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "private": false,
   "author": "wly",
   "scripts": {

+ 6 - 10
src/main/main.js

@@ -33,25 +33,21 @@ async function createWindow() {
   mainWindow = new BrowserWindow({
     width: 132, //悬浮窗口的宽度 比实际DIV的宽度要多2px 因为有1px的边框
     height: 80, //悬浮窗口的高度 比实际DIV的高度要多2px 因为有1px的边框
-    frame: false,
-    resizable: isdev,
-    show: true,
     icon: iconSrc,
+    show: true,
     skipTaskbar: true, // 任务栏中不显示窗口
     autoHideMenuBar: false,// 任务栏中不显示窗口
     transparent: true, //设置透明
+    resizable: isdev,
+    frame: false,
     hasShadow: process.platform !== "darwin", //不显示阴影
     alwaysOnTop: true, //窗口是否总是显示在其他窗口之前\
-    // backgroundColor: 'transparent',
-    // ...(process.platform === 'linux' ? { icon: path.join(app.getAppPath(), '/src/renderer/assets/logo.png') } : {}),
     webPreferences: {
-      // partition: String(+new Date()),
-      nodeIntegration: true,
+      devTools: false,
+      sandbox: false,
       enableRemoteModule: true,
-      devTools: isdev,
+      nodeIntegration: true,
       contextIsolation: false,
-      //   preload: path.join(__dirname, '../preload/index.js'),
-      sandbox: false
     }
   })
   global.mainWindow = mainWindow

+ 16 - 18
src/main/windows/indexwin.js

@@ -15,31 +15,29 @@ const createIndexwin = function (BrowserWindow) {
     let obj = {
         title: '星空路人',
         icon: iconSrc,
-        height: 423,
-        width: 310,
-        minHeight:423,
-        minWidth:310,
-        show: false,
-        titleBarStyle: "hiddenInset",
-        fullscreenable: false,
-        minimizable: false,
-        maximizable: false,
-        transparent: true,
-        skipTaskbar: true, // 任务栏中不显示窗口
+        show: true,
+        width: 350,
+        minWidth:350,
+        height: 500,
+        minHeight:500,
+        // titleBarStyle: "hiddenInset",
+        // fullscreenable: false,
+        // minimizable: false,
+        // maximizable: false,
+        // enableLargerThanScreen: false,
+        skipTaskbar: false, // 任务栏中不显示窗口
         autoHideMenuBar: false,
-        enableLargerThanScreen: false,
+        transparent: true,
         resizable: true,
         frame: false,
-        // thickFrame:true,
-        // closable: false,
-        hasShadow: process.platform !== "darwin",
+        hasShadow: process.platform !== "darwin", //不显示阴影
         alwaysOnTop: true,
         webPreferences: {
             devTools: isdev,
-            contextIsolation: false,
             sandbox: false,
-            nodeIntegration: true,
             enableRemoteModule: true,
+            nodeIntegration: true,
+            contextIsolation: false,
         }
     };
     Menu.setApplicationMenu(null)
@@ -55,7 +53,7 @@ const createIndexwin = function (BrowserWindow) {
     ipcMain.on('move-application1', (event, option) => { //移动
         ifclick=false
         indexwin.setSize(sizeobj.width, sizeobj.height);
-        indexwin && indexwin.setPosition(option.posX, option.posY-10)
+        indexwin && indexwin.setPosition(option.posX-5, option.posY-5)
     })
 
     ipcMain.on('isclick', (event, option) => { 

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

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

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

@@ -26,7 +26,7 @@ export default function updatewin() {
                 icon: iconSrc,
                 height: 80,
                 width: 250,
-                show: true,
+                show: false,
                 titleBarStyle: "hiddenInset",
                 frame: true,
                 fullscreenable: false,
@@ -41,7 +41,7 @@ export default function updatewin() {
                 hasShadow: process.platform !== "darwin",
                 alwaysOnTop: true,
                 webPreferences: {
-                    devTools: isdev,
+                    devTools: false,
                     contextIsolation: false,
                     sandbox: false,
                     nodeIntegration: true,

+ 4 - 25
src/renderer/App.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="app" id="app">
+  <div ref="app" id="app" >
     <keep-alive>
       <router-view />
     </keep-alive>
@@ -8,25 +8,10 @@
 <script>
 import { mapActions } from 'vuex'
 import { ipcRenderer } from "electron";
-// window.addEventListener('resize', function(e){
-//   console.log(e.target.screenX,e.target.screenY)
-//   ipcRenderer.send('move-application1', { posX: e.target.screenX ,posY:e.target.screenY});
-// }, false);
+
 export default {
   name: 'App',
   data() {
-    // let showxblock;
-    // const $store = useStore()
-    // let username = computed(() => {
-    //   return $store.getters['user/username'];
-    // })
-    // watch(
-    //   () => username,
-    //   (newValue, oldValue) => {
-    //     console.log("newValue", newValue);
-    //     console.log("oldValue", oldValue);
-    //   },
-    // );
     return {
       username:{}
     }
@@ -45,10 +30,6 @@ export default {
       logout: 'user/logout',
     }),
     handleRoute() {
-      // console.log(window.location.hash)
-      // if (window.location.hash=='#/' ||this.$route.path == '/404') {
-      //   this.$router.push('/home')
-      // }
     },
     fn() {
       let t = this
@@ -92,12 +73,10 @@ body {
 }
 
 .pagecontent {
-  height: calc(100vh - 6px);
-  width: calc(100vw - 6px);;
+  height: calc(100vh - 1rem);
   background: #fff;
   border-radius: 4px;
-  margin: 3px 3px 3px 3px;
-  box-shadow: 0px 0px 3px 1px rgba(0, 0, 0, .2);
+  box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.342);
 }
 
 .el-message {

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="" style="">
+  <div class="p-2" style="border: 0;">
     <router-view />
   </div>
 </template>
@@ -54,9 +54,5 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.bg {
-  background: #fff;
-  padding: 20px;
-  border-radius: 50%;
-}
+
 </style>

+ 19 - 21
src/renderer/pages/login/index.vue

@@ -1,16 +1,18 @@
 <template>
-  <div class="pagecontent overflow" v-loading="loading"
+  <div class="pagecontent overflow w-100" v-loading="loading"
     style="background-image: linear-gradient(to bottom right, rgb(240, 248, 253), rgb(225, 241, 252));">
     <div class="content">
       <div class="p-3 text-center ">
-        <div class="mt-4">
-          <img :src="logo" alt="" width="50" height="50">
+        <div class="mt-5 centerd">
+          <img :src="logo" alt="" width="70" height="70">
         </div>
-        <div class="text-center font-bold text-dark mt-4">
-          医生登录
-        </div>
-        <div class="text-center font-bold text-dark mt-3 text-center">
-          <el-form size="mini" ref="form" :model="formInline" class="px-3 " :rules="rules">
+        <div class="text-center font-bold text-dark mt-4 text-center bg-white py-4 w-90 mx-auto" style="border-radius:10px">
+          <div class="text-center">
+            <div class="font-bold text-dark fs-18 mx-auto">
+              医生登录
+            </div>
+          </div>
+          <el-form size="small" ref="form" :model="formInline" class="w-70 mt-4 mx-auto" :rules="rules">
             <el-form-item prop="username">
               <el-input prefix-icon="el-icon-user" v-model="formInline.username" placeholder="请输入账号" />
             </el-form-item>
@@ -101,7 +103,7 @@ export default {
       let t = this
       t.loading = true
       t.$refs.form.validate(async (valid) => {
-        if (valid){
+        if (valid) {
           try {
             await t.login(t.formInline).then(() => {
               localStorage.setItem('username', t.formInline.username)
@@ -114,9 +116,9 @@ export default {
                   t.$api.getHospitalInfo(),
                   t.findVisitSum()
                 ]).then((resall) => {
-                 let timer = setInterval(() => {
-                    t.findVisitSum().then((res)=>{
-                      if(res.code==401){
+                  let timer = setInterval(() => {
+                    t.findVisitSum().then((res) => {
+                      if (res.code == 401) {
                         clearInterval(timer)
                         t.logout().then(() => {
                           t.$router.push('/home/login')
@@ -126,7 +128,7 @@ export default {
                         })
                       }
                     })
-                  },  process.env.NODE_ENV == "development"?1000 * 10:1000 * 60)
+                  }, process.env.NODE_ENV == "development" ? 1000 * 10 : 1000 * 60)
                   t.$router.push('patientlist')
                   ipcRenderer.send('setTray', { type: 'user', data: resall[0] });
                 })
@@ -134,24 +136,20 @@ export default {
                 t.loading = false
               }
             }).catch((e) => {
-              console.log(127,e)
+              console.log(127, e)
             })
           } finally {
             this.loading = false
           }
-        }else{
+        } else {
           this.loading = false
         }
-          
+
       })
     },
   },
 }
 </script>
 <style lang="less" scoped>
-.content {
-  margin: 5px;
-  height: calc(100vh -8px);
-  border-radius: 5px;
-}
+
 </style>

+ 5 - 5
src/renderer/pages/patientdetail/index.vue

@@ -2,17 +2,17 @@
   <div class="pagecontent overflow" v-loading="loading"
     style="background-image: linear-gradient(to bottom right, rgb(240, 248, 253), rgb(225, 241, 252));">
     <div>
-      <div class="centerY">
-        <div class="d-inline-block cursor-pointer" style="padding: 8px 10px;" @click="$router.back()">
+      <div class="centerY px-3 pt-3">
+        <div class="d-inline-block cursor-pointer" style="padding: 8px 10px;margin:  -8px -10px; z-index: 999;" @click="$router.back()">
             <i style="font-size: 16px;padding-top: 2px;" class="el-icon-arrow-left font-bold text-dark"></i>
         </div>
-        <div class="text-center w-80 ml-n1 fs-14" style="padding: 8px 0px;margin-top: -4px;">
-          患者详情
+        <div class="text-center w-90 fs-14" style="">
+         {{ dataAll.patient&&dataAll.patient.username||'' }} 患者详情
         </div>
       </div>
     </div>
     <el-scrollbar class="listenscroll" style="height: calc(100vh );overflow-y: auto; overflow-x: hidden;">
-      <div class="content mx-2">
+      <div class="content mx-3">
         <div v-if="1">
           <div>
             <modelview :prop-data="dataAll" :hospitalinfo="hospitalinfo" :homedata="home_data" />

+ 3 - 3
src/renderer/pages/patientdetail/model/check.vue

@@ -12,7 +12,7 @@
                   </div>
                   <div class="ml-1 text-white text-center fs-10"
                     style="background-color: #f56c6c;min-width: 11px;padding:0 2px;height: 15px;border-radius: 15px;line-height: 1.4;">
-                    {{ tip.arr.length }}
+                    {{ tip.arr&&tip.arr.length }}
                   </div>
                 </el-tooltip>
               </div>
@@ -78,7 +78,7 @@
           <el-collapse-item>
             <template slot="title">
               <div class="fs-12 text-dark font-bold centerY">
-                季度监测<el-tooltip placement="top" v-if="tip.arr1.length">
+                季度监测<el-tooltip placement="top" v-if="tip.arr1&&tip.arr1.length">
                   <div slot="content">
                     <span v-for="item in tip.arr1">{{ item }} ; </span>
                   </div>
@@ -294,7 +294,7 @@ export default {
       quarterDefobj: {},
       yearDefobj: {},
       idCardInfo: {},
-      tip: {}
+      tip: {arr:[],arr1:[],arr2:[]}
     }
   },
   mounted() {

+ 14 - 15
src/renderer/pages/patientdetail/model/view.vue

@@ -3,10 +3,10 @@
     <div class="mx-1 mb-5 position-relative" v-if="propData.patient">
       <div class="centerY">
         <div class="bule_line"></div>
-        <span class="font-bold text-dark ml-2 fs-14 line-height1">基本信息</span>
+        <span class="font-bold text-dark ml-2 fs-14 py-2">基本信息</span>
       </div>
       <!-- 基本信息 -->
-      <div class="card mb-2 fs-12 mt-1 p-2" style="color: #818181;">
+      <div class="card fs-12 p-3" style="color: #818181;position: relative;">
         <div class="w-50 mb-1 d-inline-block">
           姓名:
           <span class="font-bold text-dark fs-14">{{ propData.patient.username || '' }}</span>
@@ -29,28 +29,28 @@
               31536000000).toFixed(0) : '' }}年
           </span>
         </div>
-        <div class="w-50 mb-1 d-inline-block" v-if="1">
+        <div class="w-50 d-inline-block" v-if="1">
           高血压病龄:
           <span class="font-bold text-dark fs-14">
             {{ propData.patient.gxyIllTime ? ((new Date().getTime() - new Date(propData.patient.gxyIllTime).getTime()) /
               31536000000).toFixed(0) : '' }}年
           </span>
         </div>
-        <div class="position-absolute d-flex " style="right: 20%;top:0 ;transform: rotate(31deg);z-index:1">
+        <div class="position-absolute d-flex " style="right: 15%;top:-30%;transform: rotate(31deg);z-index:1">
           <div v-show="propData.patient.healthIndex !== 0" class="centerd position-absolute "
-            :style="{ width: '50px', height: '50px', borderRadius: '50%', opacity: 1, ...selectColor(propData.patient.healthIndex) }">
+            :style="{ width: '70px', height: '70px', borderRadius: '50%', opacity: 1, ...selectColor(propData.patient.healthIndex) }">
             <div class="text-center">
-              <div class="fs-10">健康指数</div>
-              <div class="font-bold fs-14">{{ propData.patient.healthIndex ? 1000 - propData.patient.healthIndex || 0 :
+              <div class="fs-12">健康指数</div>
+              <div class="font-bold fs-16">{{ propData.patient.healthIndex ? 1000 - propData.patient.healthIndex || 0 :
                 '1000' }}</div>
             </div>
           </div>
         </div>
       </div>
       <!-- 管理等级 -->
-      <div class="centerY">
+      <div class="centerY mt-2">
         <div class="w-50 pr-2">
-          <div class="centerY mb-1" v-if="propData.gljb.gxyVisit && propData.gljb.gxyVisit.id">
+          <div class="centerY py-2" v-if="propData.gljb.gxyVisit && propData.gljb.gxyVisit.id">
             <div class="bule_line"></div>
             <span class="font-bold text-dark ml-2 fs-14 line-height1">高血压管理等级</span>
           </div>
@@ -60,7 +60,7 @@
               <div class="text-center fs-12 font-bold "
                 style="line-height:1;padding:8px 0;background-color:#1890ff;color:#fff">{{
                   propData.gljb.gxyVisit.gljb }}</div>
-              <div class="bg-white overflow  fs-12 p-1 border-box " style="border-top: 1px solid #1890ff;">
+              <div class="bg-white overflow fs-12 p-2 border-box " style="border-top: 1px solid #1890ff;">
                 <div class="w-100 centerY">
                   <div class="pr-1">下次预约</div>
                   <div class=" text-dark">{{ propData.gljb.gxyVisit.xcyy }}</div>
@@ -74,7 +74,7 @@
           </div>
         </div>
         <div class="w-50">
-          <div class="centerY mb-1" v-if="propData.gljb.tnbVisit && propData.gljb.tnbVisit.id">
+          <div class="centerY py-2" v-if="propData.gljb.tnbVisit && propData.gljb.tnbVisit.id">
             <div class="bule_line"></div>
             <span class="font-bold text-dark ml-2 fs-14 line-height1">糖尿病管理等级</span>
           </div>
@@ -84,9 +84,8 @@
               <div class="fs-12" style="line-height:1">
                 <div class="text-center fs-12 font-bolds" style="padding:8px 0;background-color:#1890ff;color:#fff">{{
                   propData.gljb.tnbVisit.gljb }}</div>
-
               </div>
-              <div class="bg-white overflow  p-1 border-box " style="border-top: 1px solid #1890ff;">
+              <div class="bg-white overflow p-2 border-box " style="border-top: 1px solid #1890ff;">
                 <div class="w-100 centerY">
                   <div class="pr-1">下次预约</div>
                   <div class="text-dark">{{ propData.gljb.tnbVisit.xcyy }}</div>
@@ -100,7 +99,7 @@
           </div>
         </div>
       </div>
-      <el-collapse class="mt-2" @change="collapsechange">
+      <el-collapse class="mt-3" @change="collapsechange">
         <!-- 体征 -->
         <el-collapse-item title="" name="1" v-if="propData.physical && propData.physical.length > 0">
           <template #title>
@@ -1343,7 +1342,7 @@ export default {
 
 .echarts {
   width: 100%;
-  height: 150px;
+  height: 180px;
 }
 
 .el-collapse-item__content {

+ 26 - 31
src/renderer/pages/patientlist/index.vue

@@ -1,21 +1,21 @@
 <template>
   <div class="pagecontent overflow" v-loading="loading"
-    style="background-image: linear-gradient(to bottom right, rgb(240, 248, 253), rgb(225, 241, 252)); overflow-x: hidden;">
-    <div class="d-flex m-2 fs-12">
-      <el-input size="mini" prefix-icon="el-icon-search" @input="changeinput" class="fs-12 w-100" clearable
+    style="background-image: #f5f5f5; overflow-x: hidden;">
+    <div class="d-flex m-3 fs-12">
+      <el-input size="small" prefix-icon="el-icon-search" @input="changeinput" class="fs-12 w-100" clearable
         v-model="formData.keyword" placeholder="患者姓名或身份证号后四位" />
-      <el-button size="mini" class="d-inline-block text-center fs-12 ml-1" native-type="submit" type="primary"
+      <el-button size="small" class="d-inline-block text-center fs-12 ml-2" native-type="submit" type="primary"
         @click="initList()">
         查询
       </el-button>
     </div>
-    <div class="listenscroll" style="height: calc(100vh - 50px);overflow-y: auto; width: 100%;overflow-x: hidden;">
-      <div class=" mx-2">
-        <el-card class=" w-100 mb-1" v-if="dataArray.length" :body-style="{ padding: '2px 5px', borderRadius: '20px' }">
-          <div class="cursor-pointer" v-for="item, index in dataArray" :key="index" @click="navto(item)">
-            <div :class="['centerY py-1 box-card', index !== 0 ? 'border-top ' : '']">
-              <div class="fs-10">{{ index + 1 }}</div>
-              <div class="ml-2">
+    <div class="listenscroll" style="height: calc(100vh - 80px);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)">
+            <div :class="['centerY box-card',]">
+              <div class="fs-12 w-5">{{ index + 1 }}</div>
+              <div class="ml-2 w-10">
                 <div v-if="item.chronicDiseaseType === 1" class="centerd patient-type" style="border: 2px solid #f6b7eb">
                   <span>高</span>
                 </div>
@@ -29,18 +29,18 @@
                   <span>无</span>
                 </div>
               </div>
-              <div class="w-100 centerY">
-                <div class="w-25 font-bold text-center" style="font-size:12px;">
+             
+                <div class="w-25 font-bold text-center" style="font-size:14px;">
                   {{ item.username }}
                 </div>
-                <div class="w-55">
-                  <div style="line-height: 0.8;">
-                    <span style="font-size:11px;line-height: 0.8;">年龄: {{ getAge(item.birthday) }}岁</span>
-                    <span style="font-size:11px;line-height: 0.8;" class="ml-3">性别:
+                <div class="ml-2">
+                  <div style="">
+                    <span style="font-size:11px;">年龄: {{ getAge(item.birthday) }}岁</span>
+                    <span style="font-size:11px;" class="ml-3">性别:
                       {{ item.sex === 1 ? '男' : '女' }}
                     </span>
                   </div>
-                  <div style="line-height: 1;font-size:11px;margin-top: 4px;">
+                  <div style="font-size:11px;margin-top: 3px;">
                     {{ item.nextVisitTime }} (下次随访)
                   </div>
                 </div>
@@ -49,8 +49,8 @@
                     ...selectColor(item.healthIndex || 0),
                   }">
                     <div class="text-center">
-                      <div class="fs-8">健康指数</div>
-                      <div class="font-bold fs-12" style="line-height: 1;">
+                      <div class="fs-10">健康指数</div>
+                      <div class="font-bold fs-14" style="">
                         {{ 1000 - item.healthIndex || 0 }}
                       </div>
                     </div>
@@ -60,7 +60,6 @@
                   <span class="fs-12">{{ item.nextVisitTime }}(下次随访)</span>
                 </div> -->
               </div>
-            </div>
           </div>
         </el-card>
         <div v-if="!dataArray.length">
@@ -216,27 +215,23 @@ export default {
 }
 
 .listbox {
-  background-color: #fff;
-  padding: 5px;
-
+  // background: #f5f5f5;
 }
 
 .healthclass {
-  margin: -6px -5px -6px 0;
-  padding: 6px 0 6px 0;
+  margin: -0.5rem ;
+  padding: .9rem 0 .9rem 0;
   width: 50px;
   height: 30px;
 }
 
 .patient-type {
-  height: 20px;
-  width: 20px;
-  font-size: 14px;
+  height: 24px;
+  width: 24px;
+  font-size: 15px;
   border-radius: 50%;
   line-height: 1;
-  margin: -2px;
   padding: 2px;
-
   span {
     color: #85b8f6;
   }

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

@@ -24,8 +24,8 @@ export default {
   },
   created() {
     let locationpath = localStorage.getItem('locationpath') ? JSON.parse(localStorage.getItem('locationpath')) : {}
-    this.baseURL = locationpath.baseURL || '';
-    this.webURL = locationpath.webURL || '';
+    this.baseURL = locationpath.baseURL || 'http://testapi.xklr.net:8601';
+    this.webURL = locationpath.webURL || 'http://testadmin.xklr.net:8601';
     // console.log(this.$router)
   },
   methods: {