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 0000000..da41963 Binary files /dev/null and b/src/assets/marker.png differ diff --git a/src/components/JsonMap/index.vue b/src/components/JsonMap/index.vue new file mode 100644 index 0000000..464df2c --- /dev/null +++ b/src/components/JsonMap/index.vue @@ -0,0 +1,123 @@ + + + + + \ 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 @@