diff --git a/package-lock.json b/package-lock.json index fda808e..9ea4b18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2043,6 +2043,51 @@ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -2051,6 +2096,28 @@ "requires": { "minipass": "^3.1.1" } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } } } }, @@ -14550,75 +14617,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-router": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.3.tgz", diff --git a/src/api/mosty-jcz.js b/src/api/mosty-jcz.js index 6290838..bf53d0c 100644 --- a/src/api/mosty-jcz.js +++ b/src/api/mosty-jcz.js @@ -157,7 +157,18 @@ export const jczdeleteList = (id) => { return request({ // url: api + "/tbQwXfll/deleteList", url: api + `/tbQwXfll/delXfll/${id}`, - method: "post" + method: "delete" + }); +}; +/* + *删除感知源 + * return promise 实例对象 + */ +export const gzydeleteList = (id) => { + return request({ + // url: api + "/tbQwXfll/deleteList", + url: api + `/tbJczSxt/delEntity/${id}`, + method: "delete" }); }; /* @@ -387,11 +398,10 @@ export const JczupdateJcz = (data) => { }); }; // 删除检查站 -export const JczdeleteById = (data) => { +export const JczdeleteById = (id) => { return request({ - url: api + `/jcz/deleteById`, - method: "post", - data + url: api + `/jcz/deleteById/${id}`, + method: "delete" }); }; //盘查管理 diff --git a/src/views/backOfficeSystem/Report/ReportingCenter/components/editAddForm.vue b/src/views/backOfficeSystem/Report/ReportingCenter/components/editAddForm.vue index 3ce9ade..03e1d47 100644 --- a/src/views/backOfficeSystem/Report/ReportingCenter/components/editAddForm.vue +++ b/src/views/backOfficeSystem/Report/ReportingCenter/components/editAddForm.vue @@ -25,9 +25,7 @@ }" v-model="listQuery.jczList" :dic="props.dic" />
- {{ - listQuery.jczList.jczmc - }} + {{ listQuery.jczList.jczmc }}
{{ @@ -315,9 +313,11 @@ const _onSave = () => { case "07": listQuery.value.bcKts = 8; } + if (listQuery.value.jczList) { + listQuery.value.jczid = listQuery.value.jczList.id; + listQuery.value.jczmc = listQuery.value.jczList.jczmc; + } - listQuery.value.jczid = listQuery.value.jczList.id; - listQuery.value.jczmc = listQuery.value.jczList.jczmc; if (pageType.value == "add") { jczsavel(listQuery.value).then((res) => { ElMessage({ message: "新增成功", type: "success" }); @@ -339,7 +339,7 @@ const ChegeMj = (val) => { ryXm: item.xm, rysfzh: item.sfzh, ryJzlx: item.fl, - ryMfjilb: item.ryid, + ryMfjilb: item.ryId ? item.ryId : "", ryLxdh: item.lxdh }; }); diff --git a/src/views/backOfficeSystem/Report/ReportingCenter/index.vue b/src/views/backOfficeSystem/Report/ReportingCenter/index.vue index 959478b..2b70726 100644 --- a/src/views/backOfficeSystem/Report/ReportingCenter/index.vue +++ b/src/views/backOfficeSystem/Report/ReportingCenter/index.vue @@ -3,10 +3,10 @@
- - 新增 + + + + 新增
@@ -15,15 +15,9 @@
- + @@ -33,22 +27,14 @@ 详情 - +
- + @@ -144,7 +130,8 @@ const changeSize = (val) => { // 获取列表 const getjczgetXfllList = () => { pageData.tableConfiger.loading = true; - XfbbselectPage({ pageSize: 10, pageCurrent: 1 }).then((res) => { + let params = { ...queryFrom.value, pageSize: 10, pageCurrent: 1 } + XfbbselectPage(params).then((res) => { pageData.tableData = res.records || []; pageData.total = res.total; }).finally(() => { @@ -163,7 +150,7 @@ const delDictItem = (ids) => { getjczgetXfllList(); }); }) - .catch(() => {}); + .catch(() => { }); }; getjczgetXfllList(); // 新增 diff --git a/src/views/backOfficeSystem/peopleManag/InspectedVehicle/index.vue b/src/views/backOfficeSystem/peopleManag/InspectedVehicle/index.vue index c9b89dc..4df9591 100644 --- a/src/views/backOfficeSystem/peopleManag/InspectedVehicle/index.vue +++ b/src/views/backOfficeSystem/peopleManag/InspectedVehicle/index.vue @@ -49,6 +49,7 @@ import Pages from "@/components/aboutTable/Pages.vue"; import Search from "@/components/aboutTable/Search.vue"; import EditAddForm from "./components/editAddForm.vue"; import { GjcltxselectPage, GjcltxdeleteById } from "@/api/mosty-jcz.js"; +import { ElMessage } from "element-plus"; import { isAuth } from '@/utils/tools.js' import { reactive, ref, onMounted, getCurrentInstance } from "vue"; const { proxy } = getCurrentInstance(); diff --git a/src/views/backOfficeSystem/peopleManag/Inspector/index.vue b/src/views/backOfficeSystem/peopleManag/Inspector/index.vue index 279251a..0584103 100644 --- a/src/views/backOfficeSystem/peopleManag/Inspector/index.vue +++ b/src/views/backOfficeSystem/peopleManag/Inspector/index.vue @@ -89,7 +89,8 @@ import PageTitle from "@/components/aboutTable/PageTitle.vue"; import MyTable from "@/components/aboutTable/MyTable.vue"; import Pages from "@/components/aboutTable/Pages.vue"; import Search from "@/components/aboutTable/Search.vue"; -import {isAuth }from '@/utils/tools.js' +import { isAuth } from '@/utils/tools.js' +import { ElMessage } from "element-plus"; import EditAddForm from "./components/editAddForm.vue"; import { GjrytxselectPage, GjrytxdeleteById } from "@/api/mosty-jcz.js"; import { reactive, ref, onMounted, getCurrentInstance } from "vue"; diff --git a/src/views/backOfficeSystem/peopleManag/Intelligent/index.vue b/src/views/backOfficeSystem/peopleManag/Intelligent/index.vue index f7b01e7..9203f7e 100644 --- a/src/views/backOfficeSystem/peopleManag/Intelligent/index.vue +++ b/src/views/backOfficeSystem/peopleManag/Intelligent/index.vue @@ -3,10 +3,10 @@
- - 新增 + + + + 新增
@@ -15,22 +15,16 @@
- + - diff --git a/src/views/backOfficeSystem/peopleManag/registrationVehicles/index.vue b/src/views/backOfficeSystem/peopleManag/registrationVehicles/index.vue index 1432745..f7d1ca8 100644 --- a/src/views/backOfficeSystem/peopleManag/registrationVehicles/index.vue +++ b/src/views/backOfficeSystem/peopleManag/registrationVehicles/index.vue @@ -3,10 +3,10 @@
- - 新增 + + + + 新增
@@ -15,15 +15,9 @@
- + @@ -36,37 +30,29 @@ - 详情 + 详情 - +
- +