容器样式

src/dashoo.cn/frontend_web/src/assets/styles/base/variables.scss

@@ -60,8 +60,8 @@ $main-light:                #3e4c59;
 $main-dark:                 #283643;
 // $main:                      #2b3b49;
 // $main-darker:               #24313c;
-$main:                      #FFFFFF;
-$main-darker:               #BBBBBB;
+$main:                      #004EA2;
+$main-darker:               #002140;
 
 // - Brand color
 $primary:                   #20A0FF;

src/dashoo.cn/frontend_web/src/components/Headbar.vue

@@ -2,38 +2,38 @@
   <header class="header" style="background-color:#004EA2;">
     <div v-if="!isMenuHidden" class="brand"
       style="background-color:#004EA2;padding-top:7px;padding-left:20px;width:180px;">
-      <img src="../assets/img/logo.png" style="height:35px; margin-left: 20px" />
+      <img src="../assets/img/logo_white.png" style="height:35px; margin-left: 20px" />
     </div>
 
-    <div v-if="isMenuHidden" class="brand" style="background-color:#fff;padding-top:7px;width:56px;">
+    <div v-if="isMenuHidden" class="brand" style="background-color:#004EA2;padding-top:7px;width:56px;">
       <img src="../assets/img/title.png" style="height:35px;" />
     </div>
 
     <nav class="toolbar" style="margin-top: 3px;background-color:#004EA2;">
       <img src="../assets/img/title_biobank.png" style="height:35px;padding-top:5px;" />
       <div style="margin: 10px 0px 0px 20px;"></div>
-      <el-tag type="text" size="mini" style="margin-top:12px">{{department}}</el-tag>
+      <el-tag type="text" size="mini" style="margin-top:12px;background-color:#F0F1F3">{{department}}</el-tag>
 
-      <ul class="list" style="background: #004EA2;color: blue">
+      <ul class="list" style="background: #004EA2;">
         <li class="item" style="background: #004EA2">
-          <a style="font-size: 90%;background: #004EA2;color: white; font-weight: bold" href="#" v-if="authUser">
+          <a style="font-size: 90%;background: #004EA2;color: #F0F1F3; font-weight: bold" href="#" v-if="authUser">
             <span style="margin-right: 20px;">
               <el-button type="text" icon="icon icon-shrink" v-if="fullscreen" @click="handleFullScreen"></el-button>
               <el-button type="text" icon="icon icon-enlarge" v-if="!fullscreen" @click="handleFullScreen"></el-button>
             </span>
             您好, {{ authUser.Profile.Realname }}
-            <img v-if="authUser.Profile.Photo" style="background: #FFF; border: hidden"
+            <img v-if="authUser.Profile.Photo" style="background: #002140; border: hidden"
               :src="'http://'+authUser.Profile.Host+authUser.Profile.Photo" class="avatar">
             <img v-else class="avatar" style="background: white; border: hidden" src="~/assets/img/avatar.svg"
               :alt="authUser.name">
           </a>
           <ul class="list" style="text-align: center;background: #004EA2;">
             <li class="item">
-              <router-link to="/system/usersetting" style="color: white; font-weight: bold">账户设置</router-link>
+              <router-link to="/system/usersetting" style="color: #F0F1F3; font-weight: bold">账户设置</router-link>
             </li>
             <li class="divider" style="color: ActiveBorder;"></li>
             <li class="item">
-              <a href="#" style="color: white; font-weight: bold" @click.prevent="logout">注销登录</a>
+              <a href="#" style="color: #F0F1F3; font-weight: bold" @click.prevent="logout">注销登录</a>
             </li>
           </ul>
         </li>

src/dashoo.cn/frontend_web/src/components/sidebar.vue

@@ -1,26 +1,35 @@
 <template>
   <aside class="sidebar-container sidebar" id="aside" :class="{ collapse: isMenuHidden }">
     <el-scrollbar style="height: calc(100vh - 75px); overflow: hidden;" wrap-class="scrollbar-wrapper">
