From c3ab39b3c7383b894f1704269c649b26190f2f71 Mon Sep 17 00:00:00 2001 From: Leo_Ding <2405260743@qq.com> Date: Fri, 24 Oct 2025 19:10:39 +0800 Subject: [PATCH 1/4] 1 --- index.html | 160 +++++++++--------- package-lock.json | 107 ------------ package.json | 1 - src/App.vue | 24 ++- src/apis/modules/serverObj.js | 5 +- src/assets/marker.png | Bin 0 -> 19628 bytes src/components/JsonMap/index.vue | 123 ++++++++++++++ src/components/MapWithMarkers/index.vue | 119 +++++++++++++ src/components/ServiceStation/index.vue | 50 ++++++ src/main.js | 8 +- src/router/routes/platform.js | 2 +- src/views/home/index.vue | 2 + src/views/login/bigScreen.vue | 103 ++++++----- src/views/login/map.vue | 10 ++ src/views/login/platForm.vue | 42 +++-- .../serverList/components/EditDialog.vue | 1 + .../serverList/components/TransferOut.vue | 156 +++++++++++++++++ src/views/serverObj/serverList/index.vue | 8 +- .../dictionary/components/EditDialog.vue | 1 + src/views/system/menu/index.vue | 2 +- .../system/role/components/EditDialog.vue | 5 +- yarn.lock | 47 +---- 22 files changed, 673 insertions(+), 303 deletions(-) create mode 100644 src/assets/marker.png create mode 100644 src/components/JsonMap/index.vue create mode 100644 src/components/MapWithMarkers/index.vue create mode 100644 src/components/ServiceStation/index.vue create mode 100644 src/views/login/map.vue create mode 100644 src/views/serverObj/serverList/components/TransferOut.vue diff --git a/index.html b/index.html index df466cc..5037961 100644 --- a/index.html +++ b/index.html @@ -1,87 +1,89 @@ - + + + + + + + + - - - - - - + +
+
+
+
正在加载资源
+
初次加载需要较长时间 请耐心等待
+
+ -
- - - - - \ No newline at end of file + 100% { + transform: rotate(360deg); + } + } + + + + + + diff --git a/package-lock.json b/package-lock.json index dfeedd5..48d9bd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,6 @@ "@ant-design/colors": "^7.0.0", "@ant-design/icons-vue": "^6.1.0", "@icon-park/vue-next": "^1.4.2", - "@jiaminghi/data-view": "^2.10.0", "@tinymce/tinymce-vue": "^5.1.0", "ant-design-vue": "^4.0.1", "axios": "^1.4.0", @@ -905,62 +904,6 @@ "url": "https://github.com/sponsors/kazupon" } }, - "node_modules/@jiaminghi/bezier-curve": { - "version": "0.0.9", - "resolved": "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz", - "integrity": "sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.5.5" - } - }, - "node_modules/@jiaminghi/c-render": { - "version": "0.4.3", - "resolved": "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz", - "integrity": "sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.5.5", - "@jiaminghi/bezier-curve": "*", - "@jiaminghi/color": "*", - "@jiaminghi/transition": "*" - } - }, - "node_modules/@jiaminghi/charts": { - "version": "0.2.18", - "resolved": "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz", - "integrity": "sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.5.5", - "@jiaminghi/c-render": "^0.4.3" - } - }, - "node_modules/@jiaminghi/color": { - "version": "1.1.3", - "resolved": "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz", - "integrity": "sha512-ZY3hdorgODk4OSTbxyXBPxAxHPIVf9rPlKJyK1C1db46a50J0reFKpAvfZG8zMG3lvM60IR7Qawgcu4ZDO3+Hg==", - "license": "MIT" - }, - "node_modules/@jiaminghi/data-view": { - "version": "2.10.0", - "resolved": "https://registry.npmmirror.com/@jiaminghi/data-view/-/data-view-2.10.0.tgz", - "integrity": "sha512-Cud2MTiMcqc5k2KWabR/svuVQmXHANqURo+yj40370/LdI/gyUJ6LG203hWXEnT1nMCeiv/SLVmxv3PXLScCeA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.5.5", - "@jiaminghi/charts": "*" - } - }, - "node_modules/@jiaminghi/transition": { - "version": "1.1.11", - "resolved": "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz", - "integrity": "sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.5.5" - } - }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", @@ -5614,56 +5557,6 @@ "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.14.4.tgz", "integrity": "sha512-P9zv6i1WvMc9qDBWvIgKkymjY2ptIiQ065PjDv7z7fDqH3J/HBRBN5IoiR46r/ujRcU7hCuSIZWvCAFCyuOYZA==" }, - "@jiaminghi/bezier-curve": { - "version": "0.0.9", - "resolved": "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz", - "integrity": "sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==", - "requires": { - "@babel/runtime": "^7.5.5" - } - }, - "@jiaminghi/c-render": { - "version": "0.4.3", - "resolved": "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz", - "integrity": "sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q==", - "requires": { - "@babel/runtime": "^7.5.5", - "@jiaminghi/bezier-curve": "*", - "@jiaminghi/color": "*", - "@jiaminghi/transition": "*" - } - }, - "@jiaminghi/charts": { - "version": "0.2.18", - "resolved": "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz", - "integrity": "sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA==", - "requires": { - "@babel/runtime": "^7.5.5", - "@jiaminghi/c-render": "^0.4.3" - } - }, - "@jiaminghi/color": { - "version": "1.1.3", - "resolved": "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz", - "integrity": "sha512-ZY3hdorgODk4OSTbxyXBPxAxHPIVf9rPlKJyK1C1db46a50J0reFKpAvfZG8zMG3lvM60IR7Qawgcu4ZDO3+Hg==" - }, - "@jiaminghi/data-view": { - "version": "2.10.0", - "resolved": "https://registry.npmmirror.com/@jiaminghi/data-view/-/data-view-2.10.0.tgz", - "integrity": "sha512-Cud2MTiMcqc5k2KWabR/svuVQmXHANqURo+yj40370/LdI/gyUJ6LG203hWXEnT1nMCeiv/SLVmxv3PXLScCeA==", - "requires": { - "@babel/runtime": "^7.5.5", - "@jiaminghi/charts": "*" - } - }, - "@jiaminghi/transition": { - "version": "1.1.11", - "resolved": "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz", - "integrity": "sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg==", - "requires": { - "@babel/runtime": "^7.5.5" - } - }, "@jridgewell/sourcemap-codec": { "version": "1.4.15", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", diff --git a/package.json b/package.json index 793cdc7..2d59900 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "@ant-design/colors": "^7.0.0", "@ant-design/icons-vue": "^6.1.0", "@icon-park/vue-next": "^1.4.2", - "@jiaminghi/data-view": "^2.10.0", "@tinymce/tinymce-vue": "^5.1.0", "ant-design-vue": "^4.0.1", "axios": "^1.4.0", diff --git a/src/App.vue b/src/App.vue index b9a25d5..72612d1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -30,4 +30,26 @@ const theme = ref({ }) - + diff --git a/src/apis/modules/serverObj.js b/src/apis/modules/serverObj.js index 254a1bd..ff543e5 100644 --- a/src/apis/modules/serverObj.js +++ b/src/apis/modules/serverObj.js @@ -17,4 +17,7 @@ export const delItem = (id) => request.basic.delete(`/api/v1/customers/${id}`) export const getCount=(params)=>request.basic.get('/api/v1/customers/count',params) //创建工单 -export const createOrderItem=(params)=> request.basic.post('/api/v1/orders', params) \ No newline at end of file +export const createOrderItem=(params)=> request.basic.post('/api/v1/orders', params) + +//转入转出 +export const inOutLogs=(params)=>request.basic.post('/api/v1/in-out-logs',params) \ No newline at end of file diff --git a/src/assets/marker.png b/src/assets/marker.png new file mode 100644 index 0000000000000000000000000000000000000000..da41963ed4a6526cbf3a2e37f4502ba2aad0a7bb GIT binary patch literal 19628 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 +
+
+
+ + + + + \ No newline at end of file diff --git a/src/components/MapWithMarkers/index.vue b/src/components/MapWithMarkers/index.vue new file mode 100644 index 0000000..0569b5c --- /dev/null +++ b/src/components/MapWithMarkers/index.vue @@ -0,0 +1,119 @@ + + + + + \ No newline at end of file diff --git a/src/components/ServiceStation/index.vue b/src/components/ServiceStation/index.vue new file mode 100644 index 0000000..1924ae3 --- /dev/null +++ b/src/components/ServiceStation/index.vue @@ -0,0 +1,50 @@ + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 4482ae0..6c36947 100644 --- a/src/main.js +++ b/src/main.js @@ -1,12 +1,12 @@ import { createApp } from 'vue' -import {spliceUrl} from '@/utils/util' +import { spliceUrl } from '@/utils/util' import App from '@/App.vue' import { useCore } from '@/core' -import './assets/iconfont/iconfont.css'; +import './assets/iconfont/iconfont.css' // import dataV from '@jiaminghi/data-view' const app = createApp(App) -// app.use(dataV) -app.config.globalProperties.$spliceUrl=spliceUrl + +app.config.globalProperties.$spliceUrl = spliceUrl useCore(app) app.mount('#app') diff --git a/src/router/routes/platform.js b/src/router/routes/platform.js index 763b12d..91cce66 100644 --- a/src/router/routes/platform.js +++ b/src/router/routes/platform.js @@ -6,5 +6,5 @@ export default [ meta: { title: '平台选择', }, - }, + } ] \ No newline at end of file diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 92006ae..4a11928 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,4 +1,5 @@ diff --git a/src/views/login/map.vue b/src/views/login/map.vue new file mode 100644 index 0000000..39d0a74 --- /dev/null +++ b/src/views/login/map.vue @@ -0,0 +1,10 @@ + + \ No newline at end of file diff --git a/src/views/login/platForm.vue b/src/views/login/platForm.vue index 715c560..72da4f9 100644 --- a/src/views/login/platForm.vue +++ b/src/views/login/platForm.vue @@ -1,8 +1,8 @@ @@ -355,7 +355,7 @@ - + @@ -379,6 +379,7 @@ import NodeTree from '@/components/NodeTree/index.vue' import dayjs from 'dayjs' import {DownOutlined} from '@ant-design/icons-vue' import storage from '@/utils/storage' +import TransferOut from './components/TransferOut.vue' defineOptions({ name: 'serverList', }) @@ -387,7 +388,7 @@ const totalCount = ref(0) // 总人数 const dicsStore = useDicsStore() const lineOpen = ref(false) const lineTitle = ref('线下工单') - +const transferRef=ref() const serviceName = ref('') const columns = [ { @@ -678,6 +679,7 @@ const checkHandler = (record) => { }, }) } + /** * 删除 */ diff --git a/src/views/system/dictionary/components/EditDialog.vue b/src/views/system/dictionary/components/EditDialog.vue index 93d029a..76c2d4d 100644 --- a/src/views/system/dictionary/components/EditDialog.vue +++ b/src/views/system/dictionary/components/EditDialog.vue @@ -45,6 +45,7 @@ import apis from '@/apis' import { useForm, useModal, useSpining } from '@/hooks' import { message } from 'ant-design-vue' import { useI18n } from 'vue-i18n' +import storage from '@/utils/storage' const emit = defineEmits(['ok']) const { t } = useI18n() // 解构出t方法 const { modal, showModal, hideModal, showLoading, hideLoading } = useModal() diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 6ddf1b5..24d0549 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -1,7 +1,7 @@