merge

src/api/api.js

@@ -2,12 +2,7 @@ import axios from 'axios'
 import qs from 'qs'
 import { useToast } from 'vuestic-ui'
 import router from '../router'
-console.log(router)
-// const router = require('')
-// import Vue from 'vue'
-// console.log(Vue)
 const instance = axios.create({
-  // baseURL: 'api',
   baseURL: '/api/',
   timeout: 30000,
 })
@@ -48,9 +43,9 @@ instance.interceptors.response.use(
 function fetch(ourl, params = {}, methods = 'post') {
   return new Promise((resolve, reject) => {
     let url = ourl
-    if (methods == 'get' && qs.stringify(params)) {
-      url = ourl + '?' + qs.stringify(params)
-    }
+    // if (methods == 'get' && qs.stringify(params)) {
+    //   url = ourl + '?' + qs.stringify(params)
+    // }
     instance[methods](url, params)
       .then((res) => {
         if (res.code == 200) {

src/pages/attendanceSetting/attendancePoint/index.vue

@@ -5,7 +5,7 @@
     </searchForm>
     <VaCard tag="b" class="table">
       <div class="va-table-responsive">
-        <VaDataTable :items="users" :columns="columns" :loading="loading">
+        <VaDataTable :items="users" :columns="columns" :loading="loading"   height="100%">
           <template #cell(setting)="{ rowData }">
             <setPointTimeBtn :params='rowData' @after-op='getList()'></setPointTimeBtn>
             <editPointBtn :params='rowData' @after-op='getList()'></editPointBtn>
@@ -89,7 +89,7 @@
           { key: 'addrRange', label: '范围' },
           { key: 'addrIn', label: '上班时间' },
           { key: 'addrQuit', label: '下班时间' },
-          { key: 'setting', label: '设置' },
+          { key: 'setting', label: '设置',width:200 },
         ],
         loading:false
       }

src/pages/system/orgManage/module/workSpace.vue

@@ -65,7 +65,7 @@
           { key: 'orgLeader', label: '部门负责人' },
           { key: 'orgLeaderPhone', label: '联系方式' },
           { key: 'description', label: '描述' },
-          { key: 'setting', label: '设置' },
+          { key: 'setting', label: '设置',width:100 },
         ],
         users: [],
       }

src/pages/system/roleManage/index.vue

@@ -77,7 +77,7 @@
         },
         columns: [
           { key: 'roleName', label: '角色名称' },
-          { key: 'setting', label: '设置' },
+          { key: 'setting', label: '设置',width:300 },
         ],
         loading: false,
         users: [],

src/pages/system/userManage/module/workSpace.vue

@@ -84,7 +84,7 @@
           { key: 'gender', label: '性别' },
           { key: 'phone', label: '联系方式' },
           { key: 'birthDate', label: '生日' },
-          { key: 'setting', label: '设置' },
+          { key: 'setting', label: '设置',width:100 },
         ],
         pageInfo: {
           ...dict.pageInfo,