fix:[ui]ui还原

src/App.vue

@@ -17,14 +17,14 @@ export default {
       statusCheckTimer: null
     }
   },
-  
+
   computed: {
     // // 监听登录状态
     // isLoggedIn() {
     //   return this.$store.getters.token && this.$store.getters.token !== ''
     // }
   },
-  
+
   watch: {
     // // 监听登录状态变化
     // isLoggedIn(newVal, oldVal) {
@@ -52,34 +52,34 @@ export default {
       immediate: true // 立即执行一次，这样在页面刷新时，如果已经有token，就会启动轮询
     }
   },
-  
+
   mounted() {
     // // 页面加载时检查当前登录状态
     // if (this.isLoggedIn) {
     //   this.startStatusCheck()
     // }
   },
-  
+
   beforeDestroy() {
     this.stopStatusCheck()
   },
-  
+
   methods: {
     startStatusCheck() {
       // 先停止可能存在的定时器
       this.stopStatusCheck()
-      
+
       console.log('启动状态检查轮询')
-      
+
       // 立即执行一次检查
       this.checkStatusImmediate()
-      
+
       // 设置定时器每秒检查一次
       this.statusCheckTimer = setInterval(() => {
         this.checkStatus()
       }, 10000)
     },
-    
+
     stopStatusCheck() {
       if (this.statusCheckTimer) {
         console.log('停止状态检查轮询')
@@ -87,12 +87,12 @@ export default {
         this.statusCheckTimer = null
       }
     },
-    
+
     // 立即检查（不等待）
     async checkStatusImmediate() {
       await this.checkStatus()
     },
-    
+
     // 定时检查
     async checkStatus() {
       // 再次确认登录状态
@@ -100,14 +100,14 @@ export default {
       //   this.stopStatusCheck()
       //   return
       // }
-      
+
       try {
         console.log('开始checkStatus')
         checkStatus().then(response => {
           console.log(JSON.stringify(response))
         }).catch(err => {
           console.log(JSON.stringify(err))
-          if(err==='无效的会话，或者会话已过期，请重新登录。'){
+          if (err === '无效的会话，或者会话已过期，请重新登录。') {
             this.stopStatusCheck()
           }
         })
@@ -125,18 +125,106 @@ export default {
 
 /*搜索区域样式 */
 .search-area {
-  input{
+  input {
     width: 150px;
   }
 }
+
 /*详情 */
-.detail-container{
-  .header{
-     height: 40px;
-     line-height: 40px;
-     display: flex;
-     justify-items:flex-end;
-     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+.detail-container {
+  background: #ffffff !important;
+  margin: 10px 10px;
+
+  .header {
+    height: 50px;
+    line-height: 50px;
+    display: flex;
+    justify-content: space-between;
+    padding: 0px 10px 0px 0px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+
+    .detail-cancel {
+      width: 50px;
+      padding-left: 10px;
+      cursor: pointer;
+    }
+  }
+
+  .detail-title {
+    line-height: 60px;
+    font-size: 16px;
+    font-weight: bold;
+    width: 100%;
+    margin-top: 10px;
+    display: flex;
+    justify-content: center;
   }
+
+  .content {
+    margin-top: 10px;
+    padding: 10px 10px;
+
+    .content-title {
+      width: 100%;
+      background: #f9f9ff;
+      font-size: 0.96rem;
+      font-weight: bold;
+      padding-left: 10px;
+      height: 40px;
+      line-height: 40px;
+      display: flex;
+      justify-content: flex-start;
+      text-align: left;
+
+      .line {
+        width: 2px;
+        float: left;
+        height: 16px;
+        margin-top: 12px;
+        margin-right: 8px;
+        border-left: #3178ff 3px solid;
+      }
+
+      .subtitle {
+        height: 40px;
+        line-height: 40px;
+        color: #464647 !important;
+      }
+
+    }
+
+    .pal {
+
+      display: flex;
+      justify-content: space-between;
+
+      .left {
+        box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+        margin: 20px 20px 20px 0px;
+        width: 50%;
+        padding: 10px 10px;
+        border-radius: 5px 5px;
+
+        .left-title {
+          height: 40px;
+          line-height: 40px;
+        }
+      }
+
+      .right {
+        box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+        margin: 20px 0px 20px 0px;
+        width: 50%;
+        padding: 10px 10px;
+        border-radius: 5px 5px;
+
+        .right-title {
+          height: 40px;
+          line-height: 40px;
+        }
+      }
+    }
+  }
+
 }
 </style>

src/lang/en.js

@@ -1,5 +1,10 @@
-// 仪器管理
+//资源库管理
+  // 仪器管理
 import yq from './en/business/resource/yq/yq'
+  // 暂存柜
+import zcg from './en/business/resource/zykgl/zcg'
+  // 麻精药
+import mjy from './en/business/resource/zykgl/mjy'
 export default {
   system: {
     title: 'HXHQ',
@@ -187,71 +192,8 @@ export default {
           gd: '归档',
           djd: '待解档'
         },
-        zcg: {
-          ysbh: '钥匙编号',
-          jyr: '借用人',
-          zt: '状态',
-          jyz: '借用中',
-          wjy: '未借用',
-          plgh: '批量归还',
-          zcg: '暂存柜',
-          ysbh: '钥匙编号',
-          ys1jyr: '钥匙1借用人',
-          ys2jyr: '钥匙2借用人',
-          glyj: '关联药剂',
-          ysff: '钥匙发放',
-          gh: '归还',
-          ysgh: '钥匙归还',
-          ysghts:'请确认是否归还以下钥匙',
-          ghr1Id:'钥匙1归还人',
-          ghr1mm:'钥匙1归还人密码',
-          ghr2Id:'钥匙2归还人',
-          ghr2mm:'钥匙2归还人密码',
-          jsr:'接收人',
-          jsrmm:'接收人密码',
-          qmyy:'签名意义',
-          remark:'备注',
-          lqr1Id:'钥匙1领取人',
-          lqr1mm:'钥匙1领取人密码',
-          lqr2Id:'钥匙2领取人',
-          lqr2mm:'钥匙2领取人密码',
-          ffr:'发放人',
-          ffrmm:'发放人密码',
-        },
-         mjy:{
-          sdts:'请确认是否锁定以下麻精药',
-          gdts:'请确认是否归档以下麻精药',
-          mc:'名称',
-          bh:'编号',
-          jyzt:'借阅状态',
-          zjzt:'制剂状态',
-          sxrq:'失效日期',
-          nd:'浓度',
-          kcl:'库存量',
-          zcgMc:'暂存柜',
-          cctj:'存储条件',
-          ccwz:'存储位置',
-
-          plff:'批量发放',
-          plczyj:'批量处置药剂',
-          plczrq:'批量处置容器',
-          ysff:'钥匙发放',
-          plsd:'批量锁定',
-          plgd:'批量归档',
-
-          ff:'发放',
-          gh:'归还',
-          czrq:'处置容器',
-          czyj:'处置药剂',
-          xgkc:'修改库存',
-          shxgkc:'审核修改库存',
-          shbj:'审核编辑',
-
-          gd:'归档',
-          jd:'解档',
-          jy:'借阅',
-          gh:'归还',
-        },
+        zcg,
+        mjy,
         yq
       }
     }

src/lang/en/business/resource/zykgl/mjy.js

@@ -0,0 +1,35 @@
+export default {
+    sdts:'请确认是否锁定以下麻精药',
+    gdts:'请确认是否归档以下麻精药',
+    mc:'名称',
+    bh:'编号',
+    jyzt:'借阅状态',
+    zjzt:'制剂状态',
+    sxrq:'失效日期',
+    nd:'浓度',
+    kcl:'库存量',
+    zcgMc:'暂存柜',
+    cctj:'存储条件',
+    ccwz:'存储位置',
+
+    plff:'批量发放',
+    plczyj:'批量处置药剂',
+    plczrq:'批量处置容器',
+    ysff:'钥匙发放',
+    plsd:'批量锁定',
+    plgd:'批量归档',
+
+    ff:'发放',
+    gh:'归还',
+    czrq:'处置容器',
+    czyj:'处置药剂',
+    xgkc:'修改库存',
+    shxgkc:'审核修改库存',
+    shbj:'审核编辑',
+
+    gd:'归档',
+    jd:'解档',
+    jy:'借阅',
+    gh:'归还',
+
+}

src/lang/en/business/resource/zykgl/zcg.js

@@ -0,0 +1,32 @@
+export default {
+    ysbh: '钥匙编号',
+    jyr: '借用人',
+    zt: '状态',
+    jyz: '借用中',
+    wjy: '未借用',
+    plgh: '批量归还',
+    zcg: '暂存柜',
+    ysbh: '钥匙编号',
+    ys1jyr: '钥匙1借用人',
+    ys2jyr: '钥匙2借用人',
+    glyj: '关联药剂',
+    ysff: '钥匙发放',
+    gh: '归还',
+    ysgh: '钥匙归还',
+    ysghts:'请确认是否归还以下钥匙',
+    ghr1Id:'钥匙1归还人',
+    ghr1mm:'钥匙1归还人密码',
+    ghr2Id:'钥匙2归还人',
+    ghr2mm:'钥匙2归还人密码',
+    jsr:'接收人',
+    jsrmm:'接收人密码',
+    qmyy:'签名意义',
+    remark:'备注',
+    lqr1Id:'钥匙1领取人',
+    lqr1mm:'钥匙1领取人密码',
+    lqr2Id:'钥匙2领取人',
+    lqr2mm:'钥匙2领取人密码',
+    ffr:'发放人',
+    ffrmm:'发放人密码',
+
+}

src/lang/zh.js

@@ -1,5 +1,10 @@
-// 仪器管理
+//资源库管理
+  // 仪器管理
 import yq from './zh/business/resource/yq/yq'
+  // 暂存柜
+import zcg from './zh/business/resource/zykgl/zcg'
+  // 麻精药
+import mjy from './zh/business/resource/zykgl/mjy'
 export default {
   system: {
     title: '华西海圻管理系统',
@@ -193,72 +198,8 @@ export default {
           gd: '归档',
           djd: '待解档'
         },
-        zcg: {
-          ysbh: '钥匙编号',
-          jyr: '借用人',
-          zt: '状态',
-          jyz: '借用中',
-          wjy: '未借用',
-          plgh: '批量归还',
-          zcg: '暂存柜',
-          ysbh: '钥匙编号',
-          ys1jyr: '钥匙1借用人',
-          ys2jyr: '钥匙2借用人',
-          glyj: '关联药剂',
-          ysff: '钥匙发放',
-          gh: '归还',
-          ysgh: '钥匙归还',
-          ysghts:'请确认是否归还以下钥匙',
-          ghr1Id:'钥匙1归还人',
-          ghr1mm:'钥匙1归还人密码',
-          ghr2Id:'钥匙2归还人',
-          ghr2mm:'钥匙2归还人密码',
-          jsr:'接收人',
-          jsrmm:'接收人密码',
-          qmyy:'签名意义',
-          remark:'备注',
-          lqr1Id:'钥匙1领取人',
-          lqr1mm:'钥匙1领取人密码',
-          lqr2Id:'钥匙2领取人',
-          lqr2mm:'钥匙2领取人密码',
-          ffr:'发放人',
-          ffrmm:'发放人密码',
-        },
-
-        mjy:{
-          sdts:'请确认是否锁定以下麻精药',
-          gdts:'请确认是否归档以下麻精药',
-          mc:'名称',
-          bh:'编号',
-          jyzt:'借阅状态',
-          zjzt:'制剂状态',
-          sxrq:'失效日期',
-          nd:'浓度',
-          kcl:'库存量',
-          zcgMc:'暂存柜',
-          cctj:'存储条件',
-          ccwz:'存储位置',
-
-          plff:'批量发放',
-          plczyj:'批量处置药剂',
-          plczrq:'批量处置容器',
-          ysff:'钥匙发放',
-          plsd:'批量锁定',
-          plgd:'批量归档',
-
-          ff:'发放',
-          gh:'归还',
-          czrq:'处置容器',
-          czyj:'处置药剂',
-          xgkc:'修改库存',
-          shxgkc:'审核修改库存',
-          shbj:'审核编辑',
-
-          gd:'归档',
-          jd:'解档',
-          jy:'借阅',
-          gh:'归还',
-        },
+        zcg,
+        mjy,
         yq
       }
     }

src/lang/zh/business/resource/zykgl/mjy.js

@@ -0,0 +1,34 @@
+export default {
+    sdts:'请确认是否锁定以下麻精药',
+    gdts:'请确认是否归档以下麻精药',
+    mc:'名称',
+    bh:'编号',
+    jyzt:'借阅状态',
+    zjzt:'制剂状态',
+    sxrq:'失效日期',
+    nd:'浓度',
+    kcl:'库存量',
+    zcgMc:'暂存柜',
+    cctj:'存储条件',
+    ccwz:'存储位置',
+
+    plff:'批量发放',
+    plczyj:'批量处置药剂',
+    plczrq:'批量处置容器',
+    ysff:'钥匙发放',
+    plsd:'批量锁定',
+    plgd:'批量归档',
+
+    ff:'发放',
+    gh:'归还',
+    czrq:'处置容器',
+    czyj:'处置药剂',
+    xgkc:'修改库存',
+    shxgkc:'审核修改库存',
+    shbj:'审核编辑',
+
+    gd:'归档',
+    jd:'解档',
+    jy:'借阅',
+    gh:'归还',
+}

src/lang/zh/business/resource/zykgl/zcg.js

@@ -0,0 +1,31 @@
+export default {
+    ysbh: '钥匙编号',
+    jyr: '借用人',
+    zt: '状态',
+    jyz: '借用中',
+    wjy: '未借用',
+    plgh: '批量归还',
+    zcg: '暂存柜',
+    ysbh: '钥匙编号',
+    ys1jyr: '钥匙1借用人',
+    ys2jyr: '钥匙2借用人',
+    glyj: '关联药剂',
+    ysff: '钥匙发放',
+    gh: '归还',
+    ysgh: '钥匙归还',
+    ysghts:'请确认是否归还以下钥匙',
+    ghr1Id:'钥匙1归还人',
+    ghr1mm:'钥匙1归还人密码',
+    ghr2Id:'钥匙2归还人',
+    ghr2mm:'钥匙2归还人密码',
+    jsr:'接收人',
+    jsrmm:'接收人密码',
+    qmyy:'签名意义',
+    remark:'备注',
+    lqr1Id:'钥匙1领取人',
+    lqr1mm:'钥匙1领取人密码',
+    lqr2Id:'钥匙2领取人',
+    lqr2mm:'钥匙2领取人密码',
+    ffr:'发放人',
+    ffrmm:'发放人密码',
+}

src/layout/components/Sidebar/Logo.vue

@@ -3,7 +3,7 @@
     :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <img v-if="logo2" :src="logo2" class="sidebar-logo" />
         <h1 v-else class="sidebar-title"
           :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{
             $t('system.title') }} </h1>
@@ -18,6 +18,7 @@
 
 <script>
 import logoImg from '@/assets/images/logo-header.png'
+import logomini from '@/assets/images/logomini.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {
@@ -39,7 +40,8 @@ export default {
   data() {
     return {
       title: process.env.VUE_APP_TITLE,
-      logo: logoImg
+      logo: logoImg,
+      logo2: logomini,
     }
   }
 }
@@ -73,10 +75,10 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
       vertical-align: middle;
-      margin-right: 12px;
+      transform: rotate(90deg);
+      margin-top: 30px;
+    margin-left: -8px;
     }
 
     & .sidebar-title {

src/layout/components/Sidebar/index.vue

@@ -5,11 +5,17 @@
             <el-menu
                 :default-active="activeMenu"
                 :collapse="isCollapse"
-                :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
                 :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
                 :unique-opened="true"
                 :active-text-color="settings.theme"
                 :collapse-transition="false"
+                :style="{
+                    backgroundImage: 'url('+menuBg+')',
+                    backgroundSize: 'cover',
+                    backgroundRepeat: 'no-repeat',
+                    backgroundPosition: 'center',
+                    height: 'calc(100vh - 100px)'
+                    }"
                 mode="vertical"
             >
                 <sidebar-item
@@ -25,12 +31,18 @@
 
 <script>
 import { mapGetters, mapState } from "vuex"
+import menuBg from '@/assets/images/menuBg.png'
 import Logo from "./Logo"
 import SidebarItem from "./SidebarItem"
 import variables from "@/assets/styles/variables.scss"
 
 export default {
     components: { SidebarItem, Logo },
+    data() {
+    return {
+      menuBg: menuBg,
+    }
+  },
     computed: {
         ...mapState(["settings"]),
         ...mapGetters(["sidebarRouters", "sidebar"]),

src/views/business/resource/mjy/comps/Gd.vue

@@ -1,5 +1,5 @@
 G<template>
-  <div class="app-container">
+  <div >
     <!-- 归档弹窗 -->
     <el-dialog :title="$t('form.gd')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">

src/views/business/resource/mjy/comps/Js.vue

@@ -1,5 +1,5 @@
 G<template>
-  <div class="app-container">
+  <div >
     <!-- 解锁弹窗 -->
     <el-dialog :title="$t('form.unlock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">

src/views/business/resource/mjy/comps/Sd.vue

@@ -1,5 +1,5 @@
 G<template>
-  <div class="app-container">
+  <div >
     <!-- 锁定弹窗 -->
     <el-dialog :title="$t('form.lock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">

src/views/business/resource/mjy/comps/Xq.vue

@@ -1,46 +1,39 @@
 G<template>
-    <!-- 详情 -->
-   <div class="detail-container">
+  <!-- 详情 -->
+  <div class="detail-container">
     <div class="header">
+      <div @click="cancel" class="detail-cancel"><i class="el-icon-arrow-left"></i></div>
       <div>
-          <i class="el-icon-arrow-left"></i>
+        <el-button ><div>{{ $t('form.export') }}</div></el-button>
       </div>
     </div>
-       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+    <div class="detail-title"><img src="@/assets/images/detail-title.png" >麻精药详情<img src="@/assets/images/detail-title.png" ></img></div>
+    <div class="content">
+      <div class="content-title">
+        <div class="line"></div>
+        <div class="subtitle"> 基本信息</div>
+      </div>
+      <el-form ref="form" :model="form" :rules="rules" label-width="0px">
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('form.qmyy') }}</div>
+            <el-form-item prop="qmyy">
               <el-input type="text" :value="form.qmyy" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.signer')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled
+          </div>
+          <div class="right">
+           <div  class="right-title">{{ $t('form.qmyy') }}</div>
+            <el-form-item prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+          </div>
+        </div>
       </el-form>
-   </div>
+
+    </div>
+  </div>
 </template>
 
 <script>
@@ -50,7 +43,6 @@ export default {
   name: "MjyXq",
   data() {
     return {
-      open: false,
       form: {},
       rules: {
       }
@@ -59,9 +51,12 @@ export default {
   created() {
   },
   methods: {
+    cancel() {
+      this.$emit('cancel')
+    },
     show(row) {
       mjy_info({ id: row.id }).then(response => {
-        this.form=response.data
+        this.form = response.data
         this.open = false
       })
       this.open = true

src/views/business/resource/mjy/list.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- 详情 -->
     <template v-if="showDetail">
-      <Xq ref="Xq" @callback="handleQuery" />
+      <Xq ref="Xq" @cancel="cancelXq" />
     </template>
 
     <!-- 列表 -->
@@ -206,14 +206,13 @@
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" />
       </div>
+      <!-- 锁定 -->
+      <Sd ref="Sd" @callback="handleQuery" />
+      <!-- 解锁 -->
+      <Js ref="Js" @callback="handleQuery" />
+      <!-- 归档 -->
+      <Gd ref="Gd" @callback="handleQuery" />
     </template>
-
-    <!-- 锁定 -->
-    <Sd ref="Sd" @callback="handleQuery" />
-    <!-- 解锁 -->
-    <Js ref="Js" @callback="handleQuery" />
-    <!-- 归档 -->
-    <Gd ref="Gd" @callback="handleQuery" />
   </div>
 </template>
 
@@ -255,6 +254,10 @@ export default {
     this.getList()
   },
   methods: {
+    //关闭详情
+    cancelXq() {
+      this.showDetail = false
+    },
     //是否可勾选
     checkSelectable(row) {
       return true;