整理

src/layout/character/characterForm.vue

@@ -1,6 +1,9 @@
 <template>
   <div id="characterForm">
     <el-row>
+      <el-col :span="24" class="top">
+        <span class="shu"></span><span class="title">{{ formTitle }}</span>
+      </el-col>
       <el-col :span="24" class="form">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
           <el-form-item label="角色名称" prop="name">
@@ -11,10 +14,13 @@
               <el-checkbox v-for="(item, index) in rolesList" :key="index" :label="item.name"></el-checkbox>
             </el-checkbox-group>
           </el-form-item>
-          <el-form-item>
-            <el-button size="small" @click="resetForm('ruleForm')">取消</el-button>
-            <el-button type="primary" size="small" @click="submitForm('ruleForm')">提交</el-button>
-          </el-form-item>
+
+          <el-col :span="24" class="clickBtn">
+            <el-form-item>
+              <el-button type="primary" size="small" @click="submitForm('ruleForm')">提交</el-button>
+              <el-button size="small" @click="resetForm('ruleForm')">取消</el-button>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-col>
     </el-row>
@@ -27,6 +33,7 @@ export default {
   props: {
     ruleForm: null,
     rolesList: null,
+    formTitle: null,
   },
   components: {},
   data: () => ({
@@ -49,7 +56,95 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.form {
-  padding: 0 200px 0 0;
+p {
+  padding: 0;
+  margin: 0;
+}
+.top .shu {
+  float: left;
+  width: 4px;
+  height: 20px;
+  background: rgba(233, 2, 29, 1);
+}
+.top .title {
+  float: left;
+  padding: 0 10px;
+  font-size: 16px;
+  font-family: Source Han Sans SC;
+  font-weight: bold;
+  color: rgba(40, 40, 40, 1);
+}
+/deep/.el-textarea__inner {
+  min-height: 100px !important;
+}
+/deep/.select {
+  width: 632px;
+}
+.selects {
+  width: 473px;
+  margin: 0 15px 0 0;
+}
+/deep/.el-radio__input.is-checked + .el-radio__label {
+  color: #e9021d;
+}
+/deep/.el-radio__input.is-checked .el-radio__inner {
+  border-color: #e9021d;
+  background: #e9021d;
+}
+/deep/.el-checkbox__input.is-checked + .el-checkbox__label {
+  color: #e9021d;
+}
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner,
+.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: #e9021d;
+  border-color: #e9021d;
+}
+/deep/.el-checkbox-button,
+.el-checkbox-button__inner {
+  margin: 0 15px 0 0;
+}
+/deep/.el-checkbox-button__inner {
+  padding: 7px 5px;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button__inner:hover {
+  color: #e9021d;
+}
+/deep/.el-checkbox-button:first-child .el-checkbox-button__inner {
+  border-left: 1px solid #ccc;
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button:last-child .el-checkbox-button__inner {
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button.is-checked .el-checkbox-button__inner {
+  color: #e9021d;
+  background-color: #ffffff;
+  border-color: #e9021d;
+}
+/deep/.el-checkbox-button.is-checked .el-checkbox-button__inner {
+  box-shadow: none;
+}
+/deep/.el-switch.is-checked .el-switch__core {
+  border-color: #e9021d;
+  background-color: #e9021d;
+}
+.clickBtn .el-button {
+  width: 100px;
+  height: 40px;
+  padding: 0;
+  color: #ffffff;
+  background: #b9b9b9;
+  border-radius: 4px;
+  margin: 40px;
+}
+.clickBtn {
+  text-align: center;
+  margin: 40px 0;
+  border-top: 1px solid #ccc;
+}
+.clickBtn .el-button:first-child {
+  background-color: #e9021d;
 }
 </style>

src/layout/character/characterList.vue

@@ -2,16 +2,38 @@
   <div id="characterList">
     <el-row>
       <el-col :span="24">
-        <el-table ref="debtTable" :data="debtTable" style="width: 100%" border>
+        <el-table
+          ref="debtTable"
+          :data="debtTable"
+          tooltip-effect="dark"
+          :default-sort="{ prop: 'date', order: 'descending' }"
+          style="width: 100%"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" align="center"> </el-table-column>
           <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
           <el-table-column property="name" label="角色名称" align="center"> </el-table-column>
           <el-table-column fixed="right" label="操作" align="center">
             <template slot-scope="scope">
               <el-button @click="$router.push({ path: '/character/detail', query: { id: scope.row.id } })" type="text"><i class="el-icon-edit"></i></el-button>
-              <el-button @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
+              <el-button class="delete" @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
             </template>
           </el-table-column>
         </el-table>
+
+        <el-row>
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="10"
+            background
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
+        </el-row>
       </el-col>
     </el-row>
   </div>
@@ -22,12 +44,24 @@ export default {
   name: 'characterList',
   props: {
     debtTable: null,
+    total: null,
   },
   components: {},
-  data: () => ({}),
+  data: () => ({
+    currentPage: 0,
+  }),
   created() {},
   computed: {},
   methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+    },
     deleteRow(id) {
       this.$emit('deleteRow', id);
     },
@@ -35,4 +69,38 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-table th {
+  background-color: #f5f6fa;
+  padding: 8px 0;
+}
+/deep/.el-table td {
+  padding: 11px 0;
+}
+.other {
+  color: #f36302;
+}
+.view {
+  color: #f36302;
+}
+.edit {
+  color: #2ccc02;
+}
+.delete {
+  color: #e9021d;
+}
+/deep/.el-pagination {
+  padding: 26px 20px;
+}
+/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: red;
+}
+</style>

src/layout/otheruser/otheruserForm.vue

@@ -1,6 +1,9 @@
 <template>
   <div id="otheruserForm">
     <el-row>
+      <el-col :span="24" class="top">
+        <span class="shu"></span><span class="title">{{ formTitle }}</span>
+      </el-col>
       <el-col :span="24" class="form">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
           <el-col :span="24">
@@ -47,6 +50,7 @@ export default {
   props: {
     ruleForm: null,
     charList: null,
+    formTitle: null,
   },
   components: {},
   data: () => ({

src/layout/region/regionForm.vue

@@ -1,6 +1,9 @@
 <template>
   <div id="characterForm">
     <el-row>
+      <el-col :span="24" class="top">
+        <span class="shu"></span><span class="title">{{ formTitle }}</span>
+      </el-col>
       <el-col :span="24" class="form">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
           <el-form-item label="地区名称" prop="name">
@@ -12,10 +15,13 @@
           <el-form-item label="排序" prop="order">
             <el-input v-model="ruleForm.order" placeholder="请输入排序"></el-input>
           </el-form-item>
-          <el-form-item>
-            <el-button size="small" @click="resetForm('ruleForm')">取消</el-button>
-            <el-button type="primary" size="small" @click="submitForm('ruleForm')">提交</el-button>
-          </el-form-item>
+
+          <el-col :span="24" class="clickBtn">
+            <el-form-item>
+              <el-button type="primary" size="small" @click="submitForm('ruleForm')">提交</el-button>
+              <el-button size="small" @click="resetForm('ruleForm')">取消</el-button>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-col>
     </el-row>
@@ -28,6 +34,7 @@ export default {
   props: {
     ruleForm: null,
     rolesList: null,
+    formTitle: null,
   },
   components: {},
   data: () => ({
@@ -49,7 +56,95 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.form {
-  padding: 0 200px 0 0;
+p {
+  padding: 0;
+  margin: 0;
+}
+.top .shu {
+  float: left;
+  width: 4px;
+  height: 20px;
+  background: rgba(233, 2, 29, 1);
+}
+.top .title {
+  float: left;
+  padding: 0 10px;
+  font-size: 16px;
+  font-family: Source Han Sans SC;
+  font-weight: bold;
+  color: rgba(40, 40, 40, 1);
+}
+/deep/.el-textarea__inner {
+  min-height: 100px !important;
+}
+/deep/.select {
+  width: 632px;
+}
+.selects {
+  width: 473px;
+  margin: 0 15px 0 0;
+}
+/deep/.el-radio__input.is-checked + .el-radio__label {
+  color: #e9021d;
+}
+/deep/.el-radio__input.is-checked .el-radio__inner {
+  border-color: #e9021d;
+  background: #e9021d;
+}
+/deep/.el-checkbox__input.is-checked + .el-checkbox__label {
+  color: #e9021d;
+}
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner,
+.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: #e9021d;
+  border-color: #e9021d;
+}
+/deep/.el-checkbox-button,
+.el-checkbox-button__inner {
+  margin: 0 15px 0 0;
+}
+/deep/.el-checkbox-button__inner {
+  padding: 7px 5px;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button__inner:hover {
+  color: #e9021d;
+}
+/deep/.el-checkbox-button:first-child .el-checkbox-button__inner {
+  border-left: 1px solid #ccc;
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button:last-child .el-checkbox-button__inner {
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button.is-checked .el-checkbox-button__inner {
+  color: #e9021d;
+  background-color: #ffffff;
+  border-color: #e9021d;
+}
+/deep/.el-checkbox-button.is-checked .el-checkbox-button__inner {
+  box-shadow: none;
+}
+/deep/.el-switch.is-checked .el-switch__core {
+  border-color: #e9021d;
+  background-color: #e9021d;
+}
+.clickBtn .el-button {
+  width: 100px;
+  height: 40px;
+  padding: 0;
+  color: #ffffff;
+  background: #b9b9b9;
+  border-radius: 4px;
+  margin: 40px;
+}
+.clickBtn {
+  text-align: center;
+  margin: 40px 0;
+  border-top: 1px solid #ccc;
+}
+.clickBtn .el-button:first-child {
+  background-color: #e9021d;
 }
 </style>

src/layout/region/regionList.vue

@@ -15,18 +15,11 @@
           <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
           <el-table-column property="name" label="地区名称" align="center"> </el-table-column>
           <el-table-column property="order" label="排序" align="center"> </el-table-column>
-          <!-- <el-table-column fixed="right" label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button @click="$router.push({ path: '/region/detail', query: { id: scope.row.id } })" type="text"><i class="el-icon-edit"></i></el-button>
-              <el-button @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col> -->
+
           <el-table-column label="操作" align="center" width="300px">
             <template slot-scope="scope">
               <el-button @click="$router.push({ path: '/region/detail', query: { id: scope.row.id } })" type="text"><i class="el-icon-edit"></i></el-button>
-              <el-button @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
+              <el-button class="delete" @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -53,18 +46,27 @@ export default {
   name: 'regionList',
   props: {
     debtTable: null,
+    total: null,
   },
   components: {},
-  data: () => ({}),
+  data: () => ({
+    currentPage: 0,
+  }),
   created() {},
   computed: {},
   methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
     deleteRow(id) {
       this.$emit('deleteRow', id);
     },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+    },
   },
 };
 </script>

src/views/character/detail.vue

@@ -3,14 +3,11 @@
     <el-row>
       <el-col :span="24" class="debt">
         <el-col :span="24" class="top">
-          <topInfo :topTitle="topTitle" :display="display"></topInfo>
+          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
-          <el-col :span="24" class="back">
-            <detailTop @goBack="goBack"></detailTop>
-          </el-col>
           <el-col :span="24" class="info">
-            <characterForm :ruleForm="ruleForm" :rolesList="rolesList" @submitForm="submitForm" @resetForm="resetForm"></characterForm>
+            <characterForm :ruleForm="ruleForm" :formTitle="formTitle" :rolesList="rolesList" @submitForm="submitForm" @resetForm="resetForm"></characterForm>
           </el-col>
         </el-col>
       </el-col>
@@ -19,8 +16,7 @@
 </template>
 
 <script>
-import topInfo from '@/layout/common/topInfo.vue';
-import detailTop from '@/layout/common/detailTop.vue';
+import detailTopInfo from '@/layout/common/detailTopInfo.vue';
 import characterForm from '@/layout/character/characterForm.vue';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: character } = createNamespacedHelpers('character');
@@ -29,12 +25,12 @@ export default {
   name: 'detail',
   props: {},
   components: {
-    topInfo, //头部导航
-    detailTop, //头部返回
     characterForm, //添加其他用户
+    detailTopInfo,
   },
   data: () => ({
-    display: 'none',
+    formTitle: '角色管理',
+    display: 'block',
     topTitle: '用户信息管理',
     ruleForm: {
       passwd: '123456',
@@ -113,18 +109,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
 }
 .main {
-  border-radius: 10px;
-  margin: 20px 0 0 0;
-  box-shadow: 0 0 3px #666;
-}
-.main .back {
-  padding: 10px 0 10px 15px;
+  min-height: 765px;
+  background: #ffffff;
+  padding: 20px;
 }
 </style>

src/views/character/index.vue

@@ -2,13 +2,15 @@
   <div id="index">
     <el-col :span="24" class="debt">
       <el-col :span="24" class="top">
-        <topInfo :topTitle="topTitle" :display="display" @clickBtn="clickBtn"></topInfo>
-      </el-col>
-      <el-col :span="24" class="search">
-        <searchInfo></searchInfo>
+        <topInfo :topTitle="topTitle" :display="display" @add="add"></topInfo>
       </el-col>
       <el-col :span="24" class="main">
-        <characterList :debtTable="debtTable" @deleteRow="deleteRow"></characterList>
+        <el-col :span="24" class="search">
+          <searchInfo></searchInfo>
+        </el-col>
+        <el-col :span="24" class="list">
+          <characterList :total="total" :debtTable="debtTable" @deleteRow="deleteRow"></characterList>
+        </el-col>
       </el-col>
     </el-col>
   </div>
@@ -29,6 +31,7 @@ export default {
     characterList, //角色列表
   },
   data: () => ({
+    total: 1,
     topTitle: '角色管理',
     display: 'block',
     debtTable: [],
@@ -45,7 +48,7 @@ export default {
       this.$set(this, `debtTable`, res.data);
     },
     // 添加
-    clickBtn() {
+    add() {
       this.$router.push({ path: '/character/detail' });
     },
     // 删除
@@ -59,10 +62,20 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
+}
+.main {
+  height: 765px;
+  background: #ffffff;
+}
+.search {
+  width: 97%;
+  height: 35px;
+  margin: 20px;
+}
+.list {
+  padding: 0 20px;
 }
 </style>

src/views/otheruser/detail.vue

@@ -7,13 +7,7 @@
           <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
-          <!-- <el-col :span="24" class="back">
-            <detailTop @goBack="goBack"></detailTop>
-          </el-col> -->
-          <!-- <el-col :span="24" class="info">
-            <otheruserForm :ruleForm="ruleForm" :charList="charList" @submitForm="submitForm" @resetForm="resetForm"></otheruserForm>
-          </el-col> -->
-          <otheruserForm :ruleForm="ruleForm" :charList="charList" @submitForm="submitForm" @resetForm="resetForm" :formTitle="formTitle"></otheruserForm>
+          <otheruserForm :ruleForm="ruleForm" :formTitle="formTitle" :charList="charList" @submitForm="submitForm" @resetForm="resetForm"></otheruserForm>
         </el-col>
       </el-col>
     </el-row>
@@ -37,7 +31,8 @@ export default {
   data: () => ({
     topTitle: '用户信息管理',
     display: 'block',
-    formTitle: '信息管理',
+
+    formTitle: '其他用户管理',
     ruleForm: {
       passwd: '123456',
       characterid: '',

src/views/region/detail.vue

@@ -3,14 +3,11 @@
     <el-row>
       <el-col :span="24" class="debt">
         <el-col :span="24" class="top">
-          <topInfo :topTitle="topTitle" :display="display"></topInfo>
+          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
-          <el-col :span="24" class="back">
-            <detailTop @goBack="goBack"></detailTop>
-          </el-col>
           <el-col :span="24" class="info">
-            <regionForm :ruleForm="ruleForm" :rolesList="rolesList" @submitForm="submitForm" @resetForm="resetForm"></regionForm>
+            <regionForm :ruleForm="ruleForm" :formTitle="formTitle" @submitForm="submitForm" @resetForm="resetForm"></regionForm>
           </el-col>
         </el-col>
       </el-col>
@@ -19,7 +16,7 @@
 </template>
 
 <script>
-import topInfo from '@/layout/common/topInfo.vue';
+import detailTopInfo from '@/layout/common/detailTopInfo.vue';
 import detailTop from '@/layout/common/detailTop.vue';
 import regionForm from '@/layout/region/regionForm.vue';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
@@ -28,13 +25,14 @@ export default {
   name: 'detail',
   props: {},
   components: {
-    topInfo, //头部导航
-    detailTop, //头部返回
+    detailTopInfo, //头部导航
+
     regionForm, //添加其他用户
   },
   data: () => ({
-    display: 'none',
+    display: 'block',
     topTitle: '用户信息管理',
+    formTitle: '地区管理',
     ruleForm: {
       passwd: '123456',
       roles: [],
@@ -42,7 +40,6 @@ export default {
   }),
   created() {
     this.searchInfo();
-    this.searchRole();
   },
   computed: {
     id() {
@@ -98,18 +95,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
 }
 .main {
-  border-radius: 10px;
-  margin: 20px 0 0 0;
-  box-shadow: 0 0 3px #666;
-}
-.main .back {
-  padding: 10px 0 10px 15px;
+  min-height: 765px;
+  background: #ffffff;
+  padding: 20px;
 }
 </style>

src/views/region/index.vue

@@ -2,7 +2,7 @@
   <div id="index">
     <el-col :span="24" class="debt">
       <el-col :span="24" class="top">
-        <topInfo :topTitle="topTitle" :display="display" @clickBtn="clickBtn"></topInfo>
+        <topInfo :topTitle="topTitle" :display="display" @add="add"></topInfo>
       </el-col>
       <el-col :span="24" class="main">
         <el-col :span="24" class="search">
@@ -10,7 +10,7 @@
         </el-col>
 
         <el-col :span="24" class="list">
-          <regionList :debtTable="debtTable" @deleteRow="deleteRow"></regionList>
+          <regionList :debtTable="debtTable" :total="total" @deleteRow="deleteRow"></regionList>
         </el-col>
       </el-col>
     </el-col>
@@ -34,6 +34,7 @@ export default {
   data: () => ({
     topTitle: '角色管理',
     display: 'block',
+    total: 0,
     debtTable: [],
   }),
   created() {
@@ -48,7 +49,7 @@ export default {
       this.$set(this, `debtTable`, res.data);
     },
     // 添加
-    clickBtn() {
+    add() {
       this.$router.push({ path: '/region/detail' });
     },
     // 删除