修改样式解决打包后部分样式被覆盖

sso-manage-console-web/src/components/accounts/appeals/AppealHome.vue

@@ -49,8 +49,7 @@
       style="width: 100%">
       <el-table-column
         label="操作"
-        width="130"
-        align="center">
+        width="120">
         <template slot-scope="scope">
           <el-button type="text" size="small" v-if="scope.row.status === 1" @click="approveRequest(scope.row)">审批</el-button>
           <el-button type="text" size="small" v-else @click="showDetail(scope.row)">查看</el-button>

sso-manage-console-web/src/components/accounts/common/CommonHome.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="common-list-page">
     <el-container>
       <el-header>
         <el-row type="flex" class="row-bg" justify="space-between">
@@ -171,78 +171,78 @@
 
 <style>
   /* screen select */
-  .appeal-conditions div label {
+  .common-list-page .appeal-conditions div label {
     margin: 0 14px 0 28px;
     color: #000000;
     font-size: 13px;
     font-family: "Microsoft YaHei", sans-serif;
   }
-  .appeal-conditions div label:first-child {
+  .common-list-page .appeal-conditions div label:first-child {
     margin-left: 0;
   }
   /* element ui */
-  .el-select .el-input .el-input__inner {
+  .common-list-page .el-select .el-input .el-input__inner {
     color: #505050;
     font-size: 13px;
     font-family: "Microsoft YaHei", sans-serif;
   }
-  .el-select .el-input input.el-input__inner::-webkit-input-placeholder {
+  .common-list-page .el-select .el-input input.el-input__inner::-webkit-input-placeholder {
     color: #505050;
     font-size: 13px;
     font-family: "Microsoft YaHei", sans-serif;
   }
-  .el-select .el-input input.el-input__inner:-moz-placeholder {
+  .common-list-page .el-select .el-input input.el-input__inner:-moz-placeholder {
     color: #505050;
     font-size: 13px;
     font-family: "Microsoft YaHei", sans-serif;
   }
-  .el-select .el-input input.el-input__inner::-moz-placeholder {
+  .common-list-page .el-select .el-input input.el-input__inner::-moz-placeholder {
     color: #505050;
     font-size: 13px;
     font-family: "Microsoft YaHei", sans-serif;
   }
-  .el-select .el-input input.el-input__inner:-ms-input-placeholder {
+  .common-list-page .el-select .el-input input.el-input__inner:-ms-input-placeholder {
     color: #505050;
     font-size: 13px;
     font-family: "Microsoft YaHei", sans-serif;
   }
-  .appeal-conditions .el-input .el-input__inner {
+  .common-list-page .appeal-conditions .el-input .el-input__inner {
     height: 32px;
     width: 100px;
     border-radius: 0;
   }
-  .search-conditions .el-input .el-input__inner {
+  .common-list-page .search-conditions .el-input .el-input__inner {
     height: 32px;
     width: 120px;
     border-radius: 0;
   }
-  .el-pagination button, .el-pagination span:not([class*=suffix]) {
+  .common-list-page .el-pagination button, .el-pagination span:not([class*=suffix]) {
     color: #000000;
     font-weight: normal;
   }
-  .el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li {
+  .common-list-page .el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li {
     font-weight: normal;
   }
-  .el-pagination.is-background .el-pager li.active {
+  .common-list-page .el-pagination.is-background .el-pager li.active {
     background-color: #303743;
     color: #fff;
   }
-  .el-table th.is-leaf:first-child {
+  .common-list-page .el-table th.is-leaf:first-child {
     padding-left: 40px;
   }
-  .el-table--enable-row-transition .el-table__body td:first-child {
+  .common-list-page .el-table--enable-row-transition .el-table__body td:first-child {
     padding-left: 40px;
   }
-  .el-table th>.cell {
+  .common-list-page .el-table th>.cell {
     color: #000000;
     font-size: 13px;
     font-weight: normal;
     font-family: "Microsoft YaHei", sans-serif;
   }
-  .el-table th {
+  .common-list-page .el-table th {
     padding: 9px 0 8px;
   }
-  .el-table--enable-row-hover .el-table__body tr:hover>td {
+  .common-list-page .el-table--enable-row-hover .el-table__body tr:hover>td {
     background-color: #D0E5F5;
 
     color: #000000;
@@ -250,20 +250,20 @@
     font-family: "Microsoft YaHei", sans-serif;
   }
   /* striped row */
-  .el-table--enable-row-hover .el-table__body tr.el-table__row--striped:hover>td {
+  .common-list-page .el-table--enable-row-hover .el-table__body tr.el-table__row--striped:hover>td {
     background-color: #D0E5F5;
 
     color: #000000;
     font-size: 13px;
     font-family: "Microsoft YaHei", sans-serif;
   }
-  .el-table td {
+  .common-list-page .el-table td {
     padding: 4px 0;
 
     font-size: 13px;
     font-family: "Microsoft YaHei", sans-serif;
   }
-  .el-table--striped .el-table__body tr.el-table__row--striped td {
+  .common-list-page .el-table--striped .el-table__body tr.el-table__row--striped td {
     background: #F4F4F4;
   }
 </style>

sso-manage-console-web/src/components/common/DataList.vue

@@ -1,20 +0,0 @@
-<template>
-  <div>
-    <slot>
-      <div class="x-empty" style="display: block;">
-        <i class="fa fa-coffee"></i>
-        <p>这里很干净！</p>
-      </div>
-    </slot>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'DataList'
-  }
-</script>
-
-<style scoped>
-
-</style>

sso-manage-console-web/src/components/common/NavBar.vue

@@ -1,36 +0,0 @@
-<template>
-  <nav class="x-navigation">
-    <div class="container">
-      <div class="navbar-header">
-        <a class="navbar-brand" href="#">控制台</a>
-      </div>
-      <div class="collapse navbar-collapse">
-        <ul class="x-menu">
-          <!-- 激活<a>标签外层元素 -->
-          <router-link tag="li" active-class="nav-current" to="/" exact><a>首页</a></router-link>
-          <router-link tag="li" active-class="nav-current" to="/app"><a>应用管理</a></router-link>
-          <router-link tag="li" active-class="nav-current" to="/user_space"><a>企业管理</a></router-link>
-          <router-link tag="li" active-class="nav-current" to="/user"><a>用户管理</a></router-link>
-          <router-link tag="li" active-class="nav-current" to="/admin"><a>更换管理员</a></router-link>
-          <router-link tag="li" active-class="nav-current" to="/asset"><a>资源管理</a></router-link>
-          <router-link tag="li" active-class="nav-current" to="/settings"><a>设置</a></router-link>
-        </ul>
-      </div>
-    </div>
-  </nav>
-</template>
-
-<script>
-  export default {
-    name: 'NavBar',
-    computed: {
-      nav_current () {
-        console.log(this.$store)
-      }
-    }
-  }
-</script>
-
-<style>
-
-</style>

sso-manage-console-web/src/components/common/NavHeader.vue

@@ -14,7 +14,7 @@
       <!-- Links -->
       <div class="collapse navbar-collapse">
         <ul class="nav navbar-nav navbar-left">
-          <router-link tag="li" active-class="active" to="/index"><a>首页</a></router-link>
+          <router-link tag="li" active-class="active" to="/" exact><a>首页</a></router-link>
           <router-link tag="li" active-class="active" to="/accounts"><a>账户管理</a></router-link>
           <router-link tag="li" active-class="active" to="/system"><a>系统</a></router-link>
           <router-link tag="li" active-class="active" to="/content"><a>内容</a></router-link>

sso-manage-console-web/src/components/common/PageBar.vue

@@ -1,98 +0,0 @@
-<template>
-  <!-- pagination start -->
-  <div class="x-mod-footer">
-    <div class="text-center" v-show="total > 0">
-      <!-- 0 < page <= 8 -->
-      <ul class="pagination pull-right" v-if="showFirstKindPageNumbersBar">
-        <li v-if="pageParams.page > 1"><a @click="jumpPage(pageParams.page - 1)">上一页</a></li>
-        <li :class="{active: 1 === pageParams.page}"><a role="page" @click="jumpPage(1)">1</a></li>
-        <li v-for="num in numbersOnePage" :class="{active: num === pageParams.page}"><a role="page" @click="jumpPage(num)">{{num}}</a></li>
-        <li v-if="totalPages > 8"><a>...</a></li>
-        <li v-if="totalPages > 8"><a v-text="totalPages" @click="jumpPage(totalPages)"></a></li>
-        <li v-if="pageParams.page < totalPages"><a @click="jumpPage(pageParams.page + 1)">下一页</a></li>
-      </ul>
-      <!-- 8 < page <= (totalPages - totalPages % 8) -->
-      <ul class="pagination pull-right" v-if="showSecondKindPageNumbersBar">
-        <li v-if="pageParams.page > 1"><a @click="jumpPage(pageParams.page - 1)">上一页</a></li>
-        <li><a role="page" @click="jumpPage(1)">1</a></li>
-        <li><a>...</a></li>
-        <li v-for="num in numbersOnePage" :class="{active: num === pageParams.page}"><a role="page" @click="jumpPage(num)">{{num}}</a></li>
-        <li><a>...</a></li>
-        <li><a role="page" @click="jumpPage(totalPages)">{{totalPages}}</a></li>
-        <li v-if="pageParams.page < totalPages"><a @click="jumpPage(pageParams.page + 1)">下一页</a></li>
-      </ul>
-      <!-- (totalPages - totalPages % 8) < page <= totalPages -->
-      <ul class="pagination pull-right" v-if="showThirdKindPageNumbersBar">
-        <li v-if="pageParams.page > 1"><a @click="jumpPage(pageParams.page - 1)">上一页</a></li>
-        <li><a role="page" @click="jumpPage(1)">1</a></li>
-        <li><a>...</a></li>
-        <li v-for="num in numbersOnePage" :class="{active: num === pageParams.page}"><a role="page" @click="jumpPage(num)">{{num}}</a></li>
-        <!--<li><a role="page">{{totalPages}}</a></li>-->
-        <li v-if="pageParams.page < totalPages"><a @click="jumpPage(pageParams.page + 1)">下一页</a></li>
-      </ul>
-    </div>
-  </div>
-  <!-- pagination end -->
-</template>
-
-<script>
-import _ from 'lodash'
-
-export default {
-  name: 'PageBar',
-  props: {
-    pageParams: Object,
-    totalPages: Number,
-    total: Number
-  },
-  computed: {
-    lastPageNumber () {
-      return this.totalPages % 8 !== 0 ? this.totalPages - this.totalPages % 8 : this.totalPages - 8
-    },
-    showFirstKindPageNumbersBar () {
-      if (this.totalPages <= 8) {
-        return true
-      }
-      return this.pageParams.page > 0 && this.pageParams.page <= 8
-    },
-    showSecondKindPageNumbersBar () {
-      if (this.totalPages <= 16) {
-        return false
-      }
-      return this.pageParams.page > 8 && this.pageParams.page <= this.lastPageNumber
-    },
-    showThirdKindPageNumbersBar () {
-      if (this.totalPages <= 8) {
-        return false
-      }
-      return this.pageParams.page > this.lastPageNumber && this.pageParams.page <= this.totalPages
-    },
-    numbersOnePage () {
-      const page = this.pageParams.page - 1
-
-      if (this.pageParams.page > 0 && this.pageParams.page <= 8) {
-        const max = this.totalPages > 8 ? 9 : this.totalPages + 1
-        return _.range(2, max)
-      }
-      if (this.pageParams.page > 8 && this.pageParams.page <= this.lastPageNumber) {
-        const min = page - page % 8
-        return _.range(min + 1, min + 1 + 8)
-      }
-      if (this.pageParams.page > this.lastPageNumber && this.pageParams.page <= this.totalPages) {
-        const min = page - page % 8
-        return _.range(min + 1, this.totalPages + 1)
-      }
-    }
-  },
-  methods: {
-    jumpPage (page) {
-      this.$emit('changePage', page)
-      console.log('changePage', page)
-    }
-  }
-}
-</script>
-
-<style>
-
-</style>

sso-manage-console-web/src/components/common/SearchDialog.vue

@@ -1,55 +0,0 @@
-<template>
-  <!-- Title with search dialog -->
-  <h2 class="btn-group">
-    <span class="btn btn-lg x-btn-search" @click="visible = !visible">
-      <i class="fa fa-search"></i>
-      <span v-text="title">企业</span>
-    </span>
-    <div class="dropdown-menu" id="searchlist" style="padding: 15px; width: 240px; display: block;" v-if="visible">
-      <form>
-        <slot></slot>
-        <div class="form-group">
-          <div>
-            <label>分页设置</label>
-          </div>
-          <label class="radio-inline" v-for="pageSize in pageSizes"><input type="radio" name="pageSize" :value="pageSize" :checked="checked === pageSize" @change="$emit('change', $event.target.value)"> {{pageSize}}
-          </label>
-        </div>
-        <button class="btn btn-default btn-block btn-search" type="button" @click="beginSearch()">搜索</button>
-      </form>
-    </div>
-  </h2>
-</template>
-
-<script>
-  export default {
-    name: 'SearchDialog',
-    props: {
-      title: String,
-      pageSizes: Array,
-      checked: {
-        type: Number,
-        default: 0
-      }
-    },
-    model: {
-      prop: 'checked',
-      event: 'change'
-    },
-    data () {
-      return {
-        visible: false
-      }
-    },
-    methods: {
-      beginSearch () {
-        this.visible = false
-        this.$emit('search')
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>

sso-manage-console-web/src/components/common/index.js

@@ -1,9 +1,5 @@
-import SearchDialog from './SearchDialog'
-import DataList from './DataList'
 import NavHeader from './NavHeader'
 
 export {
-  SearchDialog,
-  DataList,
   NavHeader
 }

sso-manage-console-web/src/store/modules/enterprises.js

@@ -1,4 +1,3 @@
-import _ from 'lodash'
 import axios from '@/assets/js/axios'
 import * as types from '../mutation-types'