fix: BUG修改
This commit is contained in:
parent
a4d2f79758
commit
8c90f18ed6
11
package-lock.json
generated
11
package-lock.json
generated
@ -45,6 +45,7 @@
|
||||
"vue": "^3.2.47",
|
||||
"vue-i18n": "^9.1.9",
|
||||
"vue-router": "^4.1.6",
|
||||
"vue3-scale-box": "^0.1.9",
|
||||
"vue3-seamless-scroll": "^1.2.0",
|
||||
"vuedraggable": "^4.1.0"
|
||||
},
|
||||
@ -15352,6 +15353,11 @@
|
||||
"typescript": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/vue3-scale-box": {
|
||||
"version": "0.1.9",
|
||||
"resolved": "https://registry.npmmirror.com/vue3-scale-box/-/vue3-scale-box-0.1.9.tgz",
|
||||
"integrity": "sha512-URKBWivTHglmwoqQTs9UBA+lWg7pMuyYusxI5ghU1ks3qZHcM+jCF5uoSiwlKpSd9XP47R3sO12oS+Sc5lW9ig=="
|
||||
},
|
||||
"node_modules/vue3-seamless-scroll": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmmirror.com/vue3-seamless-scroll/-/vue3-seamless-scroll-1.2.0.tgz",
|
||||
@ -27776,6 +27782,11 @@
|
||||
"semver": "^7.3.8"
|
||||
}
|
||||
},
|
||||
"vue3-scale-box": {
|
||||
"version": "0.1.9",
|
||||
"resolved": "https://registry.npmmirror.com/vue3-scale-box/-/vue3-scale-box-0.1.9.tgz",
|
||||
"integrity": "sha512-URKBWivTHglmwoqQTs9UBA+lWg7pMuyYusxI5ghU1ks3qZHcM+jCF5uoSiwlKpSd9XP47R3sO12oS+Sc5lW9ig=="
|
||||
},
|
||||
"vue3-seamless-scroll": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmmirror.com/vue3-seamless-scroll/-/vue3-seamless-scroll-1.2.0.tgz",
|
||||
|
||||
@ -57,6 +57,7 @@
|
||||
"vue": "^3.2.47",
|
||||
"vue-i18n": "^9.1.9",
|
||||
"vue-router": "^4.1.6",
|
||||
"vue3-scale-box": "^0.1.9",
|
||||
"vue3-seamless-scroll": "^1.2.0",
|
||||
"vuedraggable": "^4.1.0"
|
||||
},
|
||||
|
||||
@ -146,6 +146,7 @@ const handleLookItem = row => {
|
||||
};
|
||||
const getTableList = (params: any) => {
|
||||
let newParams = JSON.parse(JSON.stringify(params));
|
||||
getInfo();
|
||||
if (newParams.createTime) {
|
||||
newParams.createTime_begin = newParams.createTime[0];
|
||||
newParams.createTime_end = newParams.createTime[1];
|
||||
@ -173,9 +174,6 @@ const getInfo = async () => {
|
||||
});
|
||||
console.log(res);
|
||||
};
|
||||
onMounted(() => {
|
||||
getInfo();
|
||||
});
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
.table-box {
|
||||
|
||||
@ -146,6 +146,7 @@ const handleLookItem = row => {
|
||||
};
|
||||
const getTableList = (params: any) => {
|
||||
let newParams = JSON.parse(JSON.stringify(params));
|
||||
getInfo();
|
||||
if (newParams.createTime) {
|
||||
newParams.createTime_begin = newParams.createTime[0];
|
||||
newParams.createTime_end = newParams.createTime[1];
|
||||
@ -173,9 +174,6 @@ const getInfo = async () => {
|
||||
});
|
||||
console.log(res);
|
||||
};
|
||||
onMounted(() => {
|
||||
getInfo();
|
||||
});
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
.table-box {
|
||||
|
||||
@ -372,7 +372,7 @@ const saveItem = async (form: any) => {
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
const res = await getRoleNamelist({ state: 1 });
|
||||
const res = await getRoleNamelist({});
|
||||
const res1 = await getTreeList({ deptId: "", status: 1 });
|
||||
formConfig.formItemConfig[7].data = res1.result.map(i => {
|
||||
return {
|
||||
@ -383,7 +383,8 @@ onMounted(async () => {
|
||||
formConfig.formItemConfig[9].data = res.result.map(i => {
|
||||
return {
|
||||
label: i.roleName,
|
||||
value: i.roleId
|
||||
value: i.roleId,
|
||||
disabled: i.state == 0 ? true : false
|
||||
};
|
||||
});
|
||||
// treeDeptList.value = res.result;
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
<template>
|
||||
<!-- <ScaleBox :width="width" :height="height" bgc="transparent" :delay="100" style="top: 0; left: 0"> -->
|
||||
<div class="orderBgc">
|
||||
<!-- <Map3D class="mapStyle"></Map3D> -->
|
||||
<Map2D class="mapStyle"></Map2D>
|
||||
@ -10,16 +11,24 @@
|
||||
</div>
|
||||
<div class="borderBottom"></div>
|
||||
</div>
|
||||
<!-- </ScaleBox> -->
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { onMounted } from "vue";
|
||||
import { ref, onMounted } from "vue";
|
||||
import headerScreen from "./components/header.vue";
|
||||
import centerScreen from "./components/center.vue";
|
||||
import leftScreen from "./components/left.vue";
|
||||
import rightScreen from "./components/right.vue";
|
||||
import Map3D from "./components/map3D.vue";
|
||||
import Map2D from "./components/map2D.vue";
|
||||
import ScaleBox from "vue3-scale-box";
|
||||
// const width = ref(0);
|
||||
// const height = ref(0);
|
||||
// onMounted(() => {
|
||||
// width.value = window.screen.width * window.devicePixelRatio;
|
||||
// height.value = window.screen.height * window.devicePixelRatio;
|
||||
// });
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@ -158,6 +158,7 @@ const handleLookItem = row => {
|
||||
const getTableList = (params: any) => {
|
||||
let newParams = JSON.parse(JSON.stringify(params));
|
||||
console.log(newParams);
|
||||
getInfo();
|
||||
if (newParams.createTime) {
|
||||
newParams.createTime_begin = newParams.createTime[0];
|
||||
newParams.createTime_end = newParams.createTime[1];
|
||||
@ -185,9 +186,6 @@ const getInfo = async () => {
|
||||
});
|
||||
console.log(res);
|
||||
};
|
||||
onMounted(() => {
|
||||
getInfo();
|
||||
});
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
.table-box {
|
||||
|
||||
@ -157,6 +157,7 @@ const handleLookItem = row => {
|
||||
};
|
||||
const getTableList = (params: any) => {
|
||||
let newParams = JSON.parse(JSON.stringify(params));
|
||||
getInfo();
|
||||
if (newParams.createTime) {
|
||||
newParams.createTime_begin = newParams.createTime[0];
|
||||
newParams.createTime_end = newParams.createTime[1];
|
||||
@ -184,9 +185,6 @@ const getInfo = async () => {
|
||||
});
|
||||
console.log(res);
|
||||
};
|
||||
onMounted(() => {
|
||||
getInfo();
|
||||
});
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
.table-box {
|
||||
|
||||
@ -354,7 +354,7 @@ const saveItem = async (form: any) => {
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
const res = await getRoleNamelist({ state: 1 });
|
||||
const res = await getRoleNamelist({});
|
||||
const res1 = await getTreeList({ deptId: "", status: 1 });
|
||||
formConfig.formItemConfig[7].data = res1.result.map(i => {
|
||||
return {
|
||||
@ -365,7 +365,8 @@ onMounted(async () => {
|
||||
formConfig.formItemConfig[9].data = res.result.map(i => {
|
||||
return {
|
||||
label: i.roleName,
|
||||
value: i.roleId
|
||||
value: i.roleId,
|
||||
disabled: i.state == 0 ? true : false
|
||||
};
|
||||
});
|
||||
// treeDeptList.value = res.result;
|
||||
|
||||
@ -147,6 +147,7 @@ const handleLookItem = row => {
|
||||
};
|
||||
const getTableList = (params: any) => {
|
||||
let newParams = JSON.parse(JSON.stringify(params));
|
||||
getInfo();
|
||||
if (newParams.createTime) {
|
||||
newParams.createTime_begin = newParams.createTime[0];
|
||||
newParams.createTime_end = newParams.createTime[1];
|
||||
@ -174,9 +175,6 @@ const getInfo = async () => {
|
||||
});
|
||||
console.log(res);
|
||||
};
|
||||
onMounted(() => {
|
||||
getInfo();
|
||||
});
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
.table-box {
|
||||
|
||||
@ -144,6 +144,7 @@ const handleLookItem = row => {
|
||||
};
|
||||
const getTableList = (params: any) => {
|
||||
let newParams = JSON.parse(JSON.stringify(params));
|
||||
getInfo();
|
||||
if (newParams.createTime) {
|
||||
newParams.createTime_begin = newParams.createTime[0];
|
||||
newParams.createTime_end = newParams.createTime[1];
|
||||
@ -171,9 +172,6 @@ const getInfo = async () => {
|
||||
});
|
||||
console.log(res);
|
||||
};
|
||||
onMounted(() => {
|
||||
getInfo();
|
||||
});
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
.table-box {
|
||||
|
||||
@ -372,7 +372,7 @@ const saveItem = async (form: any) => {
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
const res = await getRoleNamelist({ state: 1 });
|
||||
const res = await getRoleNamelist({});
|
||||
const res1 = await getTreeList({ deptId: "", status: 1 });
|
||||
formConfig.formItemConfig[7].data = res1.result.map(i => {
|
||||
return {
|
||||
@ -383,7 +383,8 @@ onMounted(async () => {
|
||||
formConfig.formItemConfig[9].data = res.result.map(i => {
|
||||
return {
|
||||
label: i.roleName,
|
||||
value: i.roleId
|
||||
value: i.roleId,
|
||||
disabled: i.state == 0 ? true : false
|
||||
};
|
||||
});
|
||||
// treeDeptList.value = res.result;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user