Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/components/settings/Detail.vue

@@ -1,53 +0,0 @@
-<template>
-  <CloseBtn @click="close"></CloseBtn>
-  <el-form
-      :model="form"
-  >
-    <el-descriptions
-        :column="3"
-        border
-        title="详情"
-        direction="vertical"
-        label-width="20"
-    >
-      <el-descriptions-item label="名称">
-        <div>{{ form.name }}</div>
-      </el-descriptions-item>
-      <el-descriptions-item label="编码">
-        <div>{{ form.code }}</div>
-      </el-descriptions-item>
-      <el-descriptions-item label="状态">
-        <div>{{ form.status }}</div>
-      </el-descriptions-item>
-      <el-descriptions-item label="创建时间">
-        <div>{{ form.create_time }}</div>
-      </el-descriptions-item>
-      <el-descriptions-item label="状态">
-        <div>{{ form.status }}</div>
-      </el-descriptions-item>
-      <el-descriptions-item label="创建时间">
-        <div>{{ form.create_time }}</div>
-      </el-descriptions-item>
-    </el-descriptions>
-  </el-form>
-
-</template>
-<script setup lang="ts">
-import {reactive,defineEmits} from "vue";
-import {ElDescriptionsItem} from "element-plus";
-import CloseBtn from "@/components/CloseBtn.vue";
-
-const form= reactive({
-  name: '1',
-  code: '2',
-  status: '3',
-  create_time: '4',
-})
-const emit = defineEmits(['close'])
-const close = () => {
-emit('close')
-}
-</script>
-<style scoped lang="scss">
-
-</style>

src/views/settings/log.vue

@@ -5,14 +5,17 @@
       <el-table
           :data="tableData"
           style="width: 100%"
-          :default-sort="{prop: 'id', order: 'descending'}"
-          @row-click="rowClick"
+          max-height="700px"
       >
-        <el-table-column prop="id" label="ID"></el-table-column>
-        <el-table-column prop="username" label="用户名"></el-table-column>
-        <el-table-column prop="operation" label="操作"></el-table-column>
-        <el-table-column prop="time" label="时间"></el-table-column>
-        <el-table-column prop="method" label="方法"></el-table-column>
+        <el-table-column prop="managerName" label="用户名" width="100"></el-table-column>
+        <el-table-column prop="managerUsername" label="用户名" width="100"></el-table-column>
+        <el-table-column prop="message" label="操作" width="200"></el-table-column>
+        <el-table-column prop="createDatetime" label="时间" width="200"></el-table-column>
+        <el-table-column prop="params" label="请求参数">
+          <template #default="scope">
+            <el-input v-model="scope.row.params"></el-input>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <div class="pagination">
@@ -25,32 +28,24 @@
           @current-change="handleCurrentChange"
       ></el-pagination>
     </div>
-    <Mask :is-show="isShow" :width="800" :height="500">
-      <Detail @close="isShow = false"/>
-    </Mask>
+
   </div>
 </template>
 <script setup lang="ts">
 import {onMounted, ref} from 'vue'
 import {post} from '@/utils/request.ts'
-import Mask from "@/components/Mask.vue";
-import Detail from "@/components/settings/Detail.vue";
 const tableData = ref<any>([
-  {
-    id: 1,
-    username: 'admin',
-    operation: '新增用户',
-    time: '2021-01-01 00:00:00',
-  }
 ])
 onMounted(()=>{
   init()
+  getData()
 })
 const init=()=>{
   const params = {
     currentPage: currentPage.value,
     pageSize: pageSize.value,
   }
+
   // post("",{params:params}).then((res:any)=>{
   //   tableData.value=res
   // })
@@ -60,12 +55,21 @@ const pageSize = ref(20)
 const total = ref(0)
 const handleCurrentChange = (val: any) => {
   currentPage.value = val
+  getData()
+
 }
-const isShow = ref(false)
-const rowClick=(row:any)=>{
-  isShow.value=true
-  console.log(row,'ROW')
+const getData=()=>{
+  const params = {
+    pageNum: currentPage.value,
+    pageSize: pageSize.value,
+  }
+  post("common/log/page",{query:params}).then((res:any)=>{
+    tableData.value=res.list
+    total.value=res.total_count
+    console.log(tableData.value)
+  })
 }
+
 </script>
 <style scoped lang="scss">
 .container-wrapper{

src/views/settings/member.vue

@@ -48,9 +48,9 @@
             {{ roleList.find((item: any) => item.value === scope.row.memberInfo.role)?.label || '-' }}
           </template>
         </el-table-column>
-        <el-table-column prop="sectionId" label="科室">
+        <el-table-column prop="sectionNames" label="科室">
           <template #default="scope">
-            {{ sectionList.find((item: any) => item.id === scope.row.memberInfo.sectionId)?.name || '-' }}
+            {{scope.row.memberInfo.sectionNames}}
           </template>
         </el-table-column>
         <el-table-column prop="memo" label="备注">