diff --git a/src/views/driving_inspections/driving_log/drivingLog_info.vue b/src/views/driving_inspections/driving_log/drivingLog_info.vue
index c51eab7..4cccc8f 100644
--- a/src/views/driving_inspections/driving_log/drivingLog_info.vue
+++ b/src/views/driving_inspections/driving_log/drivingLog_info.vue
@@ -88,7 +88,7 @@
| 检查照片 |
-
+ |
|
+
+ 是否合格
+ |
+
+ 合格
+ 不合格
+ |
+
+
+
+
+
+
+
+
+
@@ -128,6 +146,7 @@ const data = reactive({
});
const fnGetData = async () => {
const resData = await getSafetyDrivingLogView({ WAYBILLREGISTRATION_ID });
+ console.log(resData, "11111111111");
data.info = resData.pd;
data.commitmentList = resData.commitmentList;
};
diff --git a/src/views/enterprise_management/information/components/map.vue b/src/views/enterprise_management/information/components/map.vue
index b6dab23..b22cf8d 100644
--- a/src/views/enterprise_management/information/components/map.vue
+++ b/src/views/enterprise_management/information/components/map.vue
@@ -74,32 +74,51 @@ const currentLatitude = ref("");
const fnMapInit = async () => {
loading.value = true;
await nextTick();
+
+ // 定义默认的经纬度
+ const defaultLongitude = "116.3972282409668";
+ const defaultLatitude = "39.90960456049752";
+
+ // 创建地图实例
mapInstance = new window.BMapGL.Map("map_container");
- mapInstance.centerAndZoom(
- new window.BMapGL.Point(
- props.longitude || "116.3972282409668",
- props.latitude || "39.90960456049752"
- )
+
+ // 设置地图的中心点为传入的props值或者默认值
+ const centerPoint = new window.BMapGL.Point(
+ props.longitude || defaultLongitude,
+ props.latitude || defaultLatitude
);
+
+ // 初始化地图的中心点和缩放级别
+ mapInstance.centerAndZoom(centerPoint, 15); // 你可以根据需要设置缩放级别
+
+ // 其他地图初始化设置
mapInstance.enableScrollWheelZoom(true);
mapInstance.setMapStyleV2({
styleId: "6f501abeb2a0cc0d961d110b9407b127",
});
+
+ // 添加默认的标记
+ const marker = new window.BMapGL.Marker(centerPoint);
+ mapInstance.addOverlay(marker);
+ currentLongitude.value = centerPoint.lng;
+ currentLatitude.value = centerPoint.lat;
+
loading.value = false;
- if (props.longitude && props.latitude) {
- const point = new window.BMapGL.Point(props.longitude, props.latitude);
- const marker = new window.BMapGL.Marker(point);
- mapInstance.addOverlay(marker);
- }
+
+ // 添加地图点击事件监听器
mapInstance.addEventListener("click", function (event) {
mapInstance.clearOverlays();
- const point = new window.BMapGL.Point(event.latlng.lng, event.latlng.lat);
- const marker = new window.BMapGL.Marker(point);
- mapInstance.addOverlay(marker);
+ const clickPoint = new window.BMapGL.Point(
+ event.latlng.lng,
+ event.latlng.lat
+ );
+ const clickMarker = new window.BMapGL.Marker(clickPoint);
+ mapInstance.addOverlay(clickMarker);
currentLatitude.value = event.latlng.lat;
currentLongitude.value = event.latlng.lng;
});
};
+
const searchLocation = () => {
if (searchKeyword.value.trim() === "") {
alert("请输入搜索关键字");
diff --git a/src/views/production_course_regulate/management_agreement/components/add.vue b/src/views/production_course_regulate/management_agreement/components/add.vue
index 7dbd15e..8003826 100644
--- a/src/views/production_course_regulate/management_agreement/components/add.vue
+++ b/src/views/production_course_regulate/management_agreement/components/add.vue
@@ -21,7 +21,7 @@
label="经营企业"
prop="OPERATINGCOMPANY"
>
- {{ operatingCompany }}
+ {{ form.OPERATINGCOMPANY }}
+
-
+
diff --git a/src/views/safety_production_related/security_notice/components/select_person.vue b/src/views/safety_production_related/security_notice/components/select_person.vue
index 1a49981..f77547e 100644
--- a/src/views/safety_production_related/security_notice/components/select_person.vue
+++ b/src/views/safety_production_related/security_notice/components/select_person.vue
@@ -43,10 +43,10 @@
ref="tableRef"
v-model:pagination="pagination"
:data="list"
- row-key="RISKCHECKITEM_ID"
+ row-key="USER_ID"
@get-data="fnGetData"
>
-
+
{{ serialNumber(pagination, $index) }}
@@ -71,7 +71,6 @@ import { debounce } from "throttle-debounce";
import useListData from "@/assets/js/useListData.js";
import { watch } from "vue";
import { serialNumber } from "@/assets/js/utils.js";
-import { differenceWith } from "lodash-es";
import { getUserListAll } from "@/request/safety_production_related.js";
import { PERSONTYPEMENU } from "@/assets/js/constant.js";
@@ -94,32 +93,27 @@ const { list, searchForm, pagination, fnGetData, fnResetPagination, tableRef } =
useListData(getUserListAll, {
key: "userList",
immediate: false,
- clearSelection: false,
});
const stop = watch(
() => props.visible,
(value) => {
if (value) {
- fnGetData();
+ fnResetPagination();
stop && stop();
}
}
);
const fnClose = () => {
+ tableRef.value.clearSelection();
visible.value = false;
};
const fnSubmit = debounce(
1000,
() => {
const selectionData = tableRef.value.getSelectionRows();
- const listData = differenceWith(
- selectionData,
- props.listData,
- (a, b) => a.RISKCHECKITEM_ID === b.RISKCHECKITEM_ID
- );
+ emits("submit", selectionData);
fnClose();
- emits("submit", listData);
},
{ atBegin: true }
);