Explorar o código

Merge branch 'master' of http://git.cc-lotus.info/lrf402788946/llh_project

lrf402788946 %!s(int64=6) %!d(string=hai) anos
pai
achega
2030cea405

+ 9 - 0
.project

@@ -24,5 +24,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1564016974443</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

BIN=BIN
src/assets/1.jpg


+ 1 - 1
src/components/SideBar.vue

@@ -8,7 +8,7 @@
       <el-menu-item index="/404">404</el-menu-item>
       <el-menu-item index="/user">用户管理</el-menu-item>
       <el-menu-item index="/views/certificate/index">凭证管理</el-menu-item>
-      <el-menu-item index="/account/register">账号管理</el-menu-item>
+      <el-menu-item index="/views/account/register">账号管理</el-menu-item>
       <el-submenu index="">
         <template #title>
           权限管理

+ 1 - 1
src/router.js

@@ -33,7 +33,7 @@ export default new Router({
           component: () => import('./views/certificate/index.vue'),
         },
         {
-          path: '/account/register',
+          path: '/views/account/register',
           name: 'register',
           component: () => import('./views/account/register.vue'),
         },

+ 0 - 3
src/views/account/register.vue

@@ -52,9 +52,6 @@
     </el-row>
     <el-dialog title="编辑账号" :visible.sync="editFormVisible">
       <el-form :model="editForm" label-width="80px" ref="editForm">
-        <el-form-item label="日期" prop="date">
-          <el-input v-model="editForm.date"></el-input>
-        </el-form-item>
         <el-form-item label="名称" prop="name">
           <el-input v-model="editForm.name"></el-input>
         </el-form-item>

+ 1 - 1
src/views/certificate/index.vue

@@ -28,7 +28,7 @@
             <template v-slot="scoped">
               <el-button icon="el-icon-edit" @click="dialogFormVisible = true">修改</el-button>
               <el-button v-if="scoped.row.state == 1" type="danger" icon="el-icon-delete" @click="open1(scoped.$index)">注销</el-button>
-              <el-button v-if="scoped.row.state == 0" type="danger" icon="el-icon-delete" @click="open2(scoped.$index)">恢复</el-button>
+              <el-button v-if="scoped.row.state == 0" type="success" icon="el-icon-setting" @click="open2(scoped.$index)">恢复</el-button>
             </template>
           </el-table-column>
         </el-table>

+ 6 - 4
src/views/login.vue

@@ -1,11 +1,13 @@
 <template lang="html">
   <div id="login">
-    <body :style="'overflow-y: auto;background-image: url(' + img.bg + '); background-repeat:no-repeat; background-size:auto;'">
+    <body :style="'overflow-y: auto;background: url(' + img.bg + ')center no-repeat;'">
       <div class="page-container">
         <div>
-          <h1 style="letter-spacing:4px; padding-bottom:20px; font-weight:bold; color:#fff;">信任管理系统</h1>
+          <h1 style="letter-spacing:4px; padding-bottom:20px; font-weight:bold; color:#fff;">
+            <img src="https://img.alicdn.com/tfs/TB13UQpnYGYBuNjy0FoXXciBFXa-242-134.png" width="40" style="margin-right:10px;" />信任管理系统
+          </h1>
         </div>
-        <el-form :model="form" :rules="rules" ref="form" style="background:#ffffff;padding:5% 2%;" class="row">
+        <el-form :model="form" :rules="rules" ref="form" style="background:#fff;padding:5% 2%;" class="row">
           <el-row>
             <el-col :span="24" style="margin-top:3%;">
               <el-form-item prop="login_id">
@@ -48,7 +50,7 @@ export default {
   data() {
     return {
       img: {
-        bg: require('@/assets/timg.jpg'),
+        bg: require('@/assets/1.jpg'),
       },
       form: {},
       rules: {