From 2cefe72878f31e7597c1d61de1e6b1ae30a64395 Mon Sep 17 00:00:00 2001
From: gaofy <1014893517@qq.com>
Date: Wed, 27 Dec 2023 14:06:02 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E5=8F=8D=E9=A6=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/global.scss                     |  8 ++++++--
 src/components/import-dialog.vue               |  2 +-
 src/components/user-info.vue                   | 16 ++++++++++------
 src/views/home/index.vue                       |  2 +-
 src/views/home/number-pie-chart.vue            |  7 ++++---
 src/views/home/time-bar-chart.vue              |  2 +-
 src/views/login/login.vue                      |  6 +++---
 src/views/logs-manage/message-manage.vue       |  2 +-
 .../patients-manage/form/patients-form.vue     |  5 ++++-
 src/views/patients-manage/surgery-info.vue     |  6 +++---
 src/views/permissions-manage/doctor-manage.vue | 12 +++++++-----
 src/views/permissions-manage/menu-manage.vue   |  2 +-
 src/views/permissions-manage/role-manage.vue   | 10 ++++++----
 src/views/system-manage/form/hospital-form.vue | 18 ++++++++++++++++--
 src/views/system-manage/hospitals.vue          | 11 +++++++----
 src/views/system-manage/system-home.vue        |  2 +-
 src/views/system-manage/user-list.vue          |  2 +-
 17 files changed, 73 insertions(+), 40 deletions(-)

