Browse Source

部门绑定页面修改

wangtao 3 years ago
parent
commit
ac1b27c969
4 changed files with 31 additions and 19 deletions
  1. 2 3
      src/views/index.vue
  2. 17 9
      src/views/login.vue
  3. 10 5
      src/views/recharge/department/index.vue
  4. 2 2
      vue.config.js

+ 2 - 3
src/views/index.vue

@@ -19,7 +19,7 @@
               <div class="left"><img :src="tj1" alt="" class="tjimg"></div>
               <div class="left"><img :src="tj1" alt="" class="tjimg"></div>
               <div class="right">
               <div class="right">
                 <div class="num" style="color:#FFCB27;">{{collectList.total}}</div>
                 <div class="num" style="color:#FFCB27;">{{collectList.total}}</div>
-                <div class="num_txt">当天支付金额</div>
+                <div class="num_txt">当天支付金额(元)</div>
               </div>
               </div>
             </el-card>
             </el-card>
             <el-card class="box-card">
             <el-card class="box-card">
@@ -567,8 +567,7 @@ export default {
             //backgroundColor: "pink", // 标题背景色
             //backgroundColor: "pink", // 标题背景色
             text: "已注册人数",
             text: "已注册人数",
             x: "34.8%",
             x: "34.8%",
-            y: "45%",
-            center:'center',
+            y: "center",
             textStyle: {
             textStyle: {
                 fontSize: 12,
                 fontSize: 12,
                 color: "#000",
                 color: "#000",

+ 17 - 9
src/views/login.vue

@@ -148,13 +148,21 @@ export default {
       getCodeImg().then(res => {
       getCodeImg().then(res => {
         this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
         this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
         if (this.captchaOnOff) {
         if (this.captchaOnOff) {
-          this.codeUrl = "data:image/gif;base64," + res.data.img;
-          this.loginForm.uuid = res.data.uuid;
-          this.erp = true
-          setTimeout(()=>{
-            this.ERPloading = false
-          },)
-          
+          if(res.data){
+            this.codeUrl = "data:image/gif;base64," + res.data.img;
+            this.loginForm.uuid = res.data.uuid;
+            this.erp = true
+            setTimeout(()=>{
+              this.ERPloading = false
+            },)
+          }else{
+            this.erp = true
+            setTimeout(()=>{
+              this.ERPloading = false
+            },)
+            this.captchaOnOff = false
+          }
+
         }
         }
       });
       });
     },
     },
@@ -246,7 +254,7 @@ export default {
   height: 100%;
   height: 100%;
   // background-image: url("../assets/images/login-background.jpg");
   // background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
   background-size: cover;
-  
+
 }
 }
 .title {
 .title {
   margin: 0px auto 30px auto;
   margin: 0px auto 30px auto;
@@ -321,6 +329,6 @@ body,
     margin: 0px;
     margin: 0px;
     padding: 0px;
     padding: 0px;
     /* background-color: transparent !important; */
     /* background-color: transparent !important; */
-    
+
 }
 }
 </style>
 </style>

+ 10 - 5
src/views/recharge/department/index.vue

@@ -19,7 +19,8 @@
         <el-button type="warning" icon="el-icon-remove-outline" size="mini" @click="batchChange(0)">部门充值比例解除</el-button>
         <el-button type="warning" icon="el-icon-remove-outline" size="mini" @click="batchChange(0)">部门充值比例解除</el-button>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
-    <el-table  :data="adminList"  @current-change="selectBrand" height="calc(100vh - 10vh - 120px)">
+    <el-table  :data="adminList"  @current-change="selectBrand" height="calc(100vh - 10vh - 120px)" row-key="did"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column
       <el-table-column
         label="选择项"
         label="选择项"
         width="80">
         width="80">
@@ -65,9 +66,12 @@
 <script>
 <script>
 import { listChannel, deptJob, updataByDept } from "@/api/recharge/department";
 import { listChannel, deptJob, updataByDept } from "@/api/recharge/department";
 import { allRadio } from "@/api/recharge/radio";
 import { allRadio } from "@/api/recharge/radio";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import qs from 'qs'
 import qs from 'qs'
 export default {
 export default {
   name: "admin",
   name: "admin",
+   components: { Treeselect },
   data() {
   data() {
     return {
     return {
       // 遮罩层
       // 遮罩层
@@ -127,9 +131,10 @@ export default {
     getList() {
     getList() {
       this.loading = true;
       this.loading = true;
       listChannel(this.addDateRange(this.queryParams)).then(response => {
       listChannel(this.addDateRange(this.queryParams)).then(response => {
-          this.adminList = response.data.records;
-          this.total = response.data.total;
-          this.loading = false;
+        this.adminList = this.handleTree(response.data.records, "did");
+          // this.adminList = response.data.records;
+          // this.total = response.data.total;
+           this.loading = false;
         }
         }
       );
       );
     },
     },
@@ -209,7 +214,7 @@ export default {
         if (valid) {
         if (valid) {
           if(this.queryParams.id){
           if(this.queryParams.id){
             this.loading = true;
             this.loading = true;
-            
+
             this.staffList.deptId = this.tableRadio.did
             this.staffList.deptId = this.tableRadio.did
             this.staffList.radioId = this.queryParams.id
             this.staffList.radioId = this.queryParams.id
             this.staffList.isBinding = 1
             this.staffList.isBinding = 1

+ 2 - 2
vue.config.js

@@ -33,8 +33,8 @@ module.exports = {
         proxy: {
         proxy: {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
             [process.env.VUE_APP_BASE_API]: {
-                //target: `http://172.16.120.104:8085`, //本地
-                target: 'https://smartpark.caih.com/dxapi/', //东信
+                target: `http://172.16.120.213:8085`, //本地
+                //target: 'https://smartpark.caih.com/dxapi/', //东信
                 changeOrigin: true,
                 changeOrigin: true,
                 pathRewrite: {
                 pathRewrite: {
                     ['^' + process.env.VUE_APP_BASE_API]: ''
                     ['^' + process.env.VUE_APP_BASE_API]: ''