Ver código fonte

修复设置登录方式bug

zhangqiOMG 2 anos atrás
pai
commit
154c219e0e

+ 1 - 0
.gitignore

@@ -1 +1,2 @@
 node_modules
+yos

+ 1 - 0
src/HManagement/accountManage/modules/list.vue

@@ -31,6 +31,7 @@
           v-model="userType"
           placeholder="请选择"
           @change="listData('search')"
+          clearable
         >
           <el-option
             v-for="item in userTypeArr"

+ 1 - 1
src/HManagement/siteManage/securityConfig/modules/loginSelect.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="small" style="width:120px" type="primary" @click="updateSite_Parameter">设 置</el-button>
+    <el-button size="small" style="width:120px" type="primary" @click="querySite_Parameter">设 置</el-button>
     <el-dialog title="设置" :visible.sync="dialogEditVisible" width="600px">
       <el-row :gutter="16">
         <el-col>

+ 2 - 2
src/components/scopeOfAuthority/modules/dep_auth.vue

@@ -2,7 +2,7 @@
   <div>
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-button size="mini" @click="setCheckedKeys" class="normal-margin">{{allSelectKeys.length > 0?'取消选':'全选部门'}}</el-button>
+        <el-button size="mini" @click="setCheckedKeys" class="normal-margin">{{allSelectKeys.length > 0?'取消选':'全选部门'}}</el-button>
         <div class="tree-panel">
           <el-tree
             v-if="refreshTree"
@@ -182,7 +182,7 @@ export default {
         this.refreshTree = true
       }, 10);
       this.departmentids = this.allSelectKeys
-      this.$emit('onParams',this.departmentids,this.checkedMenbers,this.isonlymanager_dept)
+      this.$emit('onParams',this.departmentids,[],this.isonlymanager_dept)
     },
     // 点击部门
     nodeClick (row,node,comp) {

+ 1 - 1
src/components/scopeOfAuthority/modules/mar_auth.vue

@@ -202,7 +202,7 @@ export default {
       }
       this.saleareaids = [...new Set(this.saleareaids)]
       this.$refs.tree.setCheckedKeys(this.saleareaids)
-      this.$emit('onAgentParams',this.saleareaids,this.checkedMenbers,this.isonlymanager_agent)
+      this.$emit('onAgentParams',this.saleareaids,[],this.isonlymanager_agent)
     },
     // 勾选人员
     handleCheckedChange (val) {

+ 0 - 1
yos/css/210.162a1630.css

@@ -1 +0,0 @@
-.title[data-v-b598169c]{height:20px;line-height:20px;font-size:14px;text-indent:7px;font-weight:700;color:#333;margin-bottom:20px;border-left:.3rem solid #3874f6}.mb-40[data-v-b598169c]{margin-bottom:40px}

+ 0 - 1
yos/css/476.162a1630.css

@@ -1 +0,0 @@
-.title[data-v-b598169c]{height:20px;line-height:20px;font-size:14px;text-indent:7px;font-weight:700;color:#333;margin-bottom:20px;border-left:.3rem solid #3874f6}.mb-40[data-v-b598169c]{margin-bottom:40px}

+ 0 - 1
yos/css/702.90af39c5.css

@@ -1 +0,0 @@
-.el-input-group__append,.el-input-group__prepend{background-color:#4f7bfd;color:#fff;border:1px solid #4f7bfd;cursor:pointer}.search-panel p[data-v-819aa2b2]{flex:1 0 auto;width:40px;font-size:14px}.dialog-footer[data-v-070e76b2],.dialog-footer[data-v-189d68b6]{margin-top:32px;text-align:center}.role_panel{padding:10px;border:1px solid #ebe3e3;font-size:.875rem;cursor:pointer;border-radius:4px;color:#666;transition:.2s linear}.on[data-v-0096b51c]{border:1px solid #4f7bfd;background:#4f7bfd;color:#fff}.title[data-v-b598169c]{height:20px;line-height:20px;font-size:14px;text-indent:7px;font-weight:700;color:#333;margin-bottom:20px;border-left:.3rem solid #3874f6}.mb-40[data-v-b598169c]{margin-bottom:40px}.borderRight[data-v-4cff6729]{border-right:1px solid #ccc}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
yos/css/about.9a59cc45.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
yos/css/app.272a52a9.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 34
yos/img/iconfont.e6044e55.svg


+ 1 - 1
yos/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.acdc7bef.js"></script><link href="css/app.272a52a9.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.9f3a1e04.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.037e8072.js"></script><link href="css/app.83be7ebe.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.aec0fbe6.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
yos/js/210-legacy.e46f223f.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
yos/js/457-legacy.385b9726.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
yos/js/457.5d25e529.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
yos/js/702-legacy.cc4f3bef.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
yos/js/about-legacy.ed4b7371.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
yos/js/about.fb893dc4.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
yos/js/app-legacy.9f3a1e04.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
yos/js/app.acdc7bef.js


BIN
yos/yos.zip


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff