UI 优化

hwork-master
zhangkaiios 2025-11-04 14:04:50 +08:00
parent b8fb480511
commit eec9baf4b1
250 changed files with 1923 additions and 17972 deletions

View File

@ -1,3 +1,3 @@
NODE_ENV = development NODE_ENV = development
VUE_APP_API_BASE_URL = 'http://10.180.218.86:9292' VITE_API_BASE_URL = 'http://10.180.218.86:9292'
# VUE_APP_API_BASE_URL = 'http://127.0.0.1:9292' # VITE_API_BASE_URL = 'http://127.0.0.1:9292'

View File

@ -1,2 +1,2 @@
NODE_ENV = 'production' NODE_ENV = 'production'
VUE_APP_API_BASE_URL = 'http://api.pro.pearadmin.com' VITE_API_BASE_URL = 'http://api.pro.pearladmin.com'

View File

@ -5,10 +5,8 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>superMan.ico"> <link rel="icon" href="/public/superMan.ico">
<title> <title>WMS Admin</title>
<%= htmlWebpackPlugin.options.title %>
</title>
<style>.first-loading-wrp{display:flex;justify-content:center;align-items:center;flex-direction:column;min-height:420px;height:100%}.first-loading-wrp>h1{font-size:120px}.first-loading-wrp .loading-wrp{padding:98px;display:flex;justify-content:center;align-items:center}.dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:32px;width:42px;height:42px;box-sizing:border-box}.dot i{width:18px;height:18px;position:absolute;display:block;background-color:#1890ff !important;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.dot i:nth-child(1){top:0;left:0}.dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style> <style>.first-loading-wrp{display:flex;justify-content:center;align-items:center;flex-direction:column;min-height:420px;height:100%}.first-loading-wrp>h1{font-size:120px}.first-loading-wrp .loading-wrp{padding:98px;display:flex;justify-content:center;align-items:center}.dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:32px;width:42px;height:42px;box-sizing:border-box}.dot i{width:18px;height:18px;position:absolute;display:block;background-color:#1890ff !important;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.dot i:nth-child(1){top:0;left:0}.dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
</head> </head>
<body> <body>
@ -21,13 +19,6 @@
<div style="display: flex; justify-content: center; align-items: center;">WMS</div> <div style="display: flex; justify-content: center; align-items: center;">WMS</div>
</div> </div>
</div> </div>
<script> <script type="module" src="/src/main.js"></script>
window.less = {
async: false,
env:"production"
};
</script>
<!-- src="https://cdn.bootcdn.net/ajax/libs/less.js/2.7.2/less.min.js" -->
<script type="text/javascript" href="/less.min2.7.2.js"></script>
</body> </body>
</html> </html>

18268
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -3,12 +3,12 @@
"version": "1.0.0-RELEASE", "version": "1.0.0-RELEASE",
"private": true, "private": true,
"scripts": { "scripts": {
"serve-dev": "vue-cli-service serve --mode development", "dev": "vite --mode development",
"serve": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode development", "prod": "vite --mode production",
"serve-pro": "vue-cli-service serve --mode production", "build": "vite build",
"build-dev": "vue-cli-service build --mode development", "build-dev": "vite build --mode development",
"build-pro": "vue-cli-service build --mode production", "build-pro": "vite build --mode production",
"report": "vue-cli-service build --report" "preview": "vite preview"
}, },
"dependencies": { "dependencies": {
"@ant-design/icons-vue": "^6.0.1", "@ant-design/icons-vue": "^6.0.1",
@ -36,19 +36,12 @@
"devDependencies": { "devDependencies": {
"@types/node": "^14.14.6", "@types/node": "^14.14.6",
"@types/webpack-env": "^1.15.3", "@types/webpack-env": "^1.15.3",
"@vue/cli-plugin-babel": "~4.5.8", "@vitejs/plugin-vue": "^4.0.0",
"@vue/cli-plugin-eslint": "~4.5.8", "eslint": "^8.0.0",
"@vue/cli-service": "~4.5.8", "eslint-plugin-vue": "^9.0.0",
"@vue/compiler-sfc": "^3.2.19", "less": "^4.1.3",
"babel-eslint": "^10.1.0",
"babel-plugin-import": "^1.13.3",
"compression-webpack-plugin": "^4.0.1",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^7.0.0-0",
"less": "^3.13.1",
"less-loader": "^7.1.0",
"mockjs2": "^1.0.8", "mockjs2": "^1.0.8",
"webpackbar": "^4.0.0" "vite": "^4.0.0"
}, },
"eslintConfig": { "eslintConfig": {
"root": true, "root": true,
@ -60,7 +53,8 @@
"eslint:recommended" "eslint:recommended"
], ],
"parserOptions": { "parserOptions": {
"parser": "babel-eslint" "ecmaVersion": 2020,
"sourceType": "module"
}, },
"rules": { "rules": {
"no-unused-vars": "off", "no-unused-vars": "off",

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
// 接口 // 接口
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/sys/config/page', page: '/api/sys/config/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口列表 */ /** 接口列表 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
tree: '/api/sys/dept/tree', tree: '/api/sys/dept/tree',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/sys/dict/page', page: '/api/sys/dict/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
list: '/api/sys/dict/data/list', list: '/api/sys/dict/data/list',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/sys/job/page', page: '/api/sys/job/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/sys/job/log/page', page: '/api/sys/job/log/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/sys/log/page', page: '/api/sys/log/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
send: '/api/sys/mail/send' send: '/api/sys/mail/send'

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
list: '/api/sys/online/list', list: '/api/sys/online/list',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/sys/oss/page', page: '/api/sys/oss/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/sys/post/page', page: '/api/sys/post/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
tree: '/api/sys/power/tree', tree: '/api/sys/power/tree',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
info: '/api/sys/redis/info', info: '/api/sys/redis/info',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
info: '/api/sys/server/info', info: '/api/sys/server/info',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
send: '/api/sys/sms/send' send: '/api/sys/sms/send'

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/sys/tenant/page', page: '/api/sys/tenant/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口 */ /** 接口 */
const Api = { const Api = {

View File

@ -2,7 +2,7 @@ import axios from "axios";
import { import {
message as antdMessage message as antdMessage
} from "@hwork/ant-design-vue"; } from "@hwork/ant-design-vue";
import store from "../store"; import store from '../store/index.js';
import qs from 'qs'; import qs from 'qs';
import router from '@/route/index' import router from '@/route/index'
@ -12,7 +12,7 @@ class Request {
this.config = config || { this.config = config || {
timeout: 8000, timeout: 8000,
withCredentials: true, withCredentials: true,
baseURL: process.env.VUE_APP_API_BASE_URL, baseURL: import.meta.env.VITE_API_BASE_URL,
headers: { headers: {
"Content-Type": "application/json; charset=utf-8" "Content-Type": "application/json; charset=utf-8"
} }
@ -81,7 +81,7 @@ class Request {
); );
} }
errorHandle = function(error) { errorHandle(error) {
var response = error.response var response = error.response
var message = error.message var message = error.message
if (response) { if (response) {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/wms/check/page', page: '/api/wms/check/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/wms/checkDetail/page', page: '/api/wms/checkDetail/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/wms/checkPlt/page', page: '/api/wms/checkPlt/page',

View File

@ -1,4 +1,4 @@
import request from '../../request' import request from '../../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/wms/deliver/page', page: '/api/wms/deliver/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/wms/inBill/page', page: '/api/wms/inBill/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/wms/InBillDetail/page', page: '/api/wms/InBillDetail/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/wms/outBill/page', page: '/api/wms/outBill/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/wms/outBillDetail/page', page: '/api/wms/outBillDetail/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/wms/pick/page', page: '/api/wms/pick/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/wms/sku/page', page: '/api/wms/sku/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
const Api = { const Api = {
page: '/api/wms/skuCategory/page', page: '/api/wms/skuCategory/page',

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -1,4 +1,4 @@
import request from '../request' import request from '../request.js';
/** 接口管理 */ /** 接口管理 */
const Api = { const Api = {

View File

@ -422,4 +422,15 @@ html {
text-align: center; text-align: center;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
line-height: 30px; line-height: 30px;
}
.ant-list-layout-content {
height: 100%;
display: flex;
flex-direction: column;
}
#pro-table {
flex: 1;
overflow: hidden;
display: flex;
flex-direction: column;
} }

View File

@ -1,4 +1,4 @@
import Component from './src' import Component from './src/index.vue'
Component.install = function (Vue) { Component.install = function (Vue) {
Vue.component(Component.name, Component) Vue.component(Component.name, Component)

View File

@ -1,4 +1,4 @@
import Component from './src' import Component from './src/index.vue'
Component.install = function (Vue) { Component.install = function (Vue) {
Vue.component(Component.name, Component) Vue.component(Component.name, Component)

View File

@ -1,4 +1,4 @@
import Component from './src' import Component from './src/index.vue'
Component.install = function (Vue) { Component.install = function (Vue) {
Vue.component(Component.name, Component) Vue.component(Component.name, Component)

View File

@ -1,4 +1,4 @@
import Component from './src' import Component from './src/index.vue'
Component.install = function (Vue) { Component.install = function (Vue) {
Vue.component(Component.name, Component) Vue.component(Component.name, Component)

View File

@ -46,7 +46,7 @@
} from "vue"; } from "vue";
import { import {
list list
} from "../../../api/module/dictData"; } from '../../../api/module/dictData.js';
import { import {
useStore useStore
} from 'vuex'; } from 'vuex';

View File

@ -1,4 +1,4 @@
import Component from './src' import Component from './src/index.vue'
Component.install = function (Vue) { Component.install = function (Vue) {
Vue.component(Component.name, Component) Vue.component(Component.name, Component)

View File

@ -1,4 +1,4 @@
import Component from './src' import Component from './src/index.vue'
Component.install = function (Vue) { Component.install = function (Vue) {
Vue.component(Component.name, Component) Vue.component(Component.name, Component)

View File

@ -1,4 +1,4 @@
import Component from './src' import Component from './src/index.vue'
Component.install = function (Vue) { Component.install = function (Vue) {
Vue.component(Component.name, Component) Vue.component(Component.name, Component)

View File

@ -1,16 +1,16 @@
/*头部组件*/ /*头部组件*/
import Header from "./header"; import Header from './header/index.js';
import Layout from "./layout"; import Layout from './layout/index.js';
import Footer from "./footer"; import Footer from './footer/index.js';
import CardBase from "./cardBase"; import CardBase from './cardBase/index.js';
import Count from "./count"; import Count from './count/index.js';
import Table from './table'; import Table from './table/index.js';
import Query from './query'; import Query from './query/index.js';
import Authority from './authority'; import Authority from './authority/index.js';
import iconPicker from './iconPicker'; import iconPicker from './iconPicker/index.js';
import icon from './icon'; import icon from './icon/index.js';
import Dictionary from './dictionary'; import Dictionary from './dictionary/index.js';
import Modal from './proModal'; import Modal from './proModal/index.js';
const components = [ const components = [
Footer,Header,Layout,CardBase,Count,Table,Query,Authority,iconPicker,icon,Dictionary,Modal Footer,Header,Layout,CardBase,Count,Table,Query,Authority,iconPicker,icon,Dictionary,Modal

View File

@ -1,4 +1,4 @@
import Component from './src' import Component from './src/index.vue'
Component.install = function (Vue) { Component.install = function (Vue) {
Vue.component(Component.name, Component) Vue.component(Component.name, Component)

View File

@ -1,4 +1,4 @@
import Component from './src' import Component from './src/index.vue'
Component.install = function (Vue) { Component.install = function (Vue) {
Vue.component(Component.name, Component) Vue.component(Component.name, Component)

View File

@ -1,7 +1,7 @@
.pro-table-prev { .pro-table-prev {
display: inline-block; display: inline-block;
.ant-btn { .ant-btn {
margin: 4px; margin-right: 12px;
margin-bottom: 8px; margin-bottom: 8px;
} }
} }

View File

@ -61,14 +61,14 @@
</a-modal> </a-modal>
</template> </template>
<script> <script>
import { import {
message message
} from "@hwork/ant-design-vue"; } from "@hwork/ant-design-vue";
import { import {
save save
} from "@/api/module/config"; } from "@/api/module/config";
import "./index.less"; import "./index.less";
import M from "@hwork/ant-design-vue/es/modal/Modal"; import { Modal as M } from "@hwork/ant-design-vue";
import { import {
defineComponent, defineComponent,
reactive, reactive,

View File

@ -1,4 +1,4 @@
import Component from './src' import Component from './src/index.vue'
Component.install = function (Vue) { Component.install = function (Vue) {
Vue.component(Component.name, Component) Vue.component(Component.name, Component)

View File

@ -1,12 +0,0 @@
.pro-query {
.pro-query-select {
width: 180px;
}
.pro-query-button {
margin-left: 3px;
margin-right: 3px;
}
.pro-query-hidden {
margin-left: 10px;
}
}

View File

@ -1,63 +1,45 @@
<template> <template>
<div class="pro-query">
<!-- 表单内容 --> <!-- 表单内容 -->
<a-form <a-search ref="formRef" @search="search" @reset="reset">
ref="formRef" <a-search-item v-show="!param.hidden || !hidden" :label="param.label" :key="index" v-for="(param, index) in searchParam" :span="param.type == 'rangePicker' ? 2 : 1">
layout="inline" <!-- 输入框 -->
:model="formState" <a-input v-model:value="formState[param.key]"
:rules="formRules" v-show="!param.hidden || !hidden"
:label-col="labelCol" v-if="param.type == 'input'" type="text"
:wrapper-col="wrapperCol">
<a-form-item v-show="!param.hidden || !hidden" :label="param.label" :key="index" v-for="(param, index) in searchParam">
<!-- 输入框 -->
<a-input v-model:value="formState[param.key]"
v-show="!param.hidden || !hidden"
v-if="param.type == 'input'" type="text"
:disabled=" param.disabled === undefined ? false : param.disabled">
</a-input>
<!--多行文本框-->
<a-textarea v-model:value="formState[param.key]"
v-show="!param.hidden || !hidden"
v-if="param.type == 'textarea'"
placeholder="Info" :rows="4"
:disabled=" param.disabled === undefined ? false : param.disabled"/>
<!-- 数值输入框 -->
<a-input-number v-model:value="formState[param.key]" :min="1" :max="100" v-show="!param.hidden || !hidden"
v-if="param.type == 'number'" :disabled=" param.disabled === undefined ? false : param.disabled"/>
<!-- 选择框 -->
<a-select v-if="param.type == 'select'"
v-model:value="formState[param.key]"
style="width: 160px" class="pro-query-select"
:disabled=" param.disabled === undefined ? false : param.disabled"> :disabled=" param.disabled === undefined ? false : param.disabled">
<a-select-option :key="index" v-for="(option,index) in param.options" :value="option.value" >{{option.text}}</a-select-option> </a-input>
</a-select> <!--多行文本框-->
<!-- 连级选择器change-on-select 允许只选父节点 --> <a-textarea v-model:value="formState[param.key]"
<a-cascader v-if="param.type == 'cascader'" v-model:value="formState[param.key]" :options="param.options" change-on-select placeholder="Please select" /> v-show="!param.hidden || !hidden"
<!-- 日期选择 --> v-if="param.type == 'textarea'"
<a-time-picker v-if="param.type == 'timePicker'" v-model:value="formState[param.key]" :valueFormat="param.format ? param.format:'YYYY-MM-DD HH:mm:ss'" /> placeholder="Info" :rows="4"
<a-date-picker v-if="param.type == 'datePicker'" v-model:value="formState[param.key]" :valueFormat="param.format ? param.format:'YYYY-MM-DD HH:mm:ss'"/> :disabled=" param.disabled === undefined ? false : param.disabled"/>
<a-range-picker v-if="param.type == 'rangePicker'" v-model:value="formState[param.key]" :valueFormat="param.format ? param.format:'YYYY-MM-DD HH:mm:ss'" <!-- 数值输入框 -->
:format="param.format ? param.format:'YYYY-MM-DD HH:mm:ss'"/> <a-input-number v-model:value="formState[param.key]" :min="1" :max="100" v-show="!param.hidden || !hidden"
<a-week-picker v-if="param.type == 'weekPicker'" v-model:value="formState[param.key]" :valueFormat="param.format ? param.format:'YYYY-MM-DD HH:mm:ss'"/> v-if="param.type == 'number'" :disabled=" param.disabled === undefined ? false : param.disabled"/>
<!-- 内容插槽 --> <!-- 选择框 -->
<template v-if="param.type == 'custom'"> <a-select v-if="param.type == 'select'"
<slot :name="param.customRender" :data="formState"></slot> v-model:value="formState[param.key]"
</template> :disabled=" param.disabled === undefined ? false : param.disabled">
</a-form-item> <a-select-option :key="index" v-for="(option,index) in param.options" :value="option.value" >{{option.text}}</a-select-option>
<!-- 按钮组 --> </a-select>
<a-button type="primary" class="pro-query-button" @click="search"> </a-button> <!-- 连级选择器change-on-select 允许只选父节点 -->
<a-button html-type="submit" class="pro-query-button" @click="reset"> </a-button> <a-cascader v-if="param.type == 'cascader'" v-model:value="formState[param.key]" :options="param.options" change-on-select placeholder="Please select" />
<!-- 收起 隐藏 --> <!-- 日期选择 -->
<a class="pro-query-hidden" @click="hiddenHandle" v-show="hidden && more"> &nbsp;<DownOutlined/></a> <a-time-picker v-if="param.type == 'timePicker'" v-model:value="formState[param.key]" :valueFormat="param.format ? param.format:'YYYY-MM-DD HH:mm:ss'" />
<a class="pro-query-hidden" @click="hiddenHandle" v-show="!hidden && more"> &nbsp;<UpOutlined/></a> <a-date-picker v-if="param.type == 'datePicker'" v-model:value="formState[param.key]" :valueFormat="param.format ? param.format:'YYYY-MM-DD HH:mm:ss'"/>
</a-form> <a-range-picker v-if="param.type == 'rangePicker'" v-model:value="formState[param.key]" :valueFormat="param.format ? param.format:'YYYY-MM-DD HH:mm:ss'"
</div> :format="param.format ? param.format:'YYYY-MM-DD HH:mm:ss'"/>
<a-week-picker v-if="param.type == 'weekPicker'" v-model:value="formState[param.key]" :valueFormat="param.format ? param.format:'YYYY-MM-DD HH:mm:ss'"/>
<!-- 内容插槽 -->
<template v-if="param.type == 'custom'">
<slot :name="param.customRender" :data="formState"></slot>
</template>
</a-search-item>
</a-search>
</template> </template>
<script> <script>
import "./index.less";
import { defineComponent, reactive, ref,watch } from "vue"; import { defineComponent, reactive, ref,watch } from "vue";
import { DownOutlined , UpOutlined } from "@ant-design/icons-vue"
export default defineComponent({ export default defineComponent({
name: "pro-query", name: "pro-query",
props: { props: {
@ -74,8 +56,7 @@ export default defineComponent({
} }
}, },
components: { components: {
DownOutlined,
UpOutlined
}, },
emits: [ emits: [
'on-search', 'on-search',
@ -84,10 +65,6 @@ export default defineComponent({
setup(props, {emit}) { setup(props, {emit}) {
const formRef = ref(); const formRef = ref();
const hidden = ref(true);
const more = ref(false);
const formState = reactive({}) const formState = reactive({})
const formRules = reactive({}) const formRules = reactive({})
/// ///
@ -104,23 +81,11 @@ export default defineComponent({
generateFormState(props.searchParam); generateFormState(props.searchParam);
///
props.searchParam.forEach(element => {
if(element.hidden){
return more.value = true;
}
});
///
const hiddenHandle = function() {
hidden.value = !hidden.value;
}
/// ///
const search = async function(){ const search = async function(){
try { try {
const values = await formRef.value.validate(); emit('on-search', {...formState})
emit('on-search', {...values})
} catch (error) { } catch (error) {
console.log('表单验证失败:', error); console.log('表单验证失败:', error);
} }
@ -128,7 +93,8 @@ export default defineComponent({
/// ///
const reset = function(){ const reset = function(){
formRef.value.resetFields(); generateFormState(props.searchParam);
search();
emit('on-reset') emit('on-reset')
} }
@ -139,14 +105,9 @@ export default defineComponent({
return { return {
formRef, formRef,
more: more,
hidden: hidden,
hiddenHandle: hiddenHandle,
/// EMIT /// EMIT
search: search, search: search,
reset: reset, reset: reset,
/// ///
formState, formState,
formRules, formRules,

View File

@ -1,4 +1,4 @@
import Component from './src' import Component from './src/index.vue'
Component.install = function (Vue) { Component.install = function (Vue) {
Vue.component(Component.name, Component) Vue.component(Component.name, Component)

View File

@ -1,45 +0,0 @@
.pro-table-prev {
display: inline-block;
.ant-btn {
margin: 4px;
margin-bottom: 8px;
}
}
.pro-table-next {
float: right;
.ant-btn {
margin: 4px;
margin-bottom: 8px;
}
}
.filtration {
width: 130px;
.ant-checkbox-wrapper {
margin-left: 14px;
margin-top: 4px;
}
}
/*//点击行的样式*/
.clickRowStyl {
background-color: #a5a5e0 !important;
}
/*//偶数行的样式*/
.evenRowStyl {
background-color: #FFFFFF !important;
}
.ant-table-tbody>tr:hover:not(.ant-table-expanded-row)>td {
background: #bbbbff;
}
/*//鼠标移入样式*/
.ant-table-tbody>tr:hover>td {
background: #a5a5e0 !important
}
.ant-table-tbody > tr > td , .ant-table-tbody > tr > th{
padding: 3px 12px !important
}

View File

@ -95,7 +95,7 @@
</a-table> </a-table>
<!-- 表格组件 --> <!-- 表格组件 -->
<a-table id="table" :rowKey="rowKey" @change="fetch" :columns="columns" :loading="loading" :pagination="pagination" <a-table id="table" :rowKey="rowKey" @change="fetch" :columns="columns" :loading="loading" :pagination="pagination"
:dataSource="datasource" :row-selection="rowSelection" :size="size" :scroll="{ x: 1200, y: 900 }" :dataSource="datasource" :row-selection="rowSelection"
:row-height="100" :customRow="rowClick" :sortDirections="['descend', 'ascend', '']" :row-height="100" :customRow="rowClick" :sortDirections="['descend', 'ascend', '']"
:rowClassName="setRowClassName" @resizeColumn="handleResizeColumn" bordered> :rowClassName="setRowClassName" @resizeColumn="handleResizeColumn" bordered>
<!--列搜索组件封装--> <!--列搜索组件封装-->
@ -258,7 +258,7 @@
<!-- 页脚字段汇总模板,取datasource中的第一条数据渲染table --> <!-- 页脚字段汇总模板,取datasource中的第一条数据渲染table -->
<template #footer="" v-if="showPageTotal && datasource.length>0"> <template #footer="" v-if="showPageTotal && datasource.length>0">
<a-table id="totalTable" :rowKey="rowKey" :data-source=" datasource.slice(0, 1)" :columns="columns" <a-table id="totalTable" :rowKey="rowKey" :data-source=" datasource.slice(0, 1)" :columns="columns"
:pagination="false" :showHeader="false" :scroll="{ x: true, y: false }" :bordered=false size="small"> :pagination="false" :showHeader="false" :bordered=false size="small">
<template #bodyCell="{ column, record }"> <template #bodyCell="{ column, record }">
<!-- 开关转换 --> <!-- 开关转换 -->
<template v-if="column.dataIndex === 'operate'"> <template v-if="column.dataIndex === 'operate'">
@ -275,19 +275,17 @@
</template> </template>
</a-table> </a-table>
</template> </template>
</a-table> </a-table>
</div> </div>
</template> </template>
<script> <script>
import "./index.less";
import FileSaver from 'file-saver'; import FileSaver from 'file-saver';
import * as XLSX from 'xlsx/xlsx.mjs'; import * as XLSX from 'xlsx/xlsx.mjs';
import T from "@hwork/ant-design-vue/es/table/Table"; import T from "@hwork/ant-design-vue/es/table/Table";
//import excelExport from "../module/ExportExcel" //import excelExport from "../module/ExportExcel"
import { import {
list list
} from "../../../api/module/dictData"; } from '../../../api/module/dictData.js';
import { import {
useStore useStore
} from 'vuex'; } from 'vuex';

View File

@ -5,9 +5,9 @@
</template> </template>
<script> <script>
import Editor from "@tinymce/tinymce-vue"; import Editor from "@tinymce/tinymce-vue";
require("./imp.js"); import './imp.js';
import init from "./init"; import init from './init.js';
import initMini from "./init_mini"; import initMini from './init_mini.js';
export default { export default {
name:"tinymce", name:"tinymce",

View File

@ -8,9 +8,9 @@ const plugins = [
"print preview searchreplace autolink directionality visualblocks visualchars fullscreen link media template code codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help autosave autoresize " "print preview searchreplace autolink directionality visualblocks visualchars fullscreen link media template code codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help autosave autoresize "
]; ];
let init = { let init = {
language_url: require("@/assets/tinymce/langs/zh_CN.js"), language_url: "/src/assets/tinymce/langs/zh_CN.js",
language: "zh_CN", language: "zh_CN",
skin_url: require("@/assets/tinymce/skins/ui/oxide/skin.css"), skin_url: "/src/assets/tinymce/skins/ui/oxide/skin.css",
min_height: 300, min_height: 300,
plugins: plugins, plugins: plugins,
toolbar: toolbar, toolbar: toolbar,

View File

@ -7,9 +7,9 @@ const plugins = [
"print preview searchreplace autolink directionality visualblocks visualchars fullscreen link media template code codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help autosave autoresize " "print preview searchreplace autolink directionality visualblocks visualchars fullscreen link media template code codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help autosave autoresize "
]; ];
let init = { let init = {
language_url: require("@/assets/tinymce/langs/zh_CN.js"), language_url: "/src/assets/tinymce/langs/zh_CN.js",
language: "zh_CN", language: "zh_CN",
skin_url: require("@/assets/tinymce/skins/ui/oxide/skin.css"), skin_url: "/src/assets/tinymce/skins/ui/oxide/skin.css",
min_height: 300, min_height: 300,
plugins: plugins, plugins: plugins,
toolbar: toolbar, toolbar: toolbar,

View File

@ -6,13 +6,15 @@
</div> </div>
<!-- 根据侧边收缩状态决定隐显内容 --> <!-- 根据侧边收缩状态决定隐显内容 -->
<!-- <span v-else><img class="image" :src="image" /></span> --> <!-- <span v-else><img class="image" :src="image" /></span> -->
<span v-else><img class="image" :src="require('@/assets/image/superMan.png')" /></span> <span v-else><img class="image" :src="superManImage" /></span>
</div> </div>
</template> </template>
<script> <script>
import { computed } from "vue"; import { computed } from "vue";
import { useStore } from "vuex"; import { useStore } from "vuex";
import config from '@/configure/pear.config.js'; import config from '@/configure/pear.config.js';
import superManImage from '@/assets/image/superMan.png';
export default { export default {
setup() { setup() {
@ -25,7 +27,8 @@ export default {
return { return {
collapsed, collapsed,
image, image,
title title,
superManImage
}; };
} }
}; };

View File

@ -24,9 +24,9 @@
</a-button> </a-button>
<template v-slot:overlay> <template v-slot:overlay>
<a-menu> <a-menu>
<a-menu-item @click="closeAll()"> </a-menu-item> <a-menu-item @click="closeAll()"></a-menu-item>
<a-menu-item @click="closeOther()"> </a-menu-item> <a-menu-item @click="closeOther()"></a-menu-item>
<a-menu-item @click="closeCurrent()"> </a-menu-item> <a-menu-item @click="closeCurrent()"></a-menu-item>
</a-menu> </a-menu>
</template> </template>
</a-dropdown> </a-dropdown>
@ -169,3 +169,22 @@ export default {
} }
}; };
</script> </script>
<style lang="less" scoped>
#tab {
display: flex;
justify-content: space-between;
align-items: flex-start;
.tab {
flex: 1;
overflow: auto;
}
.tab-tool {
margin-top: 5px;
margin-right: 16px;
margin-left: 16px;
}
:deep(.ant-tabs-top >.ant-tabs-nav) {
margin: 0 !important;
}
}
</style>

View File

@ -1,8 +1,8 @@
import { getModule } from '@/tools/common' import { getModule } from '@/tools/common'
import antLocal from '@hwork/ant-design-vue/es/locale/en_US' import antLocal from '@hwork/ant-design-vue/es/locale/en_US'
const requireENContext = require.context('./en-us/', false, /[\w+].(js)$/) const moduleFiles = import.meta.glob('./en-us/*.js', { eager: true })
const enUS = getModule(requireENContext) const enUS = getModule(moduleFiles)
export default { export default {
...enUS, ...enUS,

View File

@ -1,10 +1,10 @@
import { getModule } from '@/tools/common' import { getModule } from '@/tools/common'
import antLocal from '@hwork/ant-design-vue/es/locale/zh_CN' import antLocal from '@hwork/ant-design-vue/es/locale/zh_CN'
const requireENContext = require.context('./zh-cn/', false, /[\w+].(js)$/) const moduleFiles = import.meta.glob('./zh-cn/*.js', { eager: true })
const zhCN = getModule(requireENContext) const zhCN = getModule(moduleFiles)
export default { export default {
...zhCN, ...zhCN,
antLocal antLocal
} }

View File

@ -1,16 +1,20 @@
import { createApp } from "vue"; import { createApp } from "vue";
import Antd from "@hwork/ant-design-vue"; import Antd from "@hwork/ant-design-vue";
import App from "./App.vue"; import App from "./App.vue";
import Router from "./route"; import Router from './route/index.js';
import Store from "./store"; import Store from './store/index.js';
import Pear from "./component"; import Pear from './component/index.js';
import i18n from './locale'; import i18n from './locale/index.js';
import * as antIcons from '@ant-design/icons-vue'; import * as antIcons from '@ant-design/icons-vue';
import { Select, Input, Table } from '@hwork/ant-design-vue'
import "./assets/css/index.less"; import "./assets/css/index.less";
import "@hwork/ant-design-vue/dist/reset.css"; import "@hwork/ant-design-vue/dist/reset.css";
import VueCropper from 'vue-cropper' import VueCropper from 'vue-cropper'
Select.props.placeholder.default = '请选择'
Input.props.placeholder.default = '请输入'
Table.props.scroll.default = { x: 'max-content', y: 'flex' }
const app = createApp(App) const app = createApp(App)
app.use(i18n) app.use(i18n)
app.use(Antd) app.use(Antd)

View File

@ -1,6 +1,6 @@
import {createRouter, createWebHashHistory} from 'vue-router'; import {createRouter, createWebHashHistory} from 'vue-router';
import { permissionController } from "@/route/permission"; import { permissionController } from "@/route/permission";
import routes from './module/base-routes'; import routes from './module/base-routes.js';
import NProgress from "nprogress"; import NProgress from "nprogress";
import "nprogress/nprogress.css"; import "nprogress/nprogress.css";

View File

@ -1,4 +1,4 @@
import Layout from "@/layout"; import Layout from "@/layout/index.vue";
export default [ export default [
{ {

View File

@ -1,6 +1,6 @@
import Layout from "@/layout"; import Layout from "@/layout/index.vue";
import wmsRoutes from './wms-routes'; import wmsRoutes from './wms-routes.js';
export default { export default {
Layout, Layout,
'dashboard-console': () => import('@/view/console/index.vue'), 'dashboard-console': () => import('@/view/console/index.vue'),

View File

@ -1,5 +1,5 @@
import permissionRoutes from './module/main-routes' import permissionRoutes from './module/main-routes.js';
import wmsRoutes from './module/wms-routes' import wmsRoutes from './module/wms-routes.js';
import NProgress from "nprogress"; import NProgress from "nprogress";
import store from "@/store"; import store from "@/store";
import router from "@/route/index"; import router from "@/route/index";

View File

@ -2,13 +2,15 @@ import {createLogger, createStore} from 'vuex';
import { isNotProduction } from "@/tools/common"; import { isNotProduction } from "@/tools/common";
const debug = isNotProduction(); const debug = isNotProduction();
const context = require.context('./module/', false, /([\w+]\.(js))/);
const modules = context.keys().reduce((modules, fileName) => { // Use Vite's import.meta.glob instead of webpack's require.context
const name = fileName.replace(/(\.\/|\.js)/g, ''); const moduleFiles = import.meta.glob('./module/*.js', { eager: true });
const modules = Object.keys(moduleFiles).reduce((modules, path) => {
const name = path.replace(/(\.\/module\/|\.js)/g, '');
return { return {
...modules, ...modules,
[name]: context(fileName).default [name]: moduleFiles[path].default
} }
}, {}); }, {});

View File

@ -1,14 +1,14 @@
/** 生产环境 */ /** 生产环境 */
export const isNotProduction = () => { export const isNotProduction = () => {
return process.env.NODE_ENV !== 'production' return import.meta.env.MODE !== 'production'
} }
/** 聚合导入 */ /** 聚合导入 - Vite版本 */
export const getModule = context => { export const getModule = (moduleFiles) => {
return context.keys().reduce((modules, key) => { return Object.keys(moduleFiles).reduce((modules, path) => {
return { return {
...modules, ...modules,
...context(key).default ...moduleFiles[path].default
} }
}, {}) }, {})
} }

View File

@ -1,7 +1,7 @@
import * as Enums from './enums' import * as Enums from './enums.js';
import { import {
generateEnumOptions generateEnumOptions
} from './helper' } from './helper.js';
/** /**
* 枚举的options集合 * 枚举的options集合

View File

@ -1,4 +1,4 @@
import * as Enums from './enums' import * as Enums from './enums.js';
// import * as EnumsColor from './enum-color' // import * as EnumsColor from './enum-color'
/** /**

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