-      <el-menu :collapse="isCollapse" :router="true" default-active="/" :collapse-transition="false">
+      <el-menu
+        :collapse="isCollapse"
+        :router="true"
+        default-active="/"
+        background-color="#004EA2"
+        text-color="#fff"
+        active-text-color="#312520"
+        :collapse-transition="false"
+      
+      >
         <template v-for="(item, index) in menus">
           <el-menu-item v-if="!item.children" :index="item.url" :key="item.id">
-            <i :class="'icon-before icon-'+item.icon" style="padding-top: 5px; margin-right: 15px;"></i>
+            <i :class="'icon-before icon-'+item.icon" style="padding-top: 5px; margin-right: 10px; color: #fff"></i>
             <span slot="title">{{ item.name }}</span>
           </el-menu-item>
 
           <el-submenu v-if="item.children" :index="item.name" :key="item.id" class="">
             <template slot="title">
-              <i :class="'icon-before icon-'+item.icon" style="padding-top: 5px; margin-right: 15px;"></i>
+              <i :class="'icon-before icon-'+item.icon" style="padding-top: 5px; margin-right: 10px; color: #fff"></i>
               <span slot="title">{{ item.name }}</span>
             </template>
-            <template v-if="item.children" v-for="sub in item.children">
-              <el-menu-item v-if="!sub.children" :index="sub.url" :key="sub.id">
-                <i style="padding-top: 5px; margin-right: 15px;"></i>
+            <template v-if="item.children" v-for="sub in item.children" >
+              <el-menu-item v-if="!sub.children"  :index="sub.url"  :key="sub.id">
+                <!--<i :class="'icon-before icon-'+sub.icon" style="padding-top: 5px; margin-right: 10px;"></i>-->
                 <span slot="title">{{ sub.name }}</span>
               </el-menu-item>
               <el-submenu v-if="sub.children" :index="sub.name" :key="sub.id">
                 <template slot="title">
-                  <i :class="'icon-before icon-'+sub.icon" style="padding-top: 5px; margin-right: 15px;"></i>
+                  <i :class="'icon-before icon-'+sub.icon" style="padding-top: 5px; margin-right: 10px; color: #fff"></i>
                   <span slot="title">{{ sub.name }}</span>
                 </template>
                 <el-menu-item v-for="sub2 in sub.children" :index="sub2.url" :key="sub2.id">
@@ -35,146 +44,136 @@
     </el-scrollbar>
 
     <footer class="footer">
-      <el-button size="mini" type="text" icon="icon-before icon-circle-right" circle v-if="isCollapse == true"
-        @click="floderMenu"></el-button>
-      <el-button size="mini" type="text" icon="icon-before icon-circle-left" circle v-if="isCollapse == false"
-        @click="floderMenu"></el-button>
-      <div v-if="!isCollapse" class="copyright">©大数华创</div>
+      <el-button size="mini" type="text" icon="icon-before icon-circle-right" circle v-if="isCollapse == true" @click="floderMenu"></el-button>
+      <el-button size="mini" type="text" icon="icon-before icon-circle-left" circle v-if="isCollapse == false" @click="floderMenu"></el-button>
+      <div v-if="!isCollapse" class="copyright">大数华创 DASHOO</div>
     </footer>
   </aside>
 </template>
 
 
 <script>
