sunyize 2 anos atrás
pai
commit
81c0ef4181

+ 138 - 0
src/views/system/expireDateConfig.vue

@@ -0,0 +1,138 @@
+<template>
+  <a-row :gutter="10">
+    <a-col :md="leftColMd" :sm="24" style="margin-bottom: 20px">
+      <a-card :bordered="false">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+          <!-- 搜索区域 -->
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row :gutter="24">
+              <a-col :md="12" :sm="8">
+                <a-form-item label="角色名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+                  <a-input placeholder="" v-model="queryParam.roleName"></a-input>
+                </a-form-item>
+              </a-col>
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="12" :sm="24">
+               <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </a-col>
+          </span>
+            </a-row>
+          </a-form>
+        </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator" style="margin: 5px 0 10px 2px">
+          <a-button @click="handleAdd" type="primary" icon="plus">新建数据</a-button>
+        </div>
+        <div style="margin-top: 15px">
+          <a-table
+            style="height:500px"
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+             @change="handleTableChange">
+
+          <span slot="action" slot-scope="text, record">
+             <a-divider type="vertical"/>
+
+
+            <a-dropdown>
+              <a class="ant-dropdown-link">
+                更多 <a-icon type="down"/>
+              </a>
+              <a-menu slot="overlay">
+
+                <a-menu-item>
+                  <a @click="handleEdit(record)">编辑</a>
+                </a-menu-item>
+<!--                <a-menu-item>-->
+<!--                  <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete1(record)">-->
+<!--                    <a>删除</a>-->
+<!--                  </a-popconfirm>-->
+<!--                </a-menu-item>-->
+              </a-menu>
+            </a-dropdown>
+        </span>
+          </a-table>
+        </div>
+        <!-- 右侧的角色权限配置 -->
+        <user-role-modal ref="modalUserRole"></user-role-modal>
+        <role-modal ref="modalForm" @ok="modalFormOk"></role-modal>
+      </a-card>
+    </a-col>
+
+  </a-row>
+</template>
+<script>
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { deleteAction, postAction, getAction } from '@/api/manage'
+  import SelectUserModal from './modules/SelectUserModal'
+  import RoleModal from './modules/RoleModal'
+  import UserModal from './modules/UserModal'
+  import { filterObj } from '@/utils/util'
+  import UserRoleModal from './modules/UserRoleModal'
+  import moment from 'moment'
+  import { adminCheck } from '@/api/api'
+  export default {
+    name: 'expireDateConfig',
+    mixins: [JeecgListMixin],
+    components: {
+      UserRoleModal,
+      SelectUserModal,
+      RoleModal,
+      UserModal,
+      moment
+    },
+    data() {
+      return {
+        /* 数据源 */
+        dataSource:[],
+        columns: [
+            {
+              title: '配置名称',
+              align: 'center',
+              dataIndex: 'roleName',
+            },
+            {
+              title: '数值',
+              align: 'center',
+              dataIndex: 'power',
+              scopedSlots: {customRender: 'power'}
+            },
+            {
+              title: '创建时间',
+              dataIndex: 'createTime',
+              align:"center",
+              // sorter: true,
+              sorter:(a, b) => { return a.createTime>= b.createTime? 1 : -1 },
+              customRender: (text) => {
+                return moment(text).format('YYYY-MM-DD')
+              }
+            },
+            {
+              title: '操作',
+              dataIndex: 'action',
+              align: 'center',
+              scopedSlots: { customRender: 'action' }
+            }
+          ],
+      }
+    },
+    methods: {
+
+    }
+  }
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+  /** Button按钮间距 */
+  .ant-btn {
+    margin-left: 8px
+  }
+</style>

+ 1 - 0
src/views/user/Login.vue

@@ -86,6 +86,7 @@ export default {
         if (this.customActiveKey === 'tab1') {
           // 使用账户密码登录
           this.$refs.alogin.handleLogin(this.rememberMe)
+          this.loginBtn = true;
         } else {
           //手机号码登录
           this.$refs.plogin.handleLogin(this.rememberMe)

+ 1 - 1
src/views/user/LoginAccount.vue

@@ -110,7 +110,7 @@ import { getAction, postAction, putAction } from '@/api/manage'
               if(res.success){
                 console.log(res)
                 that.$message.success(res.message);
-                that.loadData(1);
+                that.isLogin=true;
               }else{
                 that.$message.warning(res.message);
               }