diff --git a/src/api/user/user.js b/src/api/user/user.js index c7fd25f..d7cc737 100644 --- a/src/api/user/user.js +++ b/src/api/user/user.js @@ -233,3 +233,19 @@ export const editAgentInfo=(data)=>{ data }) } + +export const addWhiteUser=(data)=>{ + return request({ + url:'/admin/approve/white', + method:'post', + data + }) +} + +export const delWhiteUser=(data)=>{ + return request({ + url:'/admin/approve/white', + method:'delete', + data + }) +} diff --git a/src/views/system/approvalWhitelist/index.vue b/src/views/system/approvalWhitelist/index.vue new file mode 100644 index 0000000..e0fa695 --- /dev/null +++ b/src/views/system/approvalWhitelist/index.vue @@ -0,0 +1,142 @@ + + + + + \ No newline at end of file diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index f6c53d8..772c644 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -24,7 +24,7 @@ - + @@ -200,7 +200,7 @@ const tableConfig = reactive({ }, { prop: 'accountType', - label: '主子账号', + label: '主次账号', align: 'center', width: 100, showOverflowTooltip: false, diff --git a/vite.config.js b/vite.config.js index 905f3c9..1f5f9c2 100644 --- a/vite.config.js +++ b/vite.config.js @@ -12,90 +12,96 @@ import viteSvgIcons from 'vite-plugin-svg-icons' import path from 'path' // https://vitejs.dev/config/ export default defineConfig({ - plugins: [ - vue(), - vueJsx(), - AutoImport({ - //自动导入vue相关函数 - imports: ['vue', 'vue-router'], - resolvers: [ - ElementPlusResolver(), - //自动导入图标组件 - IconsResolver({ - prefix: 'Icon', + plugins: [ + vue(), + vueJsx(), + AutoImport({ + //自动导入vue相关函数 + imports: ['vue', 'vue-router'], + resolvers: [ + ElementPlusResolver(), + //自动导入图标组件 + IconsResolver({ + prefix: 'Icon', + }), + ], }), - ], - }), - Components({ - dirs: ['src/components', 'src/fvcomponents'], - resolvers: [ - // 自动注册图标组件 - IconsResolver({ - enabledRequirements: ['ep'], + Components({ + dirs: ['src/components', 'src/fvcomponents'], + resolvers: [ + // 自动注册图标组件 + IconsResolver({ + enabledRequirements: ['ep'], + }), + //自动导入组件 + ElementPlusResolver() + ], }), - //自动导入组件 - ElementPlusResolver() - ], - }), - Icons({ - autoInstall: true, - }), - viteSvgIcons({ - // 指定需要缓存的图标文件夹 - iconDirs: [path.resolve(__dirname, 'src/assets/svg')], - // 指定symbolId格式 - symbolId: 'icon-[dir]-[name]', - }), - Inspect(), - ], - resolve: { - alias: { - '@': fileURLToPath(new URL('./src', import.meta.url)) + Icons({ + autoInstall: true, + }), + viteSvgIcons({ + // 指定需要缓存的图标文件夹 + iconDirs: [path.resolve(__dirname, 'src/assets/svg')], + // 指定symbolId格式 + symbolId: 'icon-[dir]-[name]', + }), + Inspect(), + ], + resolve: { + alias: { + '@': fileURLToPath(new URL('./src', import.meta.url)) + } + }, + build: { + minify: 'esbuild', + terserOptions: { + compress: { + drop_console: false, // 生产环境移除log + drop_debugger: true // 生产环境禁用debugger + } + } + }, + server: { + host: '0.0.0.0', + port: 8888, + strictPort: false, + open: true, + proxy: { + // '/api/workflow': { + // // target: 'http://frp.feashow.cn:31800/', + // target: 'http://clay.frp.feashow.cn/', + // // target: 'http://192.168.31.175:8000', + // changeOrigin: true, + // rewrite: (path) => path.replace(/^\/api/, '') + // }, + // '/api/admin': { + // // target: 'http://frp.feashow.cn:31800/', + // target: 'http://clay.frp.feashow.cn/', + // // target: 'http://192.168.31.175:8000', + // changeOrigin: true, + // rewrite: (path) => path.replace(/^\/api/, '') + // }, + // '/api/auth': { + // // target: 'http://frp.feashow.cn:31800/', + // target: 'http://clay.frp.feashow.cn/', + // // target: 'http://192.168.31.175:8000', + // changeOrigin: true, + // rewrite: (path) => path.replace(/^\/api/, '') + // }, + '/api': { + target: 'http://mosr.feashow.cn', + // target: 'http://kyglweb.scgzjy.com:8080/', + // target: 'http://clay.frp.feashow.cn/', + // target: 'http://10.7.127.57:8000', + changeOrigin: true, + // rewrite: (path) => path.replace(/^\/api/, '') + }, + // '/api/notice-ws': { + // target: 'ws://mosr.feashow.cn/summary/notice-ws', + // ws: true, + // changeOrigin: true, + // } + } } - }, - build: { - minify: 'esbuild', - terserOptions: { - compress: { - drop_console: false, // 生产环境移除log - drop_debugger: true // 生产环境禁用debugger - } - } - }, - server: { - host: '0.0.0.0', - port: 8888, - strictPort: false, - open: true, - proxy: { - // '/api/workflow': { - // target: 'http://frp.feashow.cn:31800/', - // // target: 'http://clay.frp.feashow.cn/', - // // target: 'http://192.168.31.175:8000', - // changeOrigin: true, - // rewrite: (path) => path.replace(/^\/api/, '') - // }, - // '/api/admin': { - // // target: 'http://frp.feashow.cn:31800/', - // target: 'http://clay.frp.feashow.cn/', - // // target: 'http://192.168.31.175:8000', - // changeOrigin: true, - // rewrite: (path) => path.replace(/^\/api/, '') - // }, - '/api': { - // target: 'http://kyglweb.scgzjy.com:8080/', - target: 'http://mosr.feashow.cn', - changeOrigin: true, - // target: 'http://clay.frp.feashow.cn', - // // target: 'http://frp.feashow.cn:31800/', - // changeOrigin: true, - // rewrite: (path) => path.replace(/^\/api/, '') - }, - // '/api/notice-ws': { - // target: 'ws://mosr.feashow.cn/summary/notice-ws', - // ws: true, - // changeOrigin: true, - // } - } - } })