diff --git a/.env b/.env
index 27f9985..ab2a573 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-VITE_BASE_URL=http://192.168.0.62:8093/
+VITE_BASE_URL=http://192.168.0.42:8099/
VITE_PROXY=/api/
VITE_PROXY_QAAQ=/qaaq_api/
VITE_QAAQ_URL=https://gateway.qhdsafety.com/
diff --git a/node_modules/vue-esign/src/index.vue b/node_modules/vue-esign/src/index.vue
index b44b00c..b6d2596 100644
--- a/node_modules/vue-esign/src/index.vue
+++ b/node_modules/vue-esign/src/index.vue
@@ -24,7 +24,7 @@ export default {
},
bgColor: {
type: String,
- default: '#FFFFFF'
+ default: ''
},
isCrop: {
type: Boolean,
diff --git a/src/assets/js/constant.js b/src/assets/js/constant.js
index 618d584..3d53f6e 100644
--- a/src/assets/js/constant.js
+++ b/src/assets/js/constant.js
@@ -18,6 +18,71 @@ export const MENU = [
{ title: "综合管理", model: MODEL["5"] },
{ title: "定位管理", model: MODEL["6"] },
];
+// 安全生成及电子运单管理
+export const VEHICLEMENU = [
+ { title: "鄂A35373", model: MODEL["1"] },
+ { title: "渝B73752", model: MODEL["2"] },
+ { title: "川C87376", model: MODEL["3"] },
+];
+export const PRACTITIONERMENU = [
+ { title: "李某某", model: MODEL["1"] },
+ { title: "张某某", model: MODEL["2"] },
+ { title: "刘某某", model: MODEL["3"] },
+];
+export const TRUCKMENU = [
+ { title: "货AA35373", model: MODEL["1"] },
+ { title: "货B73752", model: MODEL["2"] },
+ { title: "货C87376", model: MODEL["3"] },
+];
+export const PERSONTYPEMENU = [
+ { title: "其他", model: MODEL["1"] },
+ { title: "驾驶员", model: MODEL["2"] },
+ { title: "监控员", model: MODEL["3"] },
+ { title: "押运员", model: MODEL["4"] },
+ { title: "安全负责人", model: MODEL["5"] },
+];
+export const CLIENTMENU = [
+ { title: "李某某", model: MODEL["1"] },
+ { title: "程某某", model: MODEL["2"] },
+ { title: "方某某", model: MODEL["3"] },
+];
+export const CONFIRMMENU = [
+ { title: "薛某某", model: MODEL["1"] },
+ { title: "马某某", model: MODEL["2"] },
+ { title: "林某某", model: MODEL["3"] },
+];
+export const STARTINGMENU = [
+ { title: "河北", model: MODEL["1"] },
+ { title: "河南", model: MODEL["2"] },
+ { title: "山东", model: MODEL["3"] },
+ { title: "山西", model: MODEL["4"] },
+];
+export const ENDMENU = [
+ { title: "广东", model: MODEL["1"] },
+ { title: "广西", model: MODEL["2"] },
+ { title: "湖南", model: MODEL["3"] },
+ { title: "湖北", model: MODEL["4"] },
+];
+export const CUSTOMERTYPEMENU = [
+ { title: "委托方", model: MODEL["1"] },
+ { title: "确认方", model: MODEL["2"] },
+];
+export const LOCATIONTYPEMENU = [
+ { title: "公司", model: MODEL["1"] },
+ { title: "仓库", model: MODEL["2"] },
+ { title: "中转站", model: MODEL["3"] },
+];
+export const LOCATIONNAMEMENU = [
+ { title: "中科", model: MODEL["1"] },
+ { title: "中软", model: MODEL["2"] },
+ { title: "中天", model: MODEL["3"] },
+];
+export const BOROUGHMENU = [
+ { title: "湖北", model: MODEL["1"] },
+ { title: "湖南", model: MODEL["2"] },
+ { title: "四川", model: MODEL["3"] },
+];
+
export const PRINT_STYLE =
'
diff --git a/src/views/electronic_waybill_management/customer_management/index.vue b/src/views/electronic_waybill_management/customer_management/index.vue
new file mode 100644
index 0000000..159881a
--- /dev/null
+++ b/src/views/electronic_waybill_management/customer_management/index.vue
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/electronic_waybill_management/location_managemen/add.vue b/src/views/electronic_waybill_management/location_managemen/add.vue
new file mode 100644
index 0000000..9da42b9
--- /dev/null
+++ b/src/views/electronic_waybill_management/location_managemen/add.vue
@@ -0,0 +1,198 @@
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 地图定位
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
diff --git a/src/views/electronic_waybill_management/location_managemen/index.vue b/src/views/electronic_waybill_management/location_managemen/index.vue
new file mode 100644
index 0000000..5893a8b
--- /dev/null
+++ b/src/views/electronic_waybill_management/location_managemen/index.vue
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/electronic_waybill_management/waybill_registration/add.vue b/src/views/electronic_waybill_management/waybill_registration/add.vue
new file mode 100644
index 0000000..c29b3ff
--- /dev/null
+++ b/src/views/electronic_waybill_management/waybill_registration/add.vue
@@ -0,0 +1,385 @@
+
+
+
+
+ 承运信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 客户信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 地点信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
diff --git a/src/views/electronic_waybill_management/waybill_registration/index.vue b/src/views/electronic_waybill_management/waybill_registration/index.vue
new file mode 100644
index 0000000..0d69d28
--- /dev/null
+++ b/src/views/electronic_waybill_management/waybill_registration/index.vue
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+ 未出发
+ 已出发
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/enterprise_management/information/components/map.vue b/src/views/enterprise_management/information/components/map.vue
index a87842a..bab473b 100644
--- a/src/views/enterprise_management/information/components/map.vue
+++ b/src/views/enterprise_management/information/components/map.vue
@@ -75,9 +75,11 @@ const fnMapInit = async () => {
styleId: "6f501abeb2a0cc0d961d110b9407b127",
});
loading.value = false;
- const point = new window.BMapGL.Point(props.longitude, props.latitude);
- const marker = new window.BMapGL.Marker(point);
- mapInstance.addOverlay(marker);
+ 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);
diff --git a/src/views/enterprise_management/information/info.vue b/src/views/enterprise_management/information/info.vue
index cd5071c..24abff1 100644
--- a/src/views/enterprise_management/information/info.vue
+++ b/src/views/enterprise_management/information/info.vue
@@ -186,7 +186,7 @@
修改
diff --git a/src/views/safety_production_related/safety_meeting/index.vue b/src/views/safety_production_related/safety_meeting/index.vue
index 1e7a25c..26922a2 100644
--- a/src/views/safety_production_related/safety_meeting/index.vue
+++ b/src/views/safety_production_related/safety_meeting/index.vue
@@ -37,9 +37,9 @@
@@ -64,7 +64,7 @@
-
+
查看
-
- 添加
-
+
+
+ 添加
+
+
+
+
+
+
+
+
+
@@ -29,9 +44,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
- const resData = await getUserListAll({});
- data.unitsList = resData.varList;
-};
-fnGetUnitsList();
const relatedClassificationTempList =
await layoutFnGetNotificationsClassification();
const relatedClassificationList = [];
@@ -126,40 +146,79 @@ JSON.parse(relatedClassificationTempList.value.zTreeNodes).forEach((e) => {
const data = reactive({
form: {
TITLE: "",
+ TRANSPORTATIONCOMPANY: "",
LEVEL: "",
PERSON: "",
fileList: [],
+ videoList: [],
NOTIFICATIONCONTENT: "",
allStatus: 0, // 是否全选
+ REPLYSTATUS: "",
+ personList: [],
},
});
+onMounted(async () => {
+ await fnPerson();
+});
+const fnPerson = async () => {
+ const resData = await getSecurityPerson({});
+ data.personList = [resData.pd];
+};
+
+const fnGetUnitsList = async () => {
+ const resData = await getUserListAll({});
+ data.unitsList = resData.varList;
+};
+fnGetUnitsList();
const fnSubmit = async () => {
await useFormValidate(formRef);
const formData = new FormData();
Object.keys(data.form).forEach((key) => {
- formData.append(key, data.form[key]);
+ if (key !== "fileList" && key !== "videoList" && key !== "PERSON") {
+ formData.append(key, data.form[key]);
+ }
+ });
+ formData.append("PERSON_ID", data.form.PERSON_ID);
+ data.form.fileList.forEach((file) => {
+ if (file.raw) {
+ formData.append("fileList", file.raw);
+ }
});
- formData.delete("fileList");
+ data.form.videoList.forEach((file) => {
+ if (file.raw) {
+ formData.append("videoList", file.raw);
+ }
+ });
- for (let i = 0; i < data.form.fileList.length; i++) {
- if (data.form.fileList[i].raw)
- formData.append("FFILE", data.form.fileList[i].raw);
+ try {
+ await addSecurityNotice(formData);
+ ElMessage({
+ message: "添加成功",
+ type: "success",
+ duration: 3000,
+ });
+ // 清空表单
+ Object.keys(data.form).forEach((key) => {
+ if (Array.isArray(data.form[key])) {
+ data.form[key] = []; // 如果是数组，重置为空数组
+ } else {
+ data.form[key] = ""; // 否则重置为空字符串
+ }
+ });
+ } catch (error) {
+ ElMessage.error("添加失败");
+ console.error(error);
}
-
- await addSecurityNotice(formData);
};
-const fnSelectRiskSubmit = (list) => {
- console.log(list);
- const nameList = list.map((val) => {
- return val.USERNAME;
- });
- data.form.PERSON = nameList.join(",");
- data.form.allStatus = 0;
- console.log(data.PERSON, 19);
- console.log("是否全选", data.form.allStatus);
+
+const fnSelectRiskSubmit = (selectionData) => {
+ const userIds = selectionData.map((item) => item.USER_ID).join(", ");
+ const names = selectionData.map((item) => item.NAME).join(", ");
+ data.form.PERSON_ID = userIds;
+ data.form.PERSON = names;
};
const fnSelectAllRiskSubmit = () => {
diff --git a/src/views/safety_production_related/security_notice/components/select_risk.vue b/src/views/safety_production_related/security_notice/components/select_person.vue
similarity index 91%
rename from src/views/safety_production_related/security_notice/components/select_risk.vue
rename to src/views/safety_production_related/security_notice/components/select_person.vue
index edfbffd..ab314f2 100644
--- a/src/views/safety_production_related/security_notice/components/select_risk.vue
+++ b/src/views/safety_production_related/security_notice/components/select_person.vue
@@ -1,5 +1,5 @@
-
+
-
+
{{ serialNumber(pagination, $index) }}
-
-
+
+
+
取消
diff --git a/src/views/safety_production_related/security_notice/index.vue b/src/views/safety_production_related/security_notice/index.vue
index 7982b69..e4cf48a 100644
--- a/src/views/safety_production_related/security_notice/index.vue
+++ b/src/views/safety_production_related/security_notice/index.vue
@@ -47,86 +47,75 @@
+
{{ serialNumber(pagination, $index) }}
-
+
- {{ row.POSTSTATUS === 0 ? "未发布" : "已发布" }}
+ {{ row.LEVEL }}
-
+
+
+ 未发布
+ 已发布
+
-
-
+
+
+ {{
+ row.REPLYSTATUSNUM
+ ? row.REPLYSTATUSNUM + "/" + row.TOTALREADDETAIL + "人"
+ : "0/" + row.TOTALREADDETAIL + "人"
+ }}
+
+
+
+
+
+ {{
+ row.SIGNEDSTATUSNUM
+ ? row.SIGNEDSTATUSNUM + "/" + row.TOTALREADDETAIL + "人"
+ : "0/" + row.TOTALREADDETAIL + "人"
+ }}
+
+
+
-
-
-
- 查看
-
-
- 添加
-
-
- 删除
-
-
-
- 阅读详情
-
-
-
+
+
+
+ 添加
+
+
+ 批量删除
+
+
{
- await ElMessageBox.confirm(`确定要删除吗？`, {
- type: "warning",
+const fnResetPaginationTransfer = () => {
+ fnResetPagination({
+ DEPTIDS: searchForm.value.DEPTIDS?.join(","),
});
- await dateteSecurityNotice({ NOTIFICATION_ID: value });
- ElMessage.success("删除成功");
- fnGetData();
};
+const fnBatchDelete = debounce(
+ 1000,
+ async () => {
+ // eslint-disable-next-line no-undef
+ const selectionData = tableRef.value.getSelectionRows();
+ if (selectionData.length === 0) {
+ ElMessage.warning("请选中要删除的项");
+ return;
+ }
+ await ElMessageBox.confirm("确定要删除选中的数据吗？", { type: "warning" });
+ const DATA_IDS = selectionData
+ .map((item) => item.NOTIFICATION_ID)
+ .join(",");
+ await dateteSecurityAllNotice({ DATA_IDS });
+ ElMessage.success("删除成功");
+ fnResetPaginationTransfer();
+ },
+ { atBegin: true }
+);
const relatedClassificationList = ref(null);
onMounted(async () => {
diff --git a/src/views/safety_production_related/security_notice/notice_info.vue b/src/views/safety_production_related/security_notice/notice_info.vue
index d804c72..21ea248 100644
--- a/src/views/safety_production_related/security_notice/notice_info.vue
+++ b/src/views/safety_production_related/security_notice/notice_info.vue
@@ -24,7 +24,7 @@
- {{ detailItems.PERSON }}
+ {{ detailItems.CREATORNAME }}
{{ detailItems.TRANSPORTATIONCOMPANY }}
diff --git a/src/views/safety_production_related/things_check/add.vue b/src/views/safety_production_related/things_check/add.vue
new file mode 100644
index 0000000..de2477b
--- /dev/null
+++ b/src/views/safety_production_related/things_check/add.vue
@@ -0,0 +1,229 @@
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ city
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
diff --git a/src/views/safety_production_related/things_check/index.vue b/src/views/safety_production_related/things_check/index.vue
new file mode 100644
index 0000000..802785d
--- /dev/null
+++ b/src/views/safety_production_related/things_check/index.vue
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 添加
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 添加
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+