lcw
This commit is contained in:
@ -3,6 +3,6 @@ module.exports = {
|
|||||||
'@vue/cli-plugin-babel/preset'
|
'@vue/cli-plugin-babel/preset'
|
||||||
],
|
],
|
||||||
plugins: [
|
plugins: [
|
||||||
"@babel/plugin-proposal-optional-chaining"
|
"@babel/plugin-transform-optional-chaining"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
22014
package-lock.json
generated
22014
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -34,6 +34,7 @@
|
|||||||
"xlsx": "^0.18.5"
|
"xlsx": "^0.18.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@babel/plugin-transform-optional-chaining": "^7.13.12",
|
||||||
"@element-plus/icons": "^0.0.11",
|
"@element-plus/icons": "^0.0.11",
|
||||||
"@toast-ui/editor": "^3.0.2",
|
"@toast-ui/editor": "^3.0.2",
|
||||||
"@vue/cli-plugin-babel": "~4.5.0",
|
"@vue/cli-plugin-babel": "~4.5.0",
|
||||||
|
|||||||
@ -27,7 +27,8 @@
|
|||||||
import emitter from "@/utils/eventBus.js";
|
import emitter from "@/utils/eventBus.js";
|
||||||
import GdMap from "@/components/Map/GdMap/index.vue";
|
import GdMap from "@/components/Map/GdMap/index.vue";
|
||||||
import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
|
import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
|
||||||
import { ref,reactive,defineProps,defineEmits,onMounted,onUnmounted,watch } from "vue";
|
import { ref,reactive,defineProps,defineEmits,onMounted,onUnmounted,watch,getCurrentInstance } from "vue";
|
||||||
|
const { proxy } = getCurrentInstance();
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
modelValue: {
|
modelValue: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
@ -92,14 +93,17 @@ function chackLat() {
|
|||||||
|
|
||||||
// 提交
|
// 提交
|
||||||
const submit = () => {
|
const submit = () => {
|
||||||
emits("submit", listQuery.value);
|
|
||||||
|
if (listQuery.value.jd && listQuery.value.wd && listQuery.value.dwmc) {
|
||||||
|
emits("submit",listQuery.value);
|
||||||
close("新增成功");
|
close("新增成功");
|
||||||
|
} else {
|
||||||
|
proxy.$message({ type: "error", message: "请选择经纬度或者输入点位名称" });
|
||||||
|
}
|
||||||
};
|
};
|
||||||
// 关闭
|
// 关闭
|
||||||
const close = () => {
|
const close = () => {
|
||||||
listQuery.value.dwmc = "";
|
listQuery.value={}
|
||||||
listQuery.value.jd = "";
|
|
||||||
listQuery.value.wd = "";
|
|
||||||
emits("update:modelValue", false);
|
emits("update:modelValue", false);
|
||||||
};
|
};
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
|
|||||||
@ -11,7 +11,7 @@
|
|||||||
<div class="head_box">
|
<div class="head_box">
|
||||||
<span class="title">{{ title }}</span>
|
<span class="title">{{ title }}</span>
|
||||||
<div>
|
<div>
|
||||||
<el-button type="primary" size="small" :loading="loading" @click="submit">保存</el-button>
|
<!-- <el-button type="primary" size="small" :loading="loading" @click="submit">保存</el-button> -->
|
||||||
<el-button size="small" @click="close">关闭</el-button>
|
<el-button size="small" @click="close">关闭</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -51,16 +51,13 @@
|
|||||||
</MyTable>
|
</MyTable>
|
||||||
<div class="center-btn">
|
<div class="center-btn">
|
||||||
<el-button style="margin-top: 12px" @click="stepActive--; pageData.tableData = []">上一步</el-button>
|
<el-button style="margin-top: 12px" @click="stepActive--; pageData.tableData = []">上一步</el-button>
|
||||||
<el-button style="margin-top: 12px" @click="stepActive--">提交</el-button>
|
<el-button style="margin-top: 12px" @click="submit">提交</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<FgLoad v-model="fgVisible" @choosedUsers="hanlderChoose" :Single="true" />
|
<FgLoad v-model="fgVisible" @choosedUsers="hanlderChoose" :Single="true" />
|
||||||
<AddDw
|
<AddDw v-model="showDialog" :data="listQuery.fgData"
|
||||||
v-model="showDialog"
|
:dic="{ D_ZDXL_FGXLRW_YJYS, D_ZDXL_FGXLRW_YJDJ, D_ZDXL_FGXLRW_RWZT }" @submit="dwSubmit" />
|
||||||
:data="listQuery.fgData"
|
|
||||||
:dic="{ D_ZDXL_FGXLRW_YJYS, D_ZDXL_FGXLRW_YJDJ, D_ZDXL_FGXLRW_RWZT }"
|
|
||||||
@submit="dwSubmit" />
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
@ -154,31 +151,45 @@ function hanlderChoose(arr) {
|
|||||||
return {
|
return {
|
||||||
id: item.id,
|
id: item.id,
|
||||||
fgmc: item.mc1,
|
fgmc: item.mc1,
|
||||||
x1:item.x1,
|
x1: item.x1,
|
||||||
y1:item.y1,
|
y1: item.y1,
|
||||||
x2:item.x2,
|
x2: item.x2,
|
||||||
y2:item.y2,
|
y2: item.y2,
|
||||||
x11:item.x11,
|
x11: item.x11,
|
||||||
y11:item.y11,
|
y11: item.y11,
|
||||||
x21:item.x21,
|
x21: item.x21,
|
||||||
y21:item.y21 ,
|
y21: item.y21,
|
||||||
zxX:item.zxX,
|
zxX: item.zxX,
|
||||||
zxY:item.zxY,
|
zxY: item.zxY,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
listQuery.value.fgData = jzryList;
|
listQuery.value.fgData = jzryList;
|
||||||
}
|
}
|
||||||
|
|
||||||
const dwSubmit = (val) => {
|
const dwSubmit = (val) => {
|
||||||
|
console.log(val, 'val');
|
||||||
pageData.tableData.push(val)
|
pageData.tableData.push(val)
|
||||||
}
|
}
|
||||||
// 提交
|
// 提交
|
||||||
const submit = () => {
|
const submit = () => {
|
||||||
elform.value.validate((valid) => {
|
// elform.value.validate((valid) => {
|
||||||
if (!valid) return false;
|
// if (!valid) return false;
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
if (title.value == "新增任务") {
|
if (title.value == "新增任务") {
|
||||||
qcckPost(listQuery.value, "/mosty-yszx/tbYsSxt/add")
|
console.log(listQuery.value, pageData.tableData);
|
||||||
|
|
||||||
|
const pramas = {
|
||||||
|
fgRwbt: listQuery.value.rwmc,
|
||||||
|
fgdwId: listQuery.value.fgData[0].id,
|
||||||
|
bddDtos: pageData.tableData.map(item => {
|
||||||
|
return {
|
||||||
|
bddMc: item.dwmc,
|
||||||
|
jd: item.jd,
|
||||||
|
wd: item.wd
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
qcckPost(pramas, "/mosty-yjzl/tbZdxlFgxlrw/addZdyxlFgxlrw")
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
proxy.$message({ type: "success", message: "新增成功" });
|
proxy.$message({ type: "success", message: "新增成功" });
|
||||||
close();
|
close();
|
||||||
@ -188,17 +199,17 @@ const submit = () => {
|
|||||||
loading.value = false;
|
loading.value = false;
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
qcckPut(listQuery.value, "/mosty-yszx/tbYsSxt/update")
|
// qcckPut(listQuery.value, "/mosty-yszx/tbYsSxt/update")
|
||||||
.then((res) => {
|
// .then((res) => {
|
||||||
proxy.$message({ type: "success", message: "修改成功" });
|
// proxy.$message({ type: "success", message: "修改成功" });
|
||||||
close();
|
// close();
|
||||||
emit("updateDate");
|
// emit("updateDate");
|
||||||
})
|
// })
|
||||||
.catch(() => {
|
// .catch(() => {
|
||||||
loading.value = false;
|
// loading.value = false;
|
||||||
});
|
// });
|
||||||
}
|
}
|
||||||
});
|
// });
|
||||||
};
|
};
|
||||||
const deletList = (idx) => {
|
const deletList = (idx) => {
|
||||||
console.log(idx, 'idx');
|
console.log(idx, 'idx');
|
||||||
|
|||||||
@ -20,10 +20,11 @@
|
|||||||
<div class="tabBox">
|
<div class="tabBox">
|
||||||
<MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight" :tableConfiger="pageData.tableConfiger"
|
<MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight" :tableConfiger="pageData.tableConfiger"
|
||||||
:controlsWidth="pageData.controlsWidth" @chooseData="chooseData">
|
:controlsWidth="pageData.controlsWidth" @chooseData="chooseData">
|
||||||
<template #rwzt="{ row }">
|
<template #rwZt="{ row }">
|
||||||
<el-table-column prop="wlq" label="未领取"/>
|
<!-- <el-table-column prop="wlq" label="未领取"/>
|
||||||
<el-table-column prop="ylq" label="已领取"/>
|
<el-table-column prop="ylq" label="已领取"/>
|
||||||
<el-table-column prop="ywc" label="已完成"/>
|
<el-table-column prop="ywc" label="已完成"/> -->
|
||||||
|
<dict-tag :options="D_BZ_QWRWZT" :value="row.rwZt" :tag="false" />
|
||||||
</template>
|
</template>
|
||||||
<template #controls="{ row }">
|
<template #controls="{ row }">
|
||||||
<!-- 领取后不可再编辑,领取后不可再删除 -->
|
<!-- 领取后不可再编辑,领取后不可再删除 -->
|
||||||
@ -51,7 +52,7 @@ import Pages from "@/components/aboutTable/Pages.vue";
|
|||||||
import Search from "@/components/aboutTable/Search.vue";
|
import Search from "@/components/aboutTable/Search.vue";
|
||||||
import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
|
import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
|
||||||
const { proxy } = getCurrentInstance();
|
const { proxy } = getCurrentInstance();
|
||||||
const { D_BZ_SBLX, D_BZ_GZSBLX } = proxy.$dict("D_BZ_SBLX", "D_BZ_GZSBLX");
|
const { D_BZ_SBLX, D_BZ_GZSBLX,D_BZ_QWRWZT } = proxy.$dict("D_BZ_SBLX", "D_BZ_GZSBLX","D_BZ_QWRWZT");
|
||||||
const ids = ref([]); //多选
|
const ids = ref([]); //多选
|
||||||
const searchBox = ref(); //搜索框
|
const searchBox = ref(); //搜索框
|
||||||
const listQuery = ref({});
|
const listQuery = ref({});
|
||||||
@ -84,11 +85,11 @@ const pageData = reactive({
|
|||||||
}, //分页
|
}, //分页
|
||||||
controlsWidth: 210, //操作栏宽度
|
controlsWidth: 210, //操作栏宽度
|
||||||
tableColumn: [
|
tableColumn: [
|
||||||
{ label: "任务名称", prop: "sbmc" },
|
{ label: "任务名称", prop: "fgRwbt" },
|
||||||
{ label: "方格编号", prop: "sbbh" },
|
{ label: "方格编号", prop: "fgMc" },
|
||||||
{ label: "下发时间", prop: "xfcsj" },
|
{ label: "下发日期", prop: "xtCjsj" },
|
||||||
{ label: "任务领取人", prop: "rwlqr" },
|
{ label: "任务领取人", prop: "rwlqr" },
|
||||||
{ label: "任务状态", prop: "rwzt", showSolt: true },
|
{ label: "任务状态", prop: "rwZt", showSolt: true },
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
@ -106,18 +107,19 @@ const getDataList = () => {
|
|||||||
let pramas = {
|
let pramas = {
|
||||||
pageSize: pageData.pageConfiger.pageSize,
|
pageSize: pageData.pageConfiger.pageSize,
|
||||||
pageCurrent: pageData.pageConfiger.pageNum,
|
pageCurrent: pageData.pageConfiger.pageNum,
|
||||||
|
rwlx:3,
|
||||||
...listQuery.value
|
...listQuery.value
|
||||||
};
|
};
|
||||||
// pageData.tableConfiger.loading = true;
|
pageData.tableConfiger.loading = true;
|
||||||
// qcckPost(pramas, "/mosty-yszx/tbYsSxt/getPageList")
|
qcckGet(pramas, "/mosty-yjzl/tbZdxlFgxlrw/selectPage")
|
||||||
// .then((res) => {
|
.then((res) => {
|
||||||
// pageData.tableData = res.records || [];
|
pageData.tableData = res.records || [];
|
||||||
// pageData.tableConfiger.loading = false;
|
pageData.tableConfiger.loading = false;
|
||||||
// pageData.total = res.total;
|
pageData.total = res.total;
|
||||||
// })
|
})
|
||||||
// .catch(() => {
|
.catch(() => {
|
||||||
// pageData.tableConfiger.loading = false;
|
pageData.tableConfiger.loading = false;
|
||||||
// });
|
});
|
||||||
};
|
};
|
||||||
const changeNo = (val) => {
|
const changeNo = (val) => {
|
||||||
pageData.pageConfiger.pageNum = val;
|
pageData.pageConfiger.pageNum = val;
|
||||||
|
|||||||
@ -3,8 +3,8 @@ const path = require("path");
|
|||||||
function resolve(dir) {
|
function resolve(dir) {
|
||||||
return path.join(__dirname, dir);
|
return path.join(__dirname, dir);
|
||||||
}
|
}
|
||||||
const serverHost = "http://118.122.165.45:35623";
|
// const serverHost = "http://118.122.165.45:35623";
|
||||||
// const serverHost = "http://192.168.3.105:8006";
|
const serverHost = "http://192.168.31.94:8006";
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
publicPath: "/",
|
publicPath: "/",
|
||||||
|
|||||||
Reference in New Issue
Block a user