瀏覽代碼

修改bug

lex-xin 5 年之前
父節點
當前提交
7cea4512c2

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 0
dist/static/css/chunk-26a1a7d2.5ef61903.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-7165f328],.el-button--primary[data-v-7165f328]:active,.el-button--primary[data-v-7165f328]:focus,.el-button--primary[data-v-7165f328]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-7165f328]{margin-top:40px}.el-col[data-v-7165f328]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-7165f328]{width:200px;margin:0 20px}[data-v-7165f328] .el-tree-node__content{height:40px!important}.moreRule[data-v-7165f328]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-7165f328]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-7165f328]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-7165f328]{display:inline-block}.moreRuleIn .el-form-item[data-v-7165f328]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-7165f328] .el-form-item__content{margin-left:0!important}.max[data-v-7165f328],.min[data-v-7165f328]{display:inline-block;width:180px;text-align:center;margin-right:10px}

+ 0 - 1
dist/static/css/chunk-3ae6ee74.e2e52d5c.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-7bff8c40],.el-button--primary[data-v-7bff8c40]:active,.el-button--primary[data-v-7bff8c40]:focus,.el-button--primary[data-v-7bff8c40]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-7bff8c40]{margin-top:40px}.el-col[data-v-7bff8c40]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-7bff8c40]{width:200px;margin:0 20px}[data-v-7bff8c40] .el-tree-node__content{height:40px!important}.moreRule[data-v-7bff8c40]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-7bff8c40]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-7bff8c40]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-7bff8c40]{display:inline-block}.moreRuleIn .el-form-item[data-v-7bff8c40]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-7bff8c40] .el-form-item__content{margin-left:0!important}.max[data-v-7bff8c40],.min[data-v-7bff8c40]{display:inline-block;width:180px;text-align:center;margin-right:10px}

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.01a2c039.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.29415c78.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-10467d40.5b134a2b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-26a1a7d2.49ba9c97.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-3ae6ee74.2653f9ea.js


+ 1 - 1
src/api/silder.js

@@ -29,7 +29,7 @@ export function deleteSilder (id) {
 // 修改菜单
 export function resetSilder (data) {
   return request({
-    url: `/auth-server//menu/update`,
+    url: `/auth-server/menu/update`,
     method: 'PUT',
     data
   })

+ 2 - 1
src/store/modules/user.js

@@ -56,7 +56,8 @@ const actions = {
           if (!data.data) {
             reject('获取用户信息错误,请重新登录')
           }
-          const username = data.data.username;
+
+          const username = data.data.phone;
           const avatar = data.data.avatar;
           const organ = data.data.organId;
           // const { name, avatar } = data

+ 2 - 1
src/views/categroyManager/insideSetting/adminManager.vue

@@ -10,7 +10,7 @@
                            label="角色类型">
           </el-table-column>
           <el-table-column align='center' prop="roleDesc"
-                           label="权限范围">
+                           label="角色描述">
           </el-table-column>
           <el-table-column align='center'
                            label="操作">
@@ -60,6 +60,7 @@ export default {
       }).then(res => {
         if(res.code == 200 && res.data && res.data.rows.length > 0) {
           this.tableList = res.data.rows
+          this.pageInfo.total = res.data.total
         }
       })
     },

+ 1 - 1
src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -227,7 +227,7 @@ export default {
             form.errorText = '最大值不能为空'
             return
         } else if(parseInt(lastDate.max) <= parseInt(lastDate.min)) {
-            form.errorText = '最值不能小于或等于上一个梯度的最大值'
+            form.errorText = '最值不能小于或等于上一个梯度的最大值'
             return
         }
 

+ 2 - 2
vue.config.js

@@ -17,10 +17,10 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // http://47.99.212.176:8000
 // 
 // let target = 'http://192.168.3.27:8000' // 箭河
-let target = 'http://192.168.3.28:8000' //邹璇
+// let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服
-// let target = 'http://192.168.3.48:8000' // 乔
+let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**

Some files were not shown because too many files changed in this diff