diff --git a/jcz.rar b/jcz.rar new file mode 100644 index 0000000..c2555f5 Binary files /dev/null and b/jcz.rar differ diff --git a/src/assets/images/dingwei.png b/src/assets/images/dingwei.png new file mode 100644 index 0000000..bfcba6f Binary files /dev/null and b/src/assets/images/dingwei.png differ diff --git a/src/components/GdMap/index.vue b/src/components/GdMap/index.vue index e40ec40..c86bbfe 100644 --- a/src/components/GdMap/index.vue +++ b/src/components/GdMap/index.vue @@ -1,8 +1,7 @@ + + + + + diff --git a/src/views/backOfficeSystem/peopleManag/checkpoint/components/editAddForm.vue b/src/views/backOfficeSystem/peopleManag/checkpoint/components/editAddForm.vue index 19562d0..b6d8e24 100644 --- a/src/views/backOfficeSystem/peopleManag/checkpoint/components/editAddForm.vue +++ b/src/views/backOfficeSystem/peopleManag/checkpoint/components/editAddForm.vue @@ -3,146 +3,78 @@
{{ pageInfo[pageType].title }}
- 保存 + 保存 关闭
- + - + - + - + - + - + - + - + - + - + - + + - - + + +
- - + + - 选择定位 + 选择定位
-
+
+ +
@@ -159,7 +91,7 @@ import { ElMessage } from "element-plus"; const props = defineProps({ dict: { type: Object, - default: () => {} + default: () => { } } }); const rules = reactive({ @@ -173,7 +105,7 @@ const rules = reactive({ { required: true, message: "请选择执勤类型", - trigger: "change" + trigger: "change" } ], jczlx: [ @@ -229,17 +161,17 @@ onMounted(() => { }); }); let pageType = ref("add"); -const forbidden=ref(false) +const forbidden = ref(false) // 初始化数据 const init = (type, row) => { pageType.value = type; dialogForm.value = true; // 根据type和row初始化表单数据 tabHeightFn(); - if (type == "edit"||type == "detail") { + if (type == "edit" || type == "detail") { listQuery.value = { ...row }; if (type == "detail") { - forbidden.value=true + forbidden.value = true } chackLat(); } else { @@ -281,7 +213,7 @@ const selectLocation = () => { //获取经纬度 const chackLat = () => { const { jd, wd } = listQuery.value; - console.log(jd, wd ); + console.log(jd, wd); emitter.emit("deletePointArea", "jczMap_Gzy"); if (jd && wd) { @@ -296,13 +228,13 @@ const chackLat = () => { }; // 初始化时展示地图图标 const mapIcon = (val) => { -console.log(val); + console.log(val); } //页面关闭 const close = () => { dialogForm.value = false; - forbidden.value=false + forbidden.value = false listQuery.value = {}; }; // 表格高度计算 @@ -317,21 +249,25 @@ defineExpose({ init }); + diff --git a/src/views/backOfficeSystem/peopleManag/checkpoint/components/perceptionSource.vue b/src/views/backOfficeSystem/peopleManag/checkpoint/components/perceptionSource.vue index a68b379..c4de4c1 100644 --- a/src/views/backOfficeSystem/peopleManag/checkpoint/components/perceptionSource.vue +++ b/src/views/backOfficeSystem/peopleManag/checkpoint/components/perceptionSource.vue @@ -13,8 +13,9 @@ -
- + +
+ {{ item.sbmc }} @@ -22,17 +23,27 @@
+ + + +
+ @@ -243,4 +269,19 @@ const handleClose = (val) => { color: #b5b5b5; } } + +.box_sp { + .sxtz_btn { + margin-top: 20px; + text-align: right; + } + + padding: 10px; + box-sizing: border-box; +} + +.box_map { + position: relative; + height: 57vh; +} diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 1a8a24f..a538aa2 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -90,7 +90,7 @@ const sxtGetList = () => { }) } -sxtGetList() +// sxtGetList()