安全机制新增锁定时效字段、部门折叠、部门框高度修改、设定滑动条颜色

public/index.html

@@ -18,7 +18,7 @@
             height: 100%;
             margin: 0px;
             padding: 0px;
-            background-color: #7171C6;
+            /* background-color: #7171C6; */
         }
         
         .chromeframe {

src/App.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Author: wt 1241351815@qq.com
+ * @Date: 2022-04-25 10:24:58
+ * @LastEditors: wt 1241351815@qq.com
+ * @LastEditTime: 2022-05-12 20:15:50
+ * @FilePath: \vuedx\src\App.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <div id="app">
     <router-view />
@@ -18,6 +26,23 @@ export default  {
 }
 </script>
 <style>
+/* 滑动条 */
+::-webkit-scrollbar-track-piece {
+    background: #d3dce6;
+  }
+
+::-webkit-scrollbar {
+  width: 4px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #99a9bf;
+  border-radius: 20px;
+}
+/* 下拉框底部颜色 */
+::-webkit-scrollbar-track-piece{
+background: transparent !important;
+}
 .el-input__inner{
   height:28px !important;
   line-height: 28px !important;
@@ -44,5 +69,50 @@ export default  {
   height:0;
   bottom: none !important;
 }
+.el-range-editor--small .el-range__icon, .el-range-editor--small .el-range__close-icon{
+  margin-top:-4px;
+}
+.el-range-editor--small .el-range-separator{
+  margin-top:-6px;
+}
+
+/* 部门框高度 */
+.vue-treeselect--searchable .vue-treeselect__input-container{
+  height:28px !important;
+  line-height: 20px !important;
+}
+.vue-treeselect__control{
+  height:28px !important;
+  margin-top:4px;
+}
+.vue-treeselect__placeholder, .vue-treeselect__single-value{
+  top:-4px !important;
+}
+
+/* 数字加减图标位置 */
+.el-input-number{
+  line-height: 28px !important;
+}
+.el-input-number.is-controls-right .el-input-number__increase, .el-input-number.is-controls-right .el-input-number__decrease{
+  line-height:10px;
+}
+.el-input-number--small{
+  height:28px !important;
+  line-height: 26px !important;
+}
+.el-textarea .el-input__count,.el-input .el-input__count .el-input__count-inner{
+  font-size: 8px;
+  height: 12px;
+  line-height: 12px;
+  background: transparent !important
+}
+
+.el-input-number--medium{
+  width:auto;
+  line-height:28px;
+}
+.el-input-number.is-controls-right[class*=medium] [class*=increase], .el-input-number.is-controls-right[class*=medium] [class*=decrease] {
+    line-height: 13px;
+}
 </style>
 

src/components/SizeSelect/index.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Author: wt 1241351815@qq.com
+ * @Date: 2022-04-25 10:24:59
+ * @LastEditors: wt 1241351815@qq.com
+ * @LastEditTime: 2022-05-12 20:03:30
+ * @FilePath: \vuedx\src\components\SizeSelect\index.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <el-dropdown trigger="click" @command="handleSetSize">
     <div>
@@ -17,10 +25,10 @@ export default {
   data() {
     return {
       sizeOptions: [
-        { label: 'Default', value: 'default' },
-        { label: 'Medium', value: 'medium' },
-        { label: 'Small', value: 'small' },
-        { label: 'Mini', value: 'mini' }
+        { label: '正常', value: 'default' },
+        { label: '中等', value: 'medium' },
+        { label: '小', value: 'small' },
+        // { label: 'mini', value: 'mini' }
       ]
     }
   },
@@ -35,7 +43,7 @@ export default {
       this.$store.dispatch('app/setSize', size)
       this.refreshView()
       this.$message({
-        message: 'Switch Size Success',
+        message: '字体大小切换成功',
         type: 'success'
       })
     },

src/views/login.vue

@@ -128,8 +128,8 @@ export default {
   methods: {
     getUrl(){
       let url = this.$route.query
-      if(url.redirect && url.password){
-        let data = {username:url.redirect.split("username=")[1],password:url.password}
+      if(url.username && url.password){
+        let data = {username:url.username,password:url.password}
         this.handleLoginERP(data)
       }else{
         this.getCode();
@@ -320,7 +320,7 @@ body,
     height: 100%;
     margin: 0px;
     padding: 0px;
-    background-color: transparent !important;
+    /* background-color: transparent !important; */
     
 }
 </style>

src/views/monitor/logininfor/index.vue

@@ -56,7 +56,7 @@
     </el-form>
 
     <el-table ref="tables" v-loading="loading" :data="list" height="calc(100vh - 10vh - 120px)" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="访问编号" align="center" prop="infoId"  show-overflow-tooltip />
       <el-table-column label="用户名称" align="center" prop="userName"  show-overflow-tooltip  sortable="custom" :sort-orders="['descending', 'ascending']" />
       <el-table-column label="登录地址" align="center" prop="ipaddr"  show-overflow-tooltip  />

src/views/monitor/operlog/index.vue

@@ -73,7 +73,7 @@
 
 
     <el-table ref="tables" v-loading="loading" :data="list" height="calc(100vh - 10vh - 120px)" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="日志编号" align="center" prop="operId"  show-overflow-tooltip />
       <el-table-column label="系统模块" align="center" prop="title"  show-overflow-tooltip />
       <el-table-column label="操作类型" align="center" prop="businessType" :formatter="typeFormat"  show-overflow-tooltip />

src/views/recharge/detailed/index.vue

@@ -98,7 +98,7 @@
           <span v-if="scope.row.orderFlag == 6" style="color:#67C23A">已成功</span>
         </template>
       </el-table-column>
-      <el-table-column label="到账金额" align="center" prop="realMoney" show-overflow-tooltip />
+      <!-- <el-table-column label="到账金额" align="center" prop="realMoney" show-overflow-tooltip /> -->
       <el-table-column label="支付方式" align="center" prop="payType" show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ scope.row.payType == 1 ? '现金支付':scope.row.payType ==2 ? '微信':scope.row.payType ==3 ? '支付宝': '' }}</span>
@@ -118,30 +118,26 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
         <template slot-scope="scope" >
           <el-button v-if="scope.row.orderFlag ==3"
+            type="text"
+            icon="el-icon-edit"
             size="small"
-            type="primary"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
-          >变更状态</el-button>
+          >支付状态变更</el-button>
+          <el-button v-else
+            type="text"
+            icon="el-icon-edit"
+            size="small"
+            @click="handleUpdate(scope.row)"
+            disabled
+            v-hasPermi="['system:admin:edit']"
+          >支付状态变更</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
-
-    <!-- 修改订单状态对话框 -->
-    <!-- <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
-        <el-form-item label="支付状态标识" prop="orderFlag">
-          <el-input v-model="form.orderFlag" placeholder="支付状态标识" @input="onInput()"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog> -->
     <pagination
       v-show="total>0"
       :total="total"

src/views/recharge/personnel/index.vue

@@ -43,9 +43,12 @@
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="id" align="center" prop="id"  show-overflow-tooltip />
       <el-table-column label="人员名称" align="center" prop="name"  show-overflow-tooltip />
-      <el-table-column label="身份信息" align="center" prop="identity"  show-overflow-tooltip />
+      <el-table-column label="部门" align="center" prop="dept"  show-overflow-tooltip />
+      
+      <!-- <el-table-column label="人员信息" align="center" prop="identity"  show-overflow-tooltip /> -->
       <el-table-column label="手机号" align="center" prop="contacts"  show-overflow-tooltip />
       <el-table-column label="卡号" align="center" prop="cardId"  show-overflow-tooltip />
+      <el-table-column label="余额（元）" align="center" prop="balance"  show-overflow-tooltip />
       <el-table-column label="充值到账比例" align="center" prop="proportion"  show-overflow-tooltip />
       <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -163,6 +166,9 @@ export default {
       this.loading = true;
       listChannel(this.addDateRange(this.queryParams)).then(response => {
           this.adminList = response.data.records;
+          for(let i =0;i<this.adminList.length;i++){
+            this.adminList[i].dept = JSON.parse(this.adminList[i].dept).name
+          }
           this.total = response.data.total;
           this.loading = false;
         }

src/views/recharge/qrCode/index.vue

@@ -29,12 +29,11 @@
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="二维码名称" align="center" prop="name"  show-overflow-tooltip />
       <el-table-column label="渠道名称" align="center" prop="topChannelName" show-overflow-tooltip />
-
       <el-table-column label="二维码" align="center" prop="qrPath" show-overflow-tooltip  >
         <template slot-scope="scope" >
           <el-image
             v-if="scope.row.qrPath"
-            style="width: 24px; height: 24px"
+            style="width: 100px; height: 100px"
             :preview-src-list="[scope.row.qrPath]"
             :src="scope.row.qrPath">
           </el-image>
@@ -84,7 +83,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="渠道名称" prop="topChannelId">
-              <el-select v-model.trim="form.topChannelId"  placeholder="请选择渠道名称" clearable  @input="forceUpdate" >
+              <el-select v-model.trim="form.topChannelId"  placeholder="请选择渠道名称"   @input="forceUpdate" >
                 <el-option
                   v-for="dict in channelList"
                   :key="dict.id"

src/views/recharge/radio/index.vue

@@ -71,12 +71,12 @@
         <el-row :gutter="20">
           <el-col :span="16">
             <el-form-item label="身份信息" prop="identity">
-              <el-input v-model.trim="form.identity" placeholder="请输入身份信息"  @input="forceUpdate" maxlength="15" show-word-limit  />
+              <el-input v-model.trim="form.identity" placeholder="请输入身份信息"  @input="forceUpdate" maxlength="15" show-word-limit  style="width:88%" />
             </el-form-item>
           </el-col>
           <el-col :span="16">
-            <el-form-item label="充值到账比例" prop="proportion">
-              <el-select v-model="form.proportion"  placeholder="请选择充值到账比例" clearable size="small" @input="forceUpdate">
+            <el-form-item label="充值到账比例" prop="proportion"  >
+              <el-select v-model="form.proportion"  placeholder="请选择充值到账比例"  size="small" @input="forceUpdate" >
                 <el-option :label="index.value"  :value="index.value" v-for = "(index, item) in proportionList" :key="item" />
               </el-select>
             </el-form-item>

src/views/system/dept/index.vue

@@ -39,7 +39,6 @@
       v-loading="loading"
       :data="deptList"
       row-key="deptId"
-      default-expand-all
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column prop="deptName" label="部门名称" show-overflow-tooltip></el-table-column>
@@ -53,7 +52,6 @@
       <el-table-column label="操作" width="250" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            disabled
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -61,7 +59,6 @@
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
           <el-button
-            disabled
             size="mini"
             type="text"
             icon="el-icon-plus"
@@ -69,7 +66,6 @@
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
           <el-button
-           disabled
             v-if="scope.row.parentId != 0"
             size="mini"
             type="text"
@@ -230,7 +226,10 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
-      this.reset();
+      setTimeout(()=>{
+        this.reset();
+      },500)
+      
     },
     // 表单重置
     reset() {

src/views/system/menu/index.vue

@@ -12,7 +12,7 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="菜单状态" clearable size="small" style="width: 100px">
+        <el-select v-model="queryParams.status" placeholder="菜单状态" clearable size="small" style="width: 120px">
           <el-option
             v-for="dict in statusOptions"
             :key="dict.dictValue"
@@ -449,3 +449,8 @@ export default {
   }
 };
 </script>
+<style>
+.icon-body .icon-list span{
+  margin-left:5px;
+}
+</style>

src/views/system/product/index.vue

@@ -29,7 +29,12 @@
       <el-table-column label="公司介绍" align="center" prop="introduce" show-overflow-tooltip />
       <el-table-column label="公司LOGO">
         <template width="90" slot-scope="scope" >
-          <img style="width:120px;border:none;" :src="scope.row.logo"  >
+           <el-image
+            v-if="scope.row.logo"
+            style="width: 80px"
+            :preview-src-list="[scope.row.logo]"
+            :src="scope.row.logo">
+          </el-image>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip >
@@ -81,31 +86,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <!-- <el-form-item label="公司LOGO" prop="logo" ref="img">
-                <el-upload
-                  action="#"
-                  accept="image/png,image/jpg,image/jpeg"
-                  :http-request="uploadFile"
-                  :limit = limit
-                  list-type="picture-card"
-                  :file-list="fileList"
-                  style="color:#D9D9D9"
-                  on-sucsee="handSuccess"
-                  :auto-upload="true">
-                    <i slot="default" class="el-icon-plus"></i>
-                    <div slot="file" slot-scope="{file}">
-                      <img class="el-upload-list__item-thumbnail imgupload" :src="file.url" alt="" >
-                      <span class="el-upload-list__item-actions">
-                        <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                          <i class="el-icon-delete"></i>
-                        </span>
-                      </span>
-                    </div>
-                </el-upload>
-              <el-dialog :visible.sync="dialogVisible" >
-                <img width="100%" :src="dialogImageUrl" alt="">
-              </el-dialog>
-            </el-form-item> -->
             <el-form-item label="单位LOGO" prop="logo" ref="img">
               <el-upload
                 class="upload-demo"

src/views/system/security/index.vue

@@ -20,6 +20,13 @@
     　　</template>
       </el-table-column>
       <el-table-column label="账号锁定次数" prop="lockNumber"  show-overflow-tooltip />
+      <el-table-column label="锁定时间" prop="loseDate" >
+        <template slot-scope="scope">
+          <span>{{scope.row.loseDate == 1 ? "1分钟" : scope.row.loseDate == 5 ? "5分钟" 
+            : scope.row.loseDate == 15 ? "15分钟" : scope.row.loseDate == 30 ? "30分钟" : scope.row.loseDate == 120 ? "2小时" 
+            : scope.row.loseDate == 1440 ? "1天" : ""}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="默认账户" align="center" >
         <template slot-scope="scope">
           <el-switch
@@ -74,19 +81,35 @@
     />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :before-close="cancel" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :before-close="cancel" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-row>
-          <el-col :span="18">
+          <el-col :span="12">
             <el-form-item label="密码长度不少于" prop="pwdLength">
               <el-input-number v-model="form.pwdLength" controls-position="right" :min="0" :max="30" placeholder="请输入密码长度" />
             </el-form-item>
           </el-col>
-          <el-col :span="18">
+          <el-col :span="12">
             <el-form-item label="账号锁定次数" prop="lockNumber" >
               <el-input-number v-model="form.lockNumber" controls-position="right" :min="0" :max="10" placeholder="请输入账号锁定次数" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="锁定时间" prop="loseDate" >
+              <el-select
+                v-model="form.loseDate"
+                placeholder="请选择锁定时间"
+                size="small"
+              >
+                <el-option
+                  v-for="item in loseDateList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="默认账户" prop="isEnable">
               <el-switch
@@ -156,11 +179,18 @@ export default {
         pwdLength: [
           { required: true, message: "密码长度不能为空", trigger: ["blur",'change'] }
         ],
-        lockNumber: [
-          { required: true, message: "锁定次数不能为空", trigger: ["blur",'change']}
-        ],
-
-      }
+        loseDate:[
+          { required: true, message: "锁定时间不能为空", trigger: ["blur",'change']}
+        ]
+      },
+      loseDateList:[//锁定时间
+        {value:1,label:"1分钟"},
+        {value:5,label:"5分钟"},
+        {value:15,label:"15分钟"},
+        {value:30,label:"30分钟"},
+        {value:120,label:"2小时"},
+        {value:1440,label:"1天"},
+      ],
     };
   },
   created() {

src/views/system/user/index.vue

@@ -9,18 +9,16 @@
             placeholder="请输入部门名称"
             clearable
             size="small"
-            prefix-icon="el-icon-search"
             style="margin-bottom: 20px"
           />
         </div>
-        <div class="head-container">
+        <div class="head-container head-container2" style="height:800px">
           <el-tree
             :data="deptOptions"
             :props="defaultProps"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             ref="tree"
-            default-expand-all
             @node-click="handleNodeClick"
           />
         </div>
@@ -197,7 +195,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="20" show-word-limit />
+              <el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="40" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>
@@ -516,7 +514,9 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
-      this.reset();
+      setTimeout(()=>{
+        this.reset();
+      })
     },
     // 表单重置
     reset() {
@@ -587,6 +587,7 @@ export default {
       getUser(userId).then(response => {
         this.form = response.data.data;
         this.postOptions = response.data.posts
+        
         this.roleOptions = response.data.roles;
        
 
@@ -711,3 +712,8 @@ export default {
   }
 };
 </script>
+<style scoped>
+.head-container2{
+  overflow-y: scroll;
+}
+</style>