diff --git a/src/api/service/dailyTaskPackage.js b/src/api/service/dailyTaskPackage.js index bf21a2a..b99fcc4 100644 --- a/src/api/service/dailyTaskPackage.js +++ b/src/api/service/dailyTaskPackage.js @@ -10,6 +10,14 @@ export function getSelectPage(params) { params }) } +// 自定义分页查询 +export function selectPagezdy(params) { + return request({ + url: api + 'tbZdxlFgxlrw/selectPagezdy', + method: 'GET', + params + }) +} // 修改数据 export function updateData(data) { diff --git a/src/components/export/index.vue b/src/components/export/index.vue index a5e2bd5..2debddd 100644 --- a/src/components/export/index.vue +++ b/src/components/export/index.vue @@ -66,6 +66,10 @@ watch(() => props.lx, (val) => { baseUrl.value = '/mosty-api/mosty-yjzl/tbZdxlFgxlrw/importListByMb' // modelUrl.value = '/mosty-api/mosty-jcgl/tpjcglZnzb/importTemplate' break; + case 'zdyrcrwb': + baseUrl.value = '/mosty-api/mosty-yjzl/tbZdxlFgxlrw/importListByMbZdy' + // modelUrl.value = '/mosty-api/mosty-jcgl/tpjcglZnzb/importTemplate' + break; default: break; } diff --git a/src/router/index.js b/src/router/index.js index 81f721d..0ee4260 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -576,6 +576,15 @@ export const privateRoutes = [{ icon: "article-ranking" }, }, + { + path: "/taskPage/CustomTaskPackage", + component: () => import("@/views/backOfficeSystem/service/taskPage/CustomTaskPackage/index"), + name: "CustomTaskPackage", + meta: { + title: '自定义日常任务包', + icon: "article-ranking" + }, + }, { path: "/taskPage/taskProgress", component: () => import("@/views/backOfficeSystem/service/taskPage/taskProgress/index"), diff --git a/src/views/backOfficeSystem/basicsmanage/patrol-route/mandatory-patrol/index.vue b/src/views/backOfficeSystem/basicsmanage/patrol-route/mandatory-patrol/index.vue index 4e9016b..9db4fce 100644 --- a/src/views/backOfficeSystem/basicsmanage/patrol-route/mandatory-patrol/index.vue +++ b/src/views/backOfficeSystem/basicsmanage/patrol-route/mandatory-patrol/index.vue @@ -25,11 +25,7 @@
- + @@ -70,7 +66,7 @@ - + 查询 重置 @@ -100,7 +96,7 @@ label="序号" > - + - + - - - + - + - +
- - + + 选取坐标
- +
@@ -290,7 +324,11 @@ import { getXfqy } from "@/api/basicsmanage/patrolArea.js"; import { selectDeptPage } from "@/api/user-manage"; import { ref, reactive, onMounted, onUnmounted, getCurrentInstance } from "vue"; const { proxy } = getCurrentInstance(); -const { D_BZ_BXDLX, D_BZ_PBLX,D_BZ_BXDLYDM } = proxy.$dict("D_BZ_BXDLX", "D_BZ_PBLX",'D_BZ_BXDLYDM'); +const { D_BZ_BXDLX, D_BZ_PBLX, D_BZ_BXDLYDM } = proxy.$dict( + "D_BZ_BXDLX", + "D_BZ_PBLX", + "D_BZ_BXDLYDM" +); const cascader = ref(null); const searchBox = ref(null); // 搜索盒子 const tableHeight = ref(); // 表格高度 @@ -367,7 +405,7 @@ function checkZqsc(rule, value, callback) { function chackLat() { form.value.jd = ""; form.value.wd = ""; - emitter.emit("drawShape", { type: "point", flag: "bxd_ht" ,isclear:true}); + emitter.emit("drawShape", { type: "point", flag: "bxd_ht", isclear: true }); } function getLngLat(coordinates) { @@ -392,7 +430,7 @@ function jdChange() { } } function wdChange() { - if (form.value.jd && form.value.wd) { + if (form.value.jd && form.value.wd) { emitter.emit("deletePointArea", "kfd"); setTimeout(() => { emitter.emit("addPointArea", { @@ -480,14 +518,17 @@ function update(row) { title.value = "修改必巡点"; dialogFormVisible.value = true; if (row.jd && row.wd) { - setTimeout(()=>{ - emitter.emit("addPointArea", { - coords: [res], - icon: require("@/assets/point/xfq.png"), - flag: "kfd" - }); - emitter.emit("setMapCenter", { location: [res.jd,res.wd], zoomLevel: 13 }); - },1000) + setTimeout(() => { + emitter.emit("addPointArea", { + coords: [res], + icon: require("@/assets/point/xfq.png"), + flag: "kfd" + }); + emitter.emit("setMapCenter", { + location: [res.jd, res.wd], + zoomLevel: 13 + }); + }, 1000); } }); } @@ -513,13 +554,15 @@ function delDictItem(row) { //获取列表数据 function getListData() { loadingTable.value = true; - getBxd(listQuery.value).then((res) => { - tableData.value = res.records; - total.value = res.total; - loadingTable.value = false; - }).catch(()=>{ - loadingTable.value = false; - }); + getBxd(listQuery.value) + .then((res) => { + tableData.value = res.records; + total.value = res.total; + loadingTable.value = false; + }) + .catch(() => { + loadingTable.value = false; + }); } //关闭弹窗 function close() { @@ -529,7 +572,7 @@ function close() { function submit() { elform.value.validate((valid) => { if (valid) { - form.value.ssbmid = form.value.ssbmdm + form.value.ssbmid = form.value.ssbmdm; btnLoading.value = true; setTimeout(() => { btnLoading.value = false; @@ -575,7 +618,7 @@ const handleCurrentChange = (currentPage) => { }; // 表格高度计算 const tabHeightFn = () => { - tableHeight.value = window.innerHeight - searchBox.value.offsetHeight - 240; + tableHeight.value = window.innerHeight - searchBox.value.offsetHeight - 240; }; onMounted(() => { selectDeptPage({}).then((res) => { @@ -594,7 +637,7 @@ onMounted(() => { window.onresize = function () { tabHeightFn(); }; - emitter.on("coordString", (res) => { + emitter.on("coordString", (res) => { if (res.type === "point") { form.value.jd = res.coord[0]; form.value.wd = res.coord[1]; diff --git a/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/components/DistributePatrolTeamDialog.vue b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/components/DistributePatrolTeamDialog.vue new file mode 100644 index 0000000..978c2c7 --- /dev/null +++ b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/components/DistributePatrolTeamDialog.vue @@ -0,0 +1,1473 @@ + + + + + diff --git a/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/components/addCheckInCard.vue b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/components/addCheckInCard.vue new file mode 100644 index 0000000..894947b --- /dev/null +++ b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/components/addCheckInCard.vue @@ -0,0 +1,313 @@ + + + + + diff --git a/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/editAddFormDialog.vue b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/editAddFormDialog.vue new file mode 100644 index 0000000..4979c45 --- /dev/null +++ b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/editAddFormDialog.vue @@ -0,0 +1,422 @@ + + + + + diff --git a/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/index.vue b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/index.vue new file mode 100644 index 0000000..b7c1a7d --- /dev/null +++ b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/index.vue @@ -0,0 +1,370 @@ + + + + + diff --git a/src/views/backOfficeSystem/service/taskPage/collectPage/AddFgFormDialog.vue b/src/views/backOfficeSystem/service/taskPage/collectPage/AddFgFormDialog.vue index 501328b..e73d31b 100644 --- a/src/views/backOfficeSystem/service/taskPage/collectPage/AddFgFormDialog.vue +++ b/src/views/backOfficeSystem/service/taskPage/collectPage/AddFgFormDialog.vue @@ -68,9 +68,7 @@ const props = defineProps({ default: false } }); - const emits = defineEmits(["update:modelValue", "ok"]); - const dialogFormVisible = computed({ get() { return props.modelValue; @@ -80,14 +78,11 @@ const dialogFormVisible = computed({ // 获取经纬度 setTimeout(() => { emitter.emit("getMapClickCoordinates"); - // 更新地图标注位置 emitter.on("mapClickCoordinates", async (res) => { emitter.emit("deletePointArea"); - form.value.jd = res.lng; form.value.wd = res.lat; - emitter.emit("addPointArea", { coords: [{ jd: res.lng, wd: res.lat }], coordinates: res?.coordinates, @@ -100,7 +95,6 @@ const dialogFormVisible = computed({ } else { emitter.off("getMapClickCoordinates"); } - emits("update:modelValue", val); } }); @@ -109,7 +103,6 @@ const dialogFormVisible = computed({ const form = ref({ bddList: [] }); - //表单验证 const rules = reactive({ bddMc: [ @@ -214,7 +207,6 @@ const setMap = (data, type = true) => { ]; const text = mc; const obj = [{ position: position, text, id, userData: data }]; - emitter.emit("echoPlane", { fontColor: "#12fdb8", coords: obj, @@ -224,11 +216,9 @@ const setMap = (data, type = true) => { linecolor: "#1C97FF" }); emitter.emit("setMapCenter", { location: centerPoint, zoomLevel: 14 }); - // 更新地图标注位置 if (type) return; emitter.emit("deletePointArea"); - emitter.emit("addPointArea", { coords: [{ jd: form.value?.jd, wd: form.value?.wd }], coordinates: [form.value?.jd, form.value?.wd], diff --git a/src/views/backOfficeSystem/service/taskPage/collectPage/index.vue b/src/views/backOfficeSystem/service/taskPage/collectPage/index.vue index 1105862..4d75866 100644 --- a/src/views/backOfficeSystem/service/taskPage/collectPage/index.vue +++ b/src/views/backOfficeSystem/service/taskPage/collectPage/index.vue @@ -7,8 +7,6 @@ import MyTable from "@/components/aboutTable/MyTable.vue"; import Pages from "@/components/aboutTable/Pages.vue"; import AddFgFormDialog from "./AddFgFormDialog.vue" import { fetchTbZdxlFgdwBddSelectPage } from "@/api/service/taskProgress"; - - const searchConfiger = reactive([ { showType: "input", @@ -92,7 +90,6 @@ const getListData = async (params = {}) => { ...pageData.pageConfiger, ...params }) - pageData.tableData = res?.records || [] pageData.total = res.total; pageData.tableConfiger.loading = false;