平台后台用户重构

config/prod.env.js

@@ -4,6 +4,8 @@ module.exports = {
  ENV_CONFIG:'"prod"',
  PLAT_ID: '"F5DEA8EDB12E421A9FC4B701BB6176A6"',
  BASE_API: '""',
  XT_API: '"http://www.xttjpt.cn"',
  KX_API: '"https://www.ekexiu.com"'
  // XT_API: '"http://www.xttjpt.cn"',
  // KX_API: '"https://www.ekexiu.com"'
  XT_API: '"http://192.168.3.233:84"',
  KX_API: '"http://192.168.3.233:81"'
}

src/components/CityPicker/index.vue

@@ -27,19 +27,6 @@
          </el-option>
        </el-select>
      </el-col>
      <!-- <el-col :span="8">
        <el-select
          v-model="qu"
          @change="choseBlock"
          placeholder="区(县)">
          <el-option
            v-for="item in areaArr"
            :key="item.id"
            :label="item.value"
            :value="item.id">
          </el-option>
        </el-select>
      </el-col> -->
    </el-row>
  </div>
</template>
@@ -49,15 +36,10 @@ export default {
  props: ['addrCode'],
  data() {
    return {
      firstFlag: false,
      provinceArr: [],
      cityArr: [],
      sheng: '',
      shi: '',
      // qu: '',
      // areaArr: [],
      city: '',
      block: ''
      shi: ''
    }
  },
  watch: {
@@ -89,13 +71,14 @@ export default {
              if (!p.defaultChild) {
                p.defaultChild = p.children[item.code]
              }
            } else {
              var pp = that.provinceArr[item.code.slice(0, 2) + '0000'].children[item.code.slice(0, 4) + '00']
              pp.children[item.code] = { id: item.code, value: item.caption }
              if (!pp.defaultChild) {
                pp.defaultChild = pp.children[item.code]
              }
            }
            //  else {
            //   var pp = that.provinceArr[item.code.slice(0, 2) + '0000'].children[item.code.slice(0, 4) + '00']
            //   pp.children[item.code] = { id: item.code, value: item.caption }
            //   if (!pp.defaultChild) {
            //     pp.defaultChild = pp.children[item.code]
            //   }
            // }
          })
        } else {
          console.log(dictData.status)
@@ -105,46 +88,31 @@ export default {
    choseProvince: function(e) {
      var p = this.provinceArr[e]
      this.cityArr = p.children
      this.sheng = p.value
      this.shi = p.defaultChild.value
      // this.areaArr = p.defaultChild.children
      // this.qu = p.defaultChild.defaultChild.value
      this.E = p.defaultChild.id
      this.sheng = p.value
      this.$emit('paren', this.E)
      this.$emit('parenStr', this.shi)
    },
    choseCity: function(e) {
      var p = this.provinceArr[e.slice(0, 2) + '0000'].children[e]
      this.shi = p.value
      // this.areaArr = p.children
      // this.qu = p.defaultChild.value
      this.E = p.id
      this.shi = p.value
      this.$emit('paren', this.E)
      this.$emit('parenStr', this.shi)
    },
    // choseBlock: function(e) {
    //   this.qu = this.provinceArr[e.slice(0, 2) + '0000'].children[e.slice(0, 4) + '00'].children[e].value
    //   this.E = e
    //   this.$emit('paren', this.E)
    // },
    initpsq: function() {
      if (!this.addrCode) {
        this.sheng = ''
        this.shi = ''
        // this.qu = ''
        return
      }
      const s = this.addrCode.substring(0, 2) + '0000'
      const si = this.addrCode.substring(0, 4) + '00'
      // const x = this.addrCode
      var p = this.provinceArr[s]
      this.sheng = p.value
      this.shi = p.children[si].value
      // this.qu = p.children[si].children[x].value
    }
  }
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
</style>

src/router/index.js

@@ -86,10 +86,26 @@ export const asyncRouterMap = [
      meta: { title: '系统设置' },
      children: [
        {
          path: 'adminUser',
          component: () => import('@/views/sysSetting/adminUser'),
          name: 'adminUser',
          meta: { title: '平台后台用户管理列表' }
          path: 'platUser',
          component: () => import('@/views/sysSetting/platUser/index'),
          name: 'platUser',
          redirect: { name: 'normalList' },
          alwaysShow: true,
          meta: { title: '后台用户' },
          children: [
            {
              path: 'normalList',
              component: () => import('@/views/sysSetting/platUser/normal'),
              name: 'normalList',
              meta: { title: '正常账号' }
            },
            {
              path: 'forbiddenList',
              component: () => import('@/views/sysSetting/platUser/forbidden'),
              name: 'forbiddenList',
              meta: { title: '停用账号' }
            }
          ]
        }
      ]
    },
@@ -162,6 +178,7 @@ export const asyncRouterMap = [
      children: [
        {
          path: 'expertslist',
          name: 'expertslist',
          component: () => import('@/views/specialExperts/index'),
          meta: { title: '特约专家列表' }
        }
@@ -256,7 +273,6 @@ export const asyncRouterMap = [
      component: Layout,
      name: 'userinfo',
      redirect: 'noredirect',
      alwaysShow: true,
      meta: { title: '用户信息' },
      children: [
        {

src/styles/sidebar.scss

@@ -47,10 +47,10 @@
    height: 100%;
    position: fixed;
    font-size: 0px;
    top: 50px;
    top: 0;
    padding-top:50px;
    bottom: 0;
    left: 0;
    padding-bottom: 50px;
    z-index: 1001;
    overflow: hidden;
    background-color: $menuBg;

src/views/companyCen/noactive/compProduct.vue

@@ -100,8 +100,7 @@ export default {
        {
          prop: 'name',
          tit: '产品名称',
          link: true,
          width: '200'
          link: true
        },
        {
          prop: 'spec',

src/views/demandCen/preview.vue

@@ -25,7 +25,7 @@
          <el-col :span="12">
            <el-form-item label="需求方名称" prop="linkOrg">
              <span v-if="readonlyShow">{{ruleFormDem.linkOrg}}</span>
              <el-input v-else v-model="ruleFormDem.linkOrg" placeholder="建议填写您的企业名称" maxlength="50"></el-input>
              <el-input v-else v-model="ruleFormDem.linkOrg" placeholder="请填写需求方企业名称" maxlength="50"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">

src/views/layout/components/Sidebar/SidebarItem.vue

@@ -15,13 +15,13 @@
        </template>
        <template v-for="child in item.children" v-if="!child.hidden">
          <div v-if="child.children&&child.children.length>0">
          <!-- <div v-if="child.children&&child.children.length>0">
            <sidebar-item v-if="!child.parentPath" :is-nest="true" class="nest-menu" :item="child" :key="child.path" :base-path="resolvePath(child.path)"></sidebar-item>
            <router-link v-else :to="resolvePath(child.path)">
              <sidebar-item :is-nest="true" class="nest-menu" :item="child" :key="child.path" :base-path="resolvePath(child.path)" ></sidebar-item>
            </router-link>
          </div>
            <router-link v-else :to="resolvePath(child.path)"> -->
          <sidebar-item :is-nest="true" class="nest-menu" v-if="child.children&&child.children.length>0" :item="child" :key="child.path" :base-path="resolvePath(child.path)" ></sidebar-item>
            <!-- </router-link>
          </div> -->
          <router-link v-else :to="resolvePath(child.path)" :key="child.name" replace>
            <el-menu-item :index="resolvePath(child.path)">

src/views/sysSetting/editUser.vue

@@ -19,7 +19,7 @@
          <el-form-item v-if="!readonlyShow && !item.right" :label="item.tit" :prop="item.prop">
            <el-input v-model="userForm[item.prop]" :placeholder="`请填写${item.tit}`" :maxlength="item.num||''"></el-input>
          </el-form-item>
          <el-form-item v-if="item.right" :prop="item.prop" label-width="0">
          <el-form-item v-if="operateM.type==='right' && item.right" :prop="item.prop" label-width="0">
            <template>
              <el-card shadow="never">
                <div class="card-title" slot="header">
@@ -36,7 +36,6 @@
            </template>
          </el-form-item>
        </el-col>
        <el-col :span="24"><div class="form-line"></div></el-col>
        <el-col :span="24" class="el-btn-col">
          <div class="el-btn-col-box">
            <el-button type="primary" @click="submitForm('userForm')">保存</el-button>

src/views/sysSetting/platUser/forbidden.vue

@@ -0,0 +1,162 @@
<template>
  <div class="app-container">
    <div class="box-container">
      <div class="contain-title">停用账号列表</div>
    </div>
    <div class="content-container">
      <el-table
        :data="tableData"
        height="630"
        v-loading="tableLoading"
        border>
        <el-table-column
          v-for="item in tableItem"
          :key="item.index"
          :prop="item.prop ? item.prop : ''"
          :label="item.tit ? item.tit : ''"
          :width="item.width ? item.width : ''"
          align="center">
          <template slot-scope="scope">
            <div v-if="scope.row[item.prop]">
              <div v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</div>
            </div>
            <div class="operate-row" v-if="item.operate && typeof scope.row === 'object'">
              <el-button
                size="medium"
                type="primary"
                @click="handleRenew(scope.row.id)">恢复</el-button>
            </div>
          </template>
        </el-table-column>
      </el-table>
      <div class="pagination-container">
        <el-pagination
          background
          @current-change="handleCurrentChange"
          :current-page.sync="pageNo"
          :page-size="pageSize"
          layout="prev, pager, next, jumper"
          :total="total">
        </el-pagination>
      </div>
    </div>
  </div>
</template>
<script>
  import { parseTime } from '@/utils'
  import comTable from '@/utils/comTable'
  import {
    pageQueryUser,
    renewUser
  } from '@/api/sysSetting'
  export default {
    data() {
      return {
        searchText: '',
        operateM: {},
        pageSize: 10,
        pageNo: 1,
        total: 0,
        tableData: [],
        tableLoading: true,
        tableItem: [
          {
            prop: 'account',
            tit: '账号',
            link: true
          },
          {
            prop: 'name',
            tit: '用户名'
          },
          {
            prop: 'job',
            tit: '职位'
          },
          {
            prop: 'comp',
            tit: '所在部门'
          },
          {
            prop: 'dep',
            tit: '所在机构'
          },
          {
            prop: 'phone',
            tit: '联系电话',
            width: '160'
          },
          {
            prop: 'email',
            tit: '联系邮箱',
            width: '160'
          },
          {
            prop: 'createTime',
            tit: '创建时间',
            width: '160'
          },
          {
            prop: 'invalidTime',
            tit: '停用时间',
            width: '160'
          },
          {
            operate: true,
            width: '160'
          }
        ]
      }
    },
    created() {
      this.pageQueryUser()
    },
    methods: {
      pageQueryUser() {
        var that = this
        that.$http.get(pageQueryUser, {
          actived: 0,
          pageSize: that.pageSize,
          pageNo: that.pageNo
        }, function(res) {
          that.tableLoading = false
          if (res.success && res.data) {
            const obj = res.data.data
            if (obj.length) {
              for (let i = 0; i < obj.length; ++i) {
                if (obj[i].createTime) {
                  obj[i].createTime = parseTime(obj[i].createTime)
                }
                if (obj[i].invalidTime) {
                  obj[i].invalidTime = parseTime(obj[i].invalidTime)
                }
              }
            }
            that.total = res.data.total
            that.tableData = obj
            comTable.gapFilling(that.tableData)
          } else {
            that.total = 0
            that.tableData = []
          }
        })
      },
      handleCurrentChange(val) {
        this.pageNo = val
        this.pageQueryUser()
      },
      handleRenew(id) {
        var that = this
        this.$http.get(renewUser, {
          id: id
        }, function(res) {
          if (res.success) {
            that.pageQueryUser()
          }
        })
      }
    }
  }
</script>

src/views/sysSetting/platUser/index.vue

@@ -0,0 +1,6 @@
<template>
  <div>
    <router-view></router-view>
  </div>
</template>

src/views/sysSetting/adminUser.vue

@@ -1,21 +1,12 @@
<template>
  <div class="app-container">
    <div class="box-container">
      <div class="contain-title">平台后台用户管理列表</div>
      <div class="contain-title">正常账号列表</div>
      <div class="contian-operate">
        <el-button type="primary" @click="handleAdd">添加</el-button>
      </div>
    </div>
    <div class="content-container">
      <div class="contain-select">
        <span>用户分类：</span>
        <el-select
          v-model="selectMode"
          @change="selectChange">
          <el-option label="正常账号" value="1" selected></el-option>
          <el-option label="停用账号" value="0"></el-option>
        </el-select>
      </div>
      <el-table
        :data="tableData"
        height="630"
@@ -37,30 +28,22 @@
              </div>
            </div>
            <div class="operate-row" v-if="item.operate && typeof scope.row === 'object'">
              <div class="normal" v-if="scope.row.actived">
                <el-button
                  size="medium"
                  type="primary"
                  @click="handleEdit(scope.row.id)">修改</el-button>
                <el-button
                  size="medium"
                  type="primary"
                  @click="handleResetpw(scope.row)">重置密码</el-button>
                <el-button
                  size="medium"
                  type="danger"
                  @click="handleBan(scope.row.id)">停用</el-button>
                <el-button
                  size="medium"
                  type="primary"
                  @click="handleRight(scope.row.id)">分配权限</el-button>
              </div>
              <div class="forbidden" v-else>
                <el-button
                  size="medium"
                  type="primary"
                  @click="handleRenew(scope.row.id)">恢复</el-button>
              </div>
              <el-button
                size="medium"
                type="primary"
                @click="handleEdit(scope.row.id)">修改</el-button>
              <el-button
                size="medium"
                type="primary"
                @click="handleResetpw(scope.row)">重置密码</el-button>
              <el-button
                size="medium"
                type="danger"
                @click="handleBan(scope.row.id)">停用</el-button>
              <el-button
                size="medium"
                type="primary"
                @click="handleRight(scope.row.id)">分配权限</el-button>
            </div>
          </template>
        </el-table-column>
@@ -86,8 +69,7 @@
  import {
    pageQueryUser,
    resetPw,
    banUser,
    renewUser
    banUser
  } from '@/api/sysSetting'
  import editUser from './editUser'
@@ -95,7 +77,6 @@
    data() {
      return {
        searchText: '',
        selectMode: '1',
        operateM: {},
        pageSize: 10,
        pageNo: 1,
@@ -156,7 +137,7 @@
      pageQueryUser() {
        var that = this
        that.$http.get(pageQueryUser, {
          actived: parseInt(that.selectMode),
          actived: 1,
          pageSize: that.pageSize,
          pageNo: that.pageNo
        }, function(res) {
@@ -186,33 +167,8 @@
        this.pageNo = val
        this.pageQueryUser()
      },
      selectChange(val) {
        this.searchText = ''
        this.selectMode = val
        this.pageNo = 1
        this.total = 0
        this.tableData = []
        this.addBanTimeColumn(val)
        this.pageQueryUser()
      },
      addBanTimeColumn(val) {
        var lastcol = this.tableItem.pop()
        if (val === '0') {
          var bancol = {
            prop: 'invalidTime',
            tit: '停用时间',
            width: '160'
          }
          this.tableItem.push(bancol)
          this.tableItem.push(lastcol)
        } else {
          this.tableItem.pop()
          this.tableItem.push(lastcol)
        }
      },
      dialogChanged() {
        this.searchText = ''
        this.selectMode = '1'
        this.pageNo = 1
        this.total = 0
        this.tableData = []
@@ -266,16 +222,6 @@
            that.pageQueryUser()
          }
        })
      },
      handleRenew(id) {
        var that = this
        this.$http.get(renewUser, {
          id: id
        }, function(res) {
          if (res.success) {
            that.pageQueryUser()
          }
        })
      }
    }
  }

src/views/userInfo/pullBlack.vue

@@ -46,7 +46,7 @@
<script>
  import { blackUser, queryBlackOne } from '@/api/userInfo'
  import queryBase from '@/utils/queryBase'
  import { parseTime } from '@/utils'
  import { parseTime } from '@/utils/index'
  export default {
    data() {

src/views/userInfo/usingList.vue

@@ -53,10 +53,8 @@
</template>
<script>
import {
  pageNormalUser
} from '@/api/userInfo'
import { parseTime } from '@/utils'
import { pageNormalUser } from '@/api/userInfo'
import { parseTime } from '@/utils/index'
import comTable from '@/utils/comTable'
import baseInfo from './baseInfo'
@@ -116,6 +114,13 @@ export default {
      ]
    }
  },
  watch: {
    '$route'(to, from) {
      console.log(111)
      console.log(to)
      console.log(from)
    }
  },
  components: {
    baseInfo,
    pullBlack