diff --git a/src/assets/css/global.scss b/src/assets/css/global.scss
index 47a016f..ca06ab2 100644
--- a/src/assets/css/global.scss
+++ b/src/assets/css/global.scss
@@ -210,7 +210,8 @@ body {
         height: calc(100% - 170px);
         margin-top: 10px;
         .el-table {
-            color: $main-color;
+            color: $text1-color;
+            font-size: 14px;
             .el-table__header {
                 thead {
                     color: $main-color;
@@ -226,7 +227,10 @@ body {
             .el-button.is-round {
                 height: 28px;
                 padding: 5px 10px;
-                font-size: 15px;
+                font-size: 14px;
+            }
+            .el-button.is-link {
+                font-size: 14px;
             }
         }
     }
diff --git a/src/components/import-dialog.vue b/src/components/import-dialog.vue
index 2ac415d..e10fca9 100644
--- a/src/components/import-dialog.vue
+++ b/src/components/import-dialog.vue
@@ -1,7 +1,7 @@
 <template>
     <el-dialog v-model="dialogVisible" :title="title" width="50%">
         <el-upload v-model:file-list="fileList" drag accept=".xls, .xlsx" :auto-upload="false" :limit="1">
-            <div class="el-upload__text" style="padding: 80px 10px;font-size: 20px;">
+            <div class="el-upload__text" style="padding: 40px 10px;font-size: 20px;">
                 将文件拖到此处，或 <em>点击上传</em>
             </div>
             <template #tip>
diff --git a/src/components/user-info.vue b/src/components/user-info.vue
index f25083d..d061e05 100644
--- a/src/components/user-info.vue
+++ b/src/components/user-info.vue
@@ -32,13 +32,13 @@
             </template>
             <template v-else>
                 <el-form-item label="密码" prop="password" label-width="100">
-                    <el-input v-model="formData.password" type="password" placeholder="请输入密码"></el-input>
+                    <el-input v-model="formData.password" type="password" show-password placeholder="请输入密码"></el-input>
                 </el-form-item>
                 <el-form-item label="新密码" prop="newPassword" label-width="100">
-                    <el-input v-model="formData.newPassword" type="password" placeholder="请输入新密码"></el-input>
+                    <el-input v-model="formData.newPassword" type="password" show-password placeholder="请输入新密码"></el-input>
                 </el-form-item>
                 <el-form-item label="确认密码" prop="confirmPassword" label-width="100">
-                    <el-input v-model="formData.confirmPassword" type="password" placeholder="请输入新密码"></el-input>
+                    <el-input v-model="formData.confirmPassword" type="password" show-password placeholder="请输入新密码"></el-input>
                 </el-form-item>
             </template>
         </el-form>
@@ -52,9 +52,12 @@
 import { onMounted, reactive, ref, toRefs, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import type { UploadProps } from 'element-plus'
+import { useLoginStore } from '@/stores/user-info-store'
 
 const emit = defineEmits(['close'])
 
+const userInfo = useLoginStore().getlogin()
+
 const formRef = ref()
 
 const validatePassword = (rule: any, value: any, callback: any) => {
@@ -90,9 +93,9 @@ const rules = reactive({
 const tabActive = ref(0)
 const formData = ref({
     avatar: '',
-    account: '',
+    account: userInfo.account,
     phone: '',
-    name: '',
+    name: userInfo.name,
     mailbox: '',
     password: '',
     newPassword: '',
@@ -103,7 +106,6 @@ const close = () => {
     emit('close')
 }
 const handleAvatarSuccess: UploadProps['onSuccess'] = (
-    response,
     uploadFile
 ) => {
     formData.value.avatar = URL.createObjectURL(uploadFile.raw!)
@@ -122,6 +124,8 @@ const submitForm = async () => {
     await formRef.value.validate((valid: any, fields: any) => {
         if (valid) {
             console.log('submit!')
+            // 更改用户名
+            useLoginStore().setlogin('name', formData.value.name)
             ElMessage.success('更新成功')
             close()
         } else {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index f39069a..1fac6f6 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -46,7 +46,7 @@
                 <div class="system-logs move_2">
                     <div class="title">
                         <span>系统日志</span>
-                        <span class="f14" style="cursor: pointer;" @click="router.push('./logs-manage')">更多</span>
+                        <span class="f14" style="cursor: pointer;" @click="router.push('./logs-manage/logs-manage')">更多</span>
                     </div>
                     <div class="content move_2">
                         <SystemLogs />
diff --git a/src/views/home/number-pie-chart.vue b/src/views/home/number-pie-chart.vue
index a3cda3b..8f14c63 100644
--- a/src/views/home/number-pie-chart.vue
+++ b/src/views/home/number-pie-chart.vue
@@ -54,8 +54,8 @@ function initChart(chartData: any) {
         },
         series: [{
             type: 'pie',
-            center: ['68%', '50%'],
-            radius: ['0%', '70%'],
+            center: ['50%', '50%'],
+            radius: ['0%', '60%'],
             clockwise: true,
             label: {
                 show: true,
@@ -147,8 +147,9 @@ const getData = (date: any) => {
     }
 
     .chart-dom {
-        width: 100%;
+        width: 70%;
         height: 100%;
+        margin-left: 30%;
     }
 
     .total-box {
diff --git a/src/views/home/time-bar-chart.vue b/src/views/home/time-bar-chart.vue
index bdf5e0c..ae7fd58 100644
--- a/src/views/home/time-bar-chart.vue
+++ b/src/views/home/time-bar-chart.vue
@@ -53,7 +53,7 @@ function initChart(chartData: any) {
             }
         },
         legend: {
-            right: 50,
+            right: 0,
             data: chartData.dataName
         },
         grid: {
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 45df1a6..34ce4e4 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -26,7 +26,7 @@
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="password">
-                            <el-input v-model="loginParams.password" type="password" placeholder="请输入密码">
+                            <el-input v-model="loginParams.password" type="password" show-password placeholder="请输入密码">
                                 <template #prepend>
                                     <el-icon>
                                         <Lock />
@@ -79,7 +79,7 @@
                         <el-input v-model="registerParams.account" placeholder="请输入用户名"></el-input>
                     </el-form-item>
                     <el-form-item label="密码" prop="password">
-                        <el-input v-model="registerParams.password" type="password" placeholder="请输入密码"></el-input>
+                        <el-input v-model="registerParams.password" type="password" show-password placeholder="请输入密码"></el-input>
                     </el-form-item>
                     <el-form-item label="姓名" prop="name">
                         <el-input v-model="registerParams.name" placeholder="请输入姓名"></el-input>
@@ -276,7 +276,7 @@ const toHome = () => {
     }
     useLoginStore().setlogin('isLogin', true)
     useLoginStore().setlogin('account', loginParams.value.account)
-    useLoginStore().setlogin('name', loginParams.value.name)
+    useLoginStore().setlogin('name', loginParams.value.name || '暂未设置姓名')
     useLoginStore().setlogin('hospital', currentHospital.value)
     useLoginStore().setlogin('permissions', getPermissions())
     router.push('/home')
diff --git a/src/views/logs-manage/message-manage.vue b/src/views/logs-manage/message-manage.vue
index 8562cab..de4a6ae 100644
--- a/src/views/logs-manage/message-manage.vue
+++ b/src/views/logs-manage/message-manage.vue
@@ -35,7 +35,7 @@
                     <template #default="scope">
                         <span @click.stop>
                             <el-button link icon="EditPen" @click="editData(scope.row)">修改</el-button>
-                            <el-button type="danger" link icon="Delete" @click="removeData(scope.row)">删除</el-button>
+                            <el-button link icon="Delete" @click="removeData(scope.row)">删除</el-button>
                         </span>
                     </template>
                 </el-table-column>
diff --git a/src/views/patients-manage/form/patients-form.vue b/src/views/patients-manage/form/patients-form.vue
index 83a73c1..8d9dc86 100644
--- a/src/views/patients-manage/form/patients-form.vue
+++ b/src/views/patients-manage/form/patients-form.vue
@@ -33,7 +33,7 @@
         <el-row :gutter="gutter">
             <el-col :span="12">
                 <el-form-item label="身高" prop="bodyHeight">
-                    <el-input v-model="formData.bodyHeight" placeholder="请输入电话"></el-input>
+                    <el-input v-model="formData.bodyHeight" placeholder="请输入身高"></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -181,4 +181,7 @@ const saveData = async () => {
         }
     }
 }
+.el-row>.el-col.el-col-12:first-of-type {
+    padding: 0 30px 0 30px !important;
+}
 </style>
diff --git a/src/views/patients-manage/surgery-info.vue b/src/views/patients-manage/surgery-info.vue
index 9b56ae5..19d4483 100644
--- a/src/views/patients-manage/surgery-info.vue
+++ b/src/views/patients-manage/surgery-info.vue
@@ -11,7 +11,7 @@
         <div class="search-box">
             <div class="search-cell">
                 <span class="label">姓名</span>
-                <el-select v-model="queryParams.name" popper-class="custom-patients-option" filterable placeholder="请输入选择姓名"
+                <el-select v-model="queryParams.name" popper-class="custom-patients-option" filterable placeholder="请选择(可搜素)"
                     remote :remote-method="remoteSearchName" @change="selectNameChange">
                     <el-option v-for="(item, index) in patientsOption.slice(0, 999)" :key="'name-' + index"
                         :label="item.name" :value="item.code" />
@@ -19,7 +19,7 @@
             </div>
             <div class="search-cell">
                 <span class="label">住院号</span>
-                <el-input v-model="queryParams.code"></el-input>
+                <el-input v-model="queryParams.code" placeholder="请输入"></el-input>
             </div>
             <div class="search-cell">
                 <span class="label">性别</span>
@@ -30,7 +30,7 @@
             </div>
             <div class="search-cell">
                 <span class="label">手术名称</span>
-                <el-input v-model="queryParams.surgeryName"></el-input>
+                <el-input v-model="queryParams.surgeryName" placeholder="请输入"></el-input>
             </div>
             <div class="search-cell">
                 <span class="label">麻醉方式</span>
diff --git a/src/views/permissions-manage/doctor-manage.vue b/src/views/permissions-manage/doctor-manage.vue
index 0155def..96920c0 100644
--- a/src/views/permissions-manage/doctor-manage.vue
+++ b/src/views/permissions-manage/doctor-manage.vue
@@ -8,10 +8,12 @@
             <el-button type="primary" icon="Search" @click="queryData(queryParams)">查询</el-button>
             <el-button icon="Refresh" @click="queryParams = {}">重置</el-button>
         </div>
-        <div class="button-part">
-            <el-button type="primary" icon="FirstAidKit" @click="addData">新增</el-button>
-            <el-button icon="FirstAidKit" @click="importData">导入</el-button>
-            <el-button icon="Delete" @click="removeData()">删除</el-button>
+        <div class="button-part" style="justify-content: space-between;">
+            <div>
+                <el-button type="primary" icon="FirstAidKit" @click="addData">新增</el-button>
+                <el-button icon="FirstAidKit" @click="importData">导入</el-button>
+                <el-button icon="Delete" @click="removeData()">删除</el-button>
+            </div>
             <el-button icon="Download" @click="exportData('医生数据', tableData)">导出</el-button>
         </div>
         <div class="table-part">
@@ -45,7 +47,7 @@
             <CommonPagination :total="100" @paginationChange="paginationChange" />
         </div>
     </div>
-    <el-dialog v-model="isFormDialog" :title="formDialogTitle" width="40%"><DoctorForm ref="doctorFormRef" :type="formDialogTitle === '添加' ? 'add' : 'edit'" @close="isFormDialog = false" /></el-dialog>
+    <el-dialog v-model="isFormDialog" :title="formDialogTitle" width="750px"><DoctorForm ref="doctorFormRef" :type="formDialogTitle === '添加' ? 'add' : 'edit'" @close="isFormDialog = false" /></el-dialog>
     <ImportDialog ref="importDialogRef" title="用户导入" templateUrl="#" importUrl="#" />
 </template>
 
diff --git a/src/views/permissions-manage/menu-manage.vue b/src/views/permissions-manage/menu-manage.vue
index aab57c1..dcf641f 100644
--- a/src/views/permissions-manage/menu-manage.vue
+++ b/src/views/permissions-manage/menu-manage.vue
@@ -13,7 +13,7 @@
                 <el-button type="primary" icon="FirstAidKit" @click="addData">新增</el-button>
                 <el-button @click="expandTable">展开/折叠</el-button>
             </div>
-            <el-button icon="Download" @click="exportData('角色数据', tableData)">导出</el-button>
+            <!-- <el-button icon="Download" @click="exportData('角色数据', tableData)">导出</el-button> -->
         </div>
         <div class="table-part">
             <el-table ref="tableRef" :data="tableData" row-key="id" height="100%" border show-overflow-tooltip
diff --git a/src/views/permissions-manage/role-manage.vue b/src/views/permissions-manage/role-manage.vue
index f934267..aaf5383 100644
--- a/src/views/permissions-manage/role-manage.vue
+++ b/src/views/permissions-manage/role-manage.vue
@@ -8,10 +8,12 @@
             <el-button type="primary" icon="Search" @click="queryData(queryParams)">查询</el-button>
             <el-button icon="Refresh" @click="queryParams = {}">重置</el-button>
         </div>
-        <div class="button-part">
-            <el-button type="primary" icon="FirstAidKit" @click="addData">新增</el-button>
-            <el-button icon="FirstAidKit" @click="importData">导入</el-button>
-            <el-button icon="Delete" @click="removeData()">删除</el-button>
+        <div class="button-part" style="justify-content: space-between;">
+            <div>
+                <el-button type="primary" icon="FirstAidKit" @click="addData">新增</el-button>
+                <el-button icon="FirstAidKit" @click="importData">导入</el-button>
+                <el-button icon="Delete" @click="removeData()">删除</el-button>
+            </div>
             <el-button icon="Download" @click="exportData('角色数据', tableData)">导出</el-button>
         </div>
         <div class="table-part">
diff --git a/src/views/system-manage/form/hospital-form.vue b/src/views/system-manage/form/hospital-form.vue
index c166280..bd3b6f7 100644
--- a/src/views/system-manage/form/hospital-form.vue
+++ b/src/views/system-manage/form/hospital-form.vue
@@ -47,10 +47,22 @@
                     <el-select v-model="formData.admin.name" filterable placeholder="请输入选择姓名"
                         remote :remote-method="remoteSearchName" @change="selectNameChange">
                         <el-option v-for="(item, index) in userOption" :key="'name-' + index"
-                            :label="item.name" :value="item.code" />
+                            :label="item.code" :value="item.code" />
                     </el-select>
                 </el-form-item>
             </el-col>
+            <el-col :span="12">
+                <el-form-item label="电话" prop="admin.phone">
+                    <el-input v-model="formData.admin.phone" disabled></el-input>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="12">
+                <el-form-item label="姓名" prop="admin.name">
+                    <el-input v-model="formData.admin.name" disabled></el-input>
+                </el-form-item>
+            </el-col>
             <el-col :span="12">
             
             </el-col>
@@ -96,7 +108,6 @@ const formData = ref({
 } as any)
 const userOption = ref([] as any)
 
-
 onMounted(() => {
     resetData()
 })
@@ -129,6 +140,9 @@ const remoteSearchName = (e: any) => {
     if (e) {
         userOption.value = users.filter((o: any) => o.name.indexOf(e) !== -1)
     }
+}
+const selectNameChange = (e: any) => {
+    
 }
 const saveData = async () => {
     await formRef.value.validate((valid: any, fields: any) => {
diff --git a/src/views/system-manage/hospitals.vue b/src/views/system-manage/hospitals.vue
index b97f933..4b6368a 100644
--- a/src/views/system-manage/hospitals.vue
+++ b/src/views/system-manage/hospitals.vue
@@ -8,9 +8,11 @@
             <el-button type="primary" icon="Search" @click="queryData(queryParams)">查询</el-button>
             <el-button icon="Refresh" @click="queryParams = {}">重置</el-button>
         </div>
-        <div class="button-part">
-            <el-button type="primary" icon="FirstAidKit" @click="addData">新增</el-button>
-            <el-button icon="Delete" @click="removeData()">删除</el-button>
+        <div class="button-part" style="justify-content: space-between;">
+            <div>
+                <el-button type="primary" icon="FirstAidKit" @click="addData">新增</el-button>
+                <el-button icon="Delete" @click="removeData()">删除</el-button>
+            </div>
             <el-button icon="Download" @click="exportData('医生数据', tableData)">导出</el-button>
         </div>
         <div class="table-part">
@@ -130,4 +132,5 @@ const paginationChange = (page: number, size: number) => {
 }
 </script>
 
-<style lang='scss' scoped></style>
+<style lang='scss' scoped>
+</style>
diff --git a/src/views/system-manage/system-home.vue b/src/views/system-manage/system-home.vue
index 13b347e..fda3ccc 100644
--- a/src/views/system-manage/system-home.vue
+++ b/src/views/system-manage/system-home.vue
@@ -20,7 +20,7 @@
             <div class="system-log-box block-border swing_skew_1">
                 <div class="title-box">
                     <span class="title"><el-icon><List /></el-icon>系统日志</span>
-                    <span class="more">更多</span>
+                    <span class="more" @click="router.push('/logs-manage/logs-manage')">更多</span>
                 </div>
                 <div class="system-log">
                     <SystemLogs />
diff --git a/src/views/system-manage/user-list.vue b/src/views/system-manage/user-list.vue
index 41ad356..1f69e73 100644
--- a/src/views/system-manage/user-list.vue
+++ b/src/views/system-manage/user-list.vue
@@ -40,7 +40,7 @@
             <CommonPagination :total="100" @paginationChange="paginationChange" />
         </div>
     </div>
-    <el-dialog v-model="isFormDialog" :title="formDialogTitle" width="40%"><UserForm ref="userFormRef" :type="formDialogTitle === '添加' ? 'add' : 'edit'" @close="isFormDialog = false" /></el-dialog>
+    <el-dialog v-model="isFormDialog" :title="formDialogTitle" width="750px"><UserForm ref="userFormRef" :type="formDialogTitle === '添加' ? 'add' : 'edit'" @close="isFormDialog = false" /></el-dialog>
 </template>
 
 <script lang='ts' setup>