-  import Vue from 'vue'
-  import {
-    mapActions
-  } from 'vuex'
-  import Component, {
-    Getter,
-    namespace
-  } from 'class-component'
-  import MenuList from '@/components/MenuList'
-
-  const MenuGetter = namespace('menu', Getter)
-
-  @Component({
-    components: {
-      MenuList
-    },
-    data() {
-      return {
-        isCollapse: false
+import Vue from 'vue'
+import { mapActions } from 'vuex'
+import Component, {Getter, namespace } from 'class-component'
+import MenuList from '@/components/MenuList'
+
+const MenuGetter = namespace('menu', Getter)
+
+@Component({
+  components: {
+    MenuList
+  },
+  data() {
+    return {
+      isCollapse: false
+    }
+  },
+  methods: {
+    ...mapActions(['toggleMenu']),
+    toolfun_gettreejson(rows, idFieldName, pidFieldName, fileds) {
+      // 工具方法，将扁平数据转化成tree格式数据
+      function nodejsonexists(rows, ParentId) {
+        for (var i = 0; i < rows.length; i++) {
+          if (rows[i][idFieldName] === ParentId) {
+            return true
+          }
+        }
+        return false
       }
-    },
-    methods: {
-      ...mapActions(['toggleMenu']),
-      toolfun_gettreejson(rows, idFieldName, pidFieldName, fileds) {
-        // 工具方法，将扁平数据转化成tree格式数据
-        function nodejsonexists(rows, ParentId) {
-          for (var i = 0; i < rows.length; i++) {
-            if (rows[i][idFieldName] === ParentId) {
-              return true
+      let nodes = []
+      // get the top level nodes
+      for (let i = 0; i < rows.length; i++) {
+        let row = rows[i]
+        if (!nodejsonexists(rows, row[pidFieldName])) {
+          var data = {
+            id: row[idFieldName]
+          }
+          let arrFiled = fileds.split(',')
+          for (var j = 0; j < arrFiled.length; j++) {
+            if (arrFiled[j] !== idFieldName) {
+              data[arrFiled[j]] = row[arrFiled[j]]
             }
           }
-          return false
+          nodes.push(data)
         }
-        let nodes = []
-        // get the top level nodes
+      }
+      let toDo = []
+      for (let i = 0; i < nodes.length; i++) {
+        toDo.push(nodes[i])
+      }
+      while (toDo.length) {
+        let node = toDo.shift() // the parent node
+        // get the children nodes
         for (let i = 0; i < rows.length; i++) {
           let row = rows[i]
-          if (!nodejsonexists(rows, row[pidFieldName])) {
-            var data = {
+          if (row[pidFieldName] === node.id) {
+            let child = {
               id: row[idFieldName]
             }
             let arrFiled = fileds.split(',')
-            for (var j = 0; j < arrFiled.length; j++) {
+            for (let j = 0; j < arrFiled.length; j++) {
               if (arrFiled[j] !== idFieldName) {
-                data[arrFiled[j]] = row[arrFiled[j]]
+                child[arrFiled[j]] = row[arrFiled[j]]
               }
             }
-            nodes.push(data)
-          }
-        }
-        let toDo = []
-        for (let i = 0; i < nodes.length; i++) {
-          toDo.push(nodes[i])
-        }
-        while (toDo.length) {
-          let node = toDo.shift() // the parent node
-          // get the children nodes
-          for (let i = 0; i < rows.length; i++) {
-            let row = rows[i]
-            if (row[pidFieldName] === node.id) {
-              let child = {
-                id: row[idFieldName]
-              }
-              let arrFiled = fileds.split(',')
-              for (let j = 0; j < arrFiled.length; j++) {
-                if (arrFiled[j] !== idFieldName) {
-                  child[arrFiled[j]] = row[arrFiled[j]]
-                }
-              }
-              if (node.children) {
-                node.children.push(child)
-              } else {
-                node.children = [child]
-              }
-              toDo.push(child)
+            if (node.children) {
+              node.children.push(child)
+            } else {
+              node.children = [child]
             }
+            toDo.push(child)
           }
         }
-        return nodes
-      },
-      floderMenu() {
-        this.isCollapse = !this.isCollapse
-        this.toggleMenu()
       }
+      return nodes
     },
-    watch: {
-      isMenuHidden: function (val) {
-        this.isCollapse = this.isMenuHidden
-      },
+    floderMenu() {
+      this.isCollapse = !this.isCollapse
+      this.toggleMenu()
     }
-  })
-  export default class Sidebar extends Vue {
-    @Getter isMenuHidden
-    @MenuGetter menus
-
-    async beforeMount() {
-      // 暂时从本地取菜单
-      let {
-        data: menus1
-      } = await this.$axios.get('users/getusermoduletree')
-      let menus = this.toolfun_gettreejson(menus1, 'id', 'pId', 'id,name,url,icon')
-      if (menus[0].id == '30000000') {
-        menus = menus[0].children
-      }
-      window.menusjson = menus
-      if (Array.isArray(menus) && menus.length) {
-        // 暂时菜单不加多语言处理
-        // this.$store.dispatch('menu/addAll', this.translateMenus(menus))
-        this.$store.dispatch('menu/addAll', menus)
-      }
+  },
+  watch: {
+    isMenuHidden: function (val) {
+      this.isCollapse = this.isMenuHidden
+    },
+  }
+})
+export default class Sidebar extends Vue {
+  @Getter isMenuHidden
+  @MenuGetter menus
+
+  async beforeMount () {
+    // 暂时从本地取菜单
+    let {data: menus1} = await this.$axios.get('users/getusermoduletree')
+    let menus = this.toolfun_gettreejson(menus1, 'id', 'pId', 'id,name,url,icon')
+    if (menus[0].id == '30000000') {
+      menus = menus[0].children
     }
-
-    //菜单多语言支持
-    translateMenus(menus) {
-      return menus.map((menu) => {
-        const subMenus = menu.children
-        if (Array.isArray(subMenus) && subMenus.length) {
-          this.translateMenus(subMenus)
-        }
-        menu.name = this.$t(menu.name + '' || '')
-        return menu
-      })
+    window.menusjson = menus
+    if (Array.isArray(menus) && menus.length) {
+      // 暂时菜单不加多语言处理
+      // this.$store.dispatch('menu/addAll', this.translateMenus(menus))
+      this.$store.dispatch('menu/addAll', menus)
     }
   }
 
+  //菜单多语言支持
+  translateMenus (menus) {
+    return menus.map((menu) => {
+      const subMenus = menu.children
+      if (Array.isArray(subMenus) && subMenus.length) {
+        this.translateMenus(subMenus)
+      }
+      menu.name = this.$t(menu.name + '' || '')
+      return menu
+    })
+  }
+}
 </script>
 
 <style lang="scss">
-  // base color
+
   $blue:#324157;
   $light-blue:#3A71A8;
   $red:#C03639;
@@ -189,24 +188,16 @@
   $menuActiveText:#409EFF;
   $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951*/
 
-  $menuBg:#E6F7FF;
-  $menuHover:#ECF5FF;
+  $menuBg:#004EA2;
+  $menuHover:#004EA2;
 
-  $subMenuBg:#E6F7FF;
-  $subMenuHover:#ECF5FF;
+  $subMenuBg:#004EA2;
+  $subMenuHover:#004EA2;
 
   $sideBarWidth: 200px;
 
   // 侧边栏 Sidebar container
   .sidebar-container {
-    /*transition: width 0.28s;
-    width: $sideBarWidth !important;
-    height: 100%;
-    position: fixed;
-    font-size: 0px;
-    top: 0;
-    bottom: 0;
-    left: 0;*/
     z-index: 1001;
     overflow: hidden;
 
@@ -257,17 +248,16 @@
       width: 100% !important;
     }
 
-    // menu hover
     .submenu-title-noDropdown,
-    .el-submenu__title {
-      &:hover {
-        background-color: $menuHover !important;
-      }
-    }
+    
+    // .el-submenu__title {
+    //   &:hover {
+    //     background-color: $menuHover !important;
+    //   }
+    // }
 
     //self-defined
-    .el-menu-item,
-    .el-submenu__title {
+    .el-menu-item, .el-submenu__title {
       height: 40px;
       line-height: 40px;
     }
@@ -284,6 +274,9 @@
       &:hover {
         background-color: $subMenuHover !important;
       }
+      // &:focus {
+      //   background-color: #F0F1F3 !important;
+      // }
     }
   }
 
@@ -327,6 +320,9 @@
           display: none;
         }
       }
+      // &:focus {
+      //   background-color: #F0F1F3 !important;
+      // }
     }
 
     .el-menu--collapse {
@@ -340,6 +336,9 @@
             display: inline-block;
           }
         }
+      //&:focus {
+      //   background-color: #F0F1F3 !important;
+      // }
       }
     }
   }
@@ -378,25 +377,26 @@
 
   // when menu collapsed
   .el-menu--vertical {
-    &>.el-menu {
+    & > .el-menu {
       .svg-icon {
         margin-right: 16px;
       }
     }
 
-    .nest-menu .el-submenu>.el-submenu__title,
+    .nest-menu .el-submenu > .el-submenu__title,
     .el-menu-item {
       height: 30px;
       line-height: 30px;
-
       &:hover {
-        // you can use $subMenuHover
         background-color: $menuHover !important;
       }
+      // &:focus {
+      //   background-color: #F0F1F3 !important;
+      // }
     }
 
     // the scroll bar appears when the subMenu is too long
-    >.el-menu--popup {
+    > .el-menu--popup {
       max-height: 100vh;
       overflow-y: auto;
 

src/dashoo.cn/frontend_web/src/pages/equipment/_opera/manage_new.vue

@@ -48,6 +48,13 @@
             <el-popover trigger="hover" width="600" placement="center">
               <div>
                 <el-row v-show="showtsyedanguan">
+                  <i class="icon icon-stop2" style="color:#EAEAEA"></i>无冻存盒
+                  <i class="icon icon-stop2" style="color:#13CE66"></i>空冻存盒
+                  <i class="icon icon-stop2" style="color:#FF4949"></i>选中
+                  <i class="icon icon-stop2" style="color:#D1EEEE"></i>容量(0-25%)
+                  <i class="icon icon-stop2" style="color:#20A0FF"></i>容量(25%-50%)
+                  <i class="icon icon-stop2" style="color:#836FFF"></i>容量(50%-75%)
+                  <i class="icon icon-stop2" style="color:#000080"></i>容量(75%-100%)
                   <el-row :gutter="20">
                     <el-col :span="18">
                       <canvas id="canvascryobiobank97K" width="450" height="450"></canvas>
@@ -77,6 +84,13 @@
                   </el-row>
                 </el-row>
                 <el-row v-show="showcgshebei">
+                  <i class="icon icon-stop2" style="color:#EAEAEA"></i>无冻存盒
+                  <i class="icon icon-stop2" style="color:#13CE66"></i>空冻存盒
+                  <i class="icon icon-stop2" style="color:#FF4949"></i>选中
+                  <i class="icon icon-stop2" style="color:#D1EEEE"></i>容量(0-25%)
+                  <i class="icon icon-stop2" style="color:#20A0FF"></i>容量(25%-50%)
+                  <i class="icon icon-stop2" style="color:#836FFF"></i>容量(50%-75%)
+                  <i class="icon icon-stop2" style="color:#000080"></i>容量(75%-100%)
                   <table cellspacing="0" cellpadding="0">
                     <thead>
                       <th></th>
@@ -129,15 +143,6 @@
               </div>
             </el-popover>
           </el-col>
-          <el-col :span="20">
-            <i class="icon icon-stop2" style="color:#EAEAEA"></i>无冻存盒
-            <i class="icon icon-stop2" style="color:#13CE66"></i>空冻存盒
-            <i class="icon icon-stop2" style="color:#FF4949"></i>选中
-            <i class="icon icon-stop2" style="color:#D1EEEE"></i>容量(0-25%)
-            <i class="icon icon-stop2" style="color:#20A0FF"></i>容量(25%-50%)
-            <i class="icon icon-stop2" style="color:#836FFF"></i>容量(50%-75%)
-            <i class="icon icon-stop2" style="color:#000080"></i>容量(75%-100%)
-          </el-col>
         </el-row>
       </div>
       <!--冰箱-->
@@ -209,22 +214,20 @@
                 <el-aside width="100px">
                   <img :src="imgSrc" class="sampleTypeimg">
                 </el-aside>
-                <el-main style="margin-left:45px;">
-                  <el-row :gutter="10">
-                    <el-col :span="24" style="padding: 8px 5px 0 0;">
-                      <label>样本类型 ： {{ sampleForm.SampleTypeName }} </label>
-                    </el-col>
-                    <el-col :span="24" style="padding: 8px 5px 0 0;">
-                      <label>样本条码 ： {{ sampleForm.BarCode }}</label>
+                <el-main style="margin-left:45px; margin-top: -15px">
+                  <h1>样本类型 : {{ sampleForm.SampleTypeName }}</h1>
+                  <el-row style="margin-top:-10px">
+                    <el-col :span="12">
+                      <h3>样本条码 : {{ sampleForm.BarCode }}</h3>
                     </el-col>
-                    <el-col :span="24" style="padding: 8px 5px 0 0;">
-                      <label>位置编码 ： {{ checkPosition }}</label>
+                    <el-col :span="12">
+                      <h3>位置编码 ： {{ checkPosition }} </h3>
                     </el-col>
                   </el-row>
                 </el-main>
               </el-container>
               <div class="sampleInfo">
-                <el-row style="margin-left:25px;margin-top:25px">
+                <el-row style="margin-left:25px;margin-top:10px">
                   <el-col :span="12">
                     <label>名称 ： {{ sampleForm.Name }} </label>
                   </el-col>
@@ -633,7 +636,7 @@
       }
       return {
         filehost: '',
-        imgSrc: '/img/empty.png',
+        imgSrc: '/img/empty.jpg',
         fridgebottomimg: '',
         equipName: '',
         equipCode: '', // 容器编码
@@ -645,13 +648,11 @@
         disabledbarcode: false,
         disabledsamplecode: false,
         disabledsampletype: false,
-        //disabledsamplingorgan: false,
         disabledvaliditydate: false,
         disabledsourcebutton: false,
         disabledcheckprint: false,
         diaabledreceiveDate: false,
         diaabledyongjiu: false,
-        // disabledsamplingsite: false,
         disabledcapacity: false,
         disabledunit: false,
         disabledbtnpreopera: false,
@@ -798,7 +799,6 @@
         numtoengs: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
           'U', 'V', 'W', 'X', 'Y', 'Z'
         ],
-        // checkshelvemsg: '',
         checkPosition: '',
         samplelist: [], // 新增，新的冰箱list和冻存盒list以及冻存盒样本list
         selectedBox: [],
@@ -818,10 +818,8 @@
         dialogtiquVisible: false, // 提取弹框是否显示
         sampleinfodetail: {}, // 样本信息
         sampleinfoid: 0, // 所选样本的id
-        // sampleinfotype: '', // 所选样本的type
         code_default: false, // 样本编码是否知道生成
         extendList: [], // 特有扩展
-        // publickzlist: [], // 公共扩展
         exportVisible: false, // 导入对话框
         exportfileparam: {}, // 导入文件参数
         exportfilepath: '', // 导入文件路径
@@ -2579,7 +2577,7 @@
           }
         }
       },
-      
+
       handleclk(xbox, ybox, xshelf, yshelf) {
         // 清空状态
         this.clearSampleForm()
@@ -2614,8 +2612,8 @@
       },
       tableclk(v, x, y) {
         this.checkPosition =
-          `${this.equipCode}-${this.numtoupchar(this.xshelf)}${this.yshelf}-${this.numtoupchar(this.ybox)}${this.xbox}-${this.numtoupchar(x)}${y}`
-        // 清空状态
+          `${this.equipCode}-${this.numtoupchar(this.xshelf)}${this.yshelf}-${this.numtoupchar(this.ybox)}${this.xbox}-${this.numtoupchar(x)}${y}` 
+        //清空状态
         this.clearSampleForm()
         if (v != null) {
           if (v.IState == 1) {
@@ -2634,12 +2632,10 @@
           _this.disabledsamplecode = true
           _this.disabledbarcode = true
           _this.disabledsampletype = true
-          // _this.disabledsamplingorgan = true
           _this.disabledsourcebutton = true
           _this.disabledcheckprint = true
           _this.diaabledreceiveDate = true
           _this.diaabledyongjiu = true
-          // _this.disabledsamplingsite = true
           _this.disabledcapacity = true
           _this.disabledunit = true
           _this.disabledvaliditydate = true
@@ -2656,14 +2652,6 @@
         this.dchytable = x
         this.xtable = x
         this.ytable = y
-        // if (this.Apply_flag) {
-        //   // 跳转
-        //   if (!this.fristseach) {
-        //     // this.goAnchor('#equiinfocard')
-        //   } else {
-        //     this.fristseach = false
-        //   }
-        // }
       },
       // 判断是否有冻存管图片位置，依据现在逻辑先调整
       IsPosition(stations, x, y) {
@@ -2883,7 +2871,6 @@
               if (res.data.SampleCode !== '') {
                 _this.disabledsamplecode = true
                 _this.disabledsampletype = true
-                //_this.disabledsamplingorgan = true
                 _this.disabledsourcebutton = true
                 _this.sampleForm.BarCode = ''
                 _this.sampleForm.SampleCode = res.data.SampleCode
@@ -2911,7 +2898,6 @@
         _this.disabledsamplecode = true
         _this.disabledbarcode = true
         _this.disabledsampletype = true
-        //_this.disabledsamplingorgan = true
         _this.disabledsourcebutton = true
         _this.disabledcheckprint = true
         _this.disabledgroup = true
@@ -3139,7 +3125,6 @@
             }
           })
           .catch(err => {
-            // handle error
             console.error(err)
           })
       },
@@ -3240,21 +3225,6 @@
         }
       },
 
-      
-      // geteditsampetypedata(v) {
-      //   // 获取样本类型数据
-      //   let _this = this
-      //   _this.$axios.get('/sampletype/sampletypeajax?id=' + v, {})
-      //     .then(res => {
-      //       _this.sampleForm.Capacity = res.data.SampleType.DefaultCapacity + ''
-      //       if (res.data.VHours === '5000-1-1 23:59:59') {
-      //         _this.sampleForm.Isyongjiu = true
-      //       } else {
-      //         _this.sampleForm.ValidityDate = new Date(res.data.VHours)
-      //         _this.sampleForm.Isyongjiu = false
-      //       }
-      //     })
-      // },
       saveandadd(value) {
         this.addSampleInfo(value)
         // 控制坐标
@@ -3277,19 +3247,17 @@
         this.disabledbarcode = false
         this.disabledsamplecode = false
         this.disabledsampletype = false
-        // this.disabledsamplingorgan = false
         this.disabledvaliditydate = false
         this.disabledsourcebutton = false
         this.disabledcheckprint = false
         this.diaabledreceiveDate = false
         this.diaabledyongjiu = false
-        // this.disabledsamplingsite = false
         this.disabledcapacity = false
         this.disabledunit = false
         this.disabledbtnpreopera = false
         this.disabledgroup = false
-        this.imgSrc = '/img/empty.png'
-        this.checkPosition = ''
+        this.imgSrc = '/img/empty.jpg'
+        // this.checkPosition = ''
         this.sampleForm.SampleTypeName = ''
         this.sampleForm.BarCode = ''
         this.sampleForm.Name = ''

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -27,10 +27,10 @@
           <el-card class="box-card" style="width: 300px;margin-top: 130px;height: 360px;">
             <el-form class="login-form" auto-complete="off" :model="model" :rules="rules" ref="user">
               <h2 class="heading">登录</h2>
-              <el-form-item label="用户名" prop="username">
+              <el-form-item label="用户名" prop="username" style="margin-top:-5px">
                 <el-input type="text" v-model="model.username" placeholder="请输入用户名"></el-input>
               </el-form-item>
-              <el-form-item label="密码" prop="password">
+              <el-form-item label="密码" prop="password" style="margin-top:-20px">
                 <el-input type="password" v-model="model.password" placeholder="请输入密码" @keyup.enter.native="login()" />
               </el-form-item>
               <el-button type="primary" :loading="loading" @click="login()">{{ loading ? '登录中...' : '登录' }}</el-button>
@@ -153,7 +153,7 @@
 
   .nav .nav-logo {
     padding-top: 2px;
-    padding-left: 250px;
+    padding-left: 210px;
   }
 
   .nav-logo {
@@ -185,12 +185,12 @@
     height: 32px;
     float: left;
     line-height: 32px;
-    padding-left: 390px;
+    padding-left: 470px;
   }
 
   .nav ul.nav-item li {
     display: inline-block;
-    margin-left: 45px;
+    margin-left: 25px;
   }
 
   .nav ul.nav-item a {
@@ -217,7 +217,7 @@
   }
 
   .intelligent-img {
-    width: 600px;
+    width: 650px;
     margin-bottom: 2.5rem;
     margin-top: -30px;
   }