Merge branch 'master' of http://101.43.129.26:10880/psychological_camera/RZGY

src/renderer/components/FootDes.vue

@@ -0,0 +1,25 @@
+<template>
+  <div class="footer_class">
+    <div>Copyright© 北京决明科技有限公司</div>
+  </div>
+</template>
+<script>
+export default {
+  name: "FootDes",
+  data() {
+    return {};
+  },
+};
+</script>
+<style scoped>
+.footer_class {
+    color:#0F0F0F;
+  position: absolute;
+  left:0;
+  right:0;
+  font-size: 14px;
+  margin:auto;
+  bottom: 10px;
+  text-align: center;
+}
+</style>

src/renderer/components/ManageUser.vue

@@ -1,30 +1,23 @@
 <template>
   <div class="main_right_height">
-    <div>
-      <el-row style="margin-top: 40px">
-        <el-col :span="1">&nbsp;</el-col>
-        <el-col :span="22">
-          <span class="userManageClass">用户管理</span>
-          <el-divider></el-divider>
-        </el-col>
-        <el-col :span="1">&nbsp;</el-col>
-      </el-row>
-    </div>
+    <TopDes :flag='false' topDesFont='用户管理'></TopDes>
     <div>
       <el-row>
         <el-col :span="1">&nbsp;</el-col>
         <el-col :span="6">
-          <div style="margin-top: 5px; margin-bottom: 15px">
+          <div style="margin-top: 5px; margin-bottom: 15px"  class="xl_input">
             <el-input
               placeholder="请输入搜索内容"
               v-model="nameSearch"
-              class="input-with-select"
+             
+              prefix-icon="el-icon-search"
+               @input="searchUser"
             >
-              <el-button
+              <!-- <el-button
                 slot="append"
                 @click="searchUser"
                 icon="el-icon-search"
-              ></el-button>
+              ></el-button> -->
             </el-input>
           </div>
         </el-col>
@@ -75,6 +68,7 @@
       >
       </el-pagination>
     </p>
+    <FootDes></FootDes>
   </div>
 </template>
 <script>
@@ -175,18 +169,18 @@ export default {
   overflow-y: auto !important;
   background: #ffffff;
 }
-.xl_d_button,
-.xl_d_button:hover,
-.xl_d_button:focus {
-  background: rgb(87, 172, 187);
-  opacity: 1;
-  /* border-radius: 18px; */
-  /* font-size: 14px; */
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #ffffff;
-}
+
 .userManageClass {
   color: #0f0f0f;
 }
+/* .xl_input >>> .el-input__inner {
+  width: 35.4vw;
+  line-height: 64px;
+  background: #eaeaea;
+  border-radius: 30px 30px 30px 30px;
+  opacity: 1;
+  box-sizing: border-box;
+  font-weight: 400;
+  color: #929292;
+} */
 </style>

src/renderer/components/TopDes.vue

@@ -0,0 +1,41 @@
+<template>
+  <div>
+    <div class='topdes_class'>
+      <div  v-if='flag'>
+        <i
+          class="el-icon-arrow-left"
+          style="cursor: pointer; line-height: 1.5"
+          @click="goBack()"
+        >&nbsp;&nbsp;</i>
+      </div>
+      <div >{{topDesFont}}</div>
+    </div> 
+  </div>
+</template>
+<script>
+export default {
+    name:'TopDes',
+    props: ["flag", "topDesFont"],
+  data() {
+    return {};
+  },
+  methods: {
+    goBack() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style>
+.topdes_class{
+    margin-top:40px;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    border-bottom:1px solid #BBC5D4;
+    width:92%;
+    margin-left:4%;
+    padding-bottom:20px;
+    margin-bottom:20px;
+}
+</style>

src/renderer/main.js

@@ -13,6 +13,9 @@ import md5 from 'js-md5';
 import TestResults from './components/TestResults'
 import StackedLine from './components/StackedLine'
 import TopPage from './components/TopPage'
+import TopDes from './components/TopDes.vue'
+import FootDes from './components/FootDes.vue'
+
 import '../utils/public.css'
 Vue.prototype.$md5 = md5;
 Vue.use(Chat)
@@ -30,6 +33,8 @@ Vue.use(ElementUI)
 Vue.component("TestResults", TestResults)
 Vue.component("StackedLine", StackedLine)
 Vue.component("TopPage", TopPage)
+Vue.component("TopDes",TopDes)
+Vue.component('FootDes',FootDes)
 // Vue.use(TestResults)
 // Vue.use(StackedLine)
 

src/utils/public.css

@@ -1,14 +1,14 @@
 .el-table {
     border-radius: 16px 16px 0px 0px;
     border: none;
-    background:transparent;
-  }
-  
-  .el-table .el-table__cell {
+    background: transparent;
+}
+
+.el-table .el-table__cell {
     padding: 6px;
-  }
-  
-  .tag {
+}
+
+.tag {
     display: inline-block;
     background: #ffffff;
     border-radius: 40px 40px 40px 40px;
@@ -20,43 +20,82 @@
     color: #0fb577;
     padding: 2px 8px;
     margin: 0 5px;
-  }
-  
-  .el-table .warning-row {
+}
+
+.el-table .warning-row {
     background: #f5f5f5;
-  }
-  
-  .el-table .success-row {
+}
+
+.el-table .success-row {
     background: #ffffff;
-  }
-  
-  .el-table--enable-row-hover
-    /deep/
-    .el-table__body
-    tr:hover
-    > td.el-table__cell {
+}
+
+.el-table--enable-row-hover /deep/ .el-table__body tr:hover>td.el-table__cell {
     background: rgba(223, 246, 237, 1) !important;
-  }
-  
-  ::v-deep .el-pager li.active,
-  ::v-deep .el-pager li:hover {
+}
+
+::v-deep .el-pager li.active,
+::v-deep .el-pager li:hover {
     background: #f0f0f0;
     color: #262626;
-  }
-  .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+}
+
+.el-table--border .el-table__cell,
+.el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
     border-right: 0px solid #EBEEF5;
 }
-  
-  ::v-deep .el-pager li {
+
+::v-deep .el-pager li {
     background: none;
     color: #8c8c8c;
-  }
-  
-  ::v-deep .el-pagination .btn-next, ::v-deep .el-pagination .btn-prev {
+}
+
+::v-deep .el-pagination .btn-next,
+::v-deep .el-pagination .btn-prev {
     background: none;
-  }
-  .tabHeader{
+}
+
+.tabHeader {
     background: '#66B497';
     color: '#FFFFFF';
     letter-spacing: '4px';
+}
+
+.xl_d_button,
+
+.xl_d_button:focus {
+    background: rgb(255, 255, 255);
+    opacity: 1;
+    border-radius: 18px;
+    border: 1px solid #0FB577;
+    color: #0FB577;
+    /* border-radius: 18px; */
+    /* font-size: 14px; */
+    padding-left: 20px;
+    padding-right: 20px;
+    font-family: PingFang SC;
+    font-weight: 400;
+}
+.xl_d_button:hover{
+    background: #0FB577;
+    opacity: 1;
+    border-radius: 18px;
+    border: 1px solid #0FB577;
+    color: #ffffff;
+    /* border-radius: 18px; */
+    /* font-size: 14px; */
+    padding-left: 20px;
+    padding-right: 20px;
+    font-family: PingFang SC;
+    font-weight: 400;
+}
+.xl_input /deep/.el-input__inner {
+    width: 35.4vw;
+    line-height: 64px;
+    background: #eaeaea;
+    border-radius: 30px 30px 30px 30px !important;
+    opacity: 1;
+    box-sizing: border-box;
+    font-weight: 400;
+    color: #929292;
   }