Browse Source

:bug: Fixing a bug. too much

冷冷 6 years ago
parent
commit
ec1fa7aa20

+ 1 - 1
package.json

@@ -10,7 +10,7 @@
     "test:e2e": "vue-cli-service test:e2e"
   },
   "dependencies": {
-    "@smallwei/avue": "^1.4.6-beta2",
+    "@smallwei/avue": "^1.4.6-beta3",
     "avue-plugin-transfer": "^0.0.2",
     "avue-plugin-ueditor": "^0.0.1",
     "axios": "^0.18.0",

+ 1 - 5
src/const/crud/admin/user.js

@@ -45,7 +45,6 @@ export const tableOption = {
         editDisabled: true,
         addVisdiplay: false,
     }, {
-        width: 120,
         fixed: true,
         label: '用户名',
         prop: 'username',
@@ -91,7 +90,6 @@ export const tableOption = {
             trigger: "blur"
         }]
     }, {
-        width: 120,
         label: '手机号',
         prop: 'phone',
         type: 'phone',
@@ -104,7 +102,6 @@ export const tableOption = {
             trigger: "blur"
         }]
     },{
-        width: 120,
         label: '角色',
         prop: 'role',
         formsolt: true,
@@ -143,7 +140,6 @@ export const tableOption = {
         valueFormat: 'yyyy-MM-dd HH:mm:ss',
         editDisabled: true,
         addVisdiplay: false,
-        hide: true,
-        span: 24,
+        span: 24
     }]
 }

+ 4 - 2
src/main.js

@@ -21,7 +21,7 @@ import {
 import * as filters from './filters' // 全局filter
 import './styles/common.scss';
 // // 引入avue的包
-import '@smallwei/avue/lib/index.js';
+import Avue from '@smallwei/avue/lib/index.js';
 // // 引入avue的样式文件
 import '@smallwei/avue/lib/theme-chalk/index.css';
 
@@ -35,6 +35,8 @@ import VueClipboard from 'vue-clipboard2'
 import vueJsonTreeView from 'vue-json-tree-view'
 
 
+Vue.use(Avue, { menuType : 'text'});
+
 Vue.use(router)
 
 Vue.use(VueClipboard)
@@ -63,4 +65,4 @@ new Vue({
     router,
     store,
     render: h => h(App)
-}).$mount('#app')
+}).$mount('#app')

+ 1 - 1
src/page/wel.vue

@@ -30,7 +30,7 @@
               <div>基于开源LCN 分布式事务解决方案深度定制</div>
               <div>完美兼容2.X,优化集群部署,提升性能</div>
             </el-collapse-item>
-            <el-collapse-item title="SASS多租户" name="4">
+            <el-collapse-item title="SAAS多租户" name="4">
               <div>扩展Spring Cache无缝兼容</div>
               <div>支持开发过程无感知</div>
             </el-collapse-item>

+ 1 - 1
src/views/activiti/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <div class="header">
         <p class="header__title">{{name}}</p>

+ 1 - 1
src/views/activiti/index.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :page="page"

+ 1 - 1
src/views/activiti/leave.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :page="page"

+ 1 - 1
src/views/activiti/process.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud
         ref="crud"

+ 1 - 1
src/views/activiti/task.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :page="page"

+ 1 - 1
src/views/admin/client/index.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :page="page"

+ 1 - 1
src/views/admin/dict/index.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :page="page"

+ 1 - 1
src/views/admin/route/index.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-    <div class="app-container pull-auto">
+    <div class="execution">
         <basic-container>
             <el-alert
                     title="路由配置是非常专业的事情,不建议非工程师操作"

+ 1 - 1
src/views/admin/social/index.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :page="page"

+ 1 - 1
src/views/admin/token/index.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :page="page"

+ 1 - 1
src/views/crud/index.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :data="tableData"

+ 5 - 4
src/views/daemon/execution-log/index.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :page="page"
@@ -61,17 +61,18 @@
       }
     },
     created() {
+       this.page.pageSize=20;
     },
     mounted: function() { },
     computed: {
       ...mapGetters(['permissions'])
     },
     methods: {
-      getList(page, params) {
+      getList(page, params={}) {
         this.tableLoading = true
         fetchList(Object.assign({
-          page: page.currentPage,
-          limit: page.pageSize,
+          current: page.currentPage,
+          size: page.pageSize,
           descs: 'start_time'
         }, params)).then(response => {
           this.tableData = response.data.data.records

+ 1 - 1
src/views/daemon/status-trace-log/index.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :page="page"

+ 1 - 1
src/views/gen/index.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :page="page"

+ 1 - 1
src/views/tx/index.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud :data="data"
                  :option="option" />

+ 1 - 1
src/views/tx/model.vue

@@ -16,7 +16,7 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud :data="data" :option="option"/>
     </basic-container>