From 3700602c413f065b9ebbce199ca1a99bde96cfe9 Mon Sep 17 00:00:00 2001 From: 13684185576 <2731628804@qq.com> Date: Mon, 7 Jul 2025 09:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 136 ++++--- .../MyComponents/PackageSelect/index.vue | 55 +++ src/components/MyComponents/index.js | 4 +- src/styles/element-override.scss | 43 +- .../passengerTransport/index.vue | 64 +-- .../routeManagement/index.vue | 39 +- .../systemConfig/user-list/index.vue | 378 ++++-------------- .../ticketPurchase/components/detailForm.vue | 52 +-- .../backOfficeSystem/ticketPurchase/index.vue | 61 ++- vue.config.js | 2 +- 10 files changed, 288 insertions(+), 546 deletions(-) create mode 100644 src/components/MyComponents/PackageSelect/index.vue 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/components/MyComponents/PackageSelect/index.vue b/src/components/MyComponents/PackageSelect/index.vue new file mode 100644 index 0000000..3eacd18 --- /dev/null +++ b/src/components/MyComponents/PackageSelect/index.vue @@ -0,0 +1,55 @@ + + + + diff --git a/src/components/MyComponents/index.js b/src/components/MyComponents/index.js index 97a7054..2c7ed03 100644 --- a/src/components/MyComponents/index.js +++ b/src/components/MyComponents/index.js @@ -11,6 +11,7 @@ import Upload from "./Upload/index.vue"; import Department from "./Department/index.vue"; import DepartmentTree from "./DepartmentTree/index.vue"; import ChooseIcon from "./ChooseIcon/index.vue"; +import PackageSelect from "./PackageSelect/index.vue"; import StationSelect from "./StationSelect/index.vue"; import Provinces from "./Provinces2/index.vue"; import MarkdownEdit from "./MarkdownEdit/index.vue"; @@ -36,5 +37,6 @@ export { MarkdownEdit, FileUpload, RichOnly, - Date + Date, + PackageSelect }; diff --git a/src/styles/element-override.scss b/src/styles/element-override.scss index 3157efe..3f843bf 100644 --- a/src/styles/element-override.scss +++ b/src/styles/element-override.scss @@ -89,22 +89,22 @@ $test: rgba(0, 128, 0, 0.603); .is-error { .form-item-box { position: relative; - .el-input { - background-color: #001238; - .el-input__inner { - background-color: #001238; - } - .el-input__count .el-input__count-inner { - background-color: #001238; - } - } + // .el-input { + // background-color: #001238; + // .el-input__inner { + // background-color: #001238; + // } + // .el-input__count .el-input__count-inner { + // background-color: #001238; + // } + // } .el-cascader__tags { - .el-tag { - background: #001238; - } - .el-cascader__search-input { - background: #001238; - } + // .el-tag { + // background: #001238; + // } + // .el-cascader__search-input { + // background: #001238; + // } .el-cascader__search-input { margin: 2px 0 2px 13px !important; } @@ -130,13 +130,12 @@ $test: rgba(0, 128, 0, 0.603); position: relative; .el-input { border: #57d040; - .el-input__inner { - background-color: #001238; - // border: 1px solid #57d040; - } - .el-input__count .el-input__count-inner { - background-color: #001238; - } + // .el-input__inner { + // background-color: #001238; + // } + // .el-input__count .el-input__count-inner { + // background-color: #001238; + // } } .el-cascader__tags { .el-tag { diff --git a/src/views/backOfficeSystem/passengerTransport/index.vue b/src/views/backOfficeSystem/passengerTransport/index.vue index ac3530a..73a06c2 100644 --- a/src/views/backOfficeSystem/passengerTransport/index.vue +++ b/src/views/backOfficeSystem/passengerTransport/index.vue @@ -5,11 +5,7 @@
- +
- + - +
@@ -72,13 +53,13 @@ const searchBox = ref(); //搜索框 const searchConfiger = ref([ { label: "单位名称", - prop: "placeName", + prop: "dwmc", placeholder: "单位名称", showType: "input" }, { label: "单位类型", - prop: "placeName", + prop: "dwlx", placeholder: "单位类型", showType: "input" } @@ -86,18 +67,7 @@ const searchConfiger = ref([ const queryFrom = ref({}); const pageData = reactive({ - tableData: [ - // { - // id: 1, - // placeName: "老王打印店", - // placePhone: "13800138000", - // legalPersonName: "张三", - // legalPersonId: "511222222222222", - // legalPersonPhone: "13900139000", - // operationStatus: "在营", - // jurisdiction: "巴宜区纺织路派出所" - // } - ], + tableData: [], keyCount: 0, tableConfiger: { rowHieght: 61, @@ -111,10 +81,10 @@ const pageData = reactive({ }, controlsWidth: 200, tableColumn: [ - { label: "单位名称", prop: "placeName" }, - { label: "单位类型", prop: "operationStatus" }, - { label: "单位车辆数量", prop: "jurisdiction" }, - { label: "所属辖区", prop: "legalPersonName" } + { label: "单位名称", prop: "dwmc" }, + { label: "单位类型", prop: "dwlx" }, + { label: "单位车辆数量", prop: "dwclsl" }, + { label: "所属辖区", prop: "ssxq" } ] }); diff --git a/src/views/backOfficeSystem/routeManagement/index.vue b/src/views/backOfficeSystem/routeManagement/index.vue index ee823a4..cb305bf 100644 --- a/src/views/backOfficeSystem/routeManagement/index.vue +++ b/src/views/backOfficeSystem/routeManagement/index.vue @@ -5,11 +5,7 @@
- +
- + - +
@@ -99,10 +84,10 @@ const pageData = reactive({ }, controlsWidth: 200, tableColumn: [ - { label: "公交线路名称", prop: "placeName" }, - { label: "公交线路起点站", prop: "operationStatus" }, - { label: "公交线路终点站", prop: "jurisdiction" }, - { label: "行政区划", prop: "legalPersonName" } + { label: "公交线路名称", prop: "xlmc" }, + { label: "公交线路起点站", prop: "xlqdz" }, + { label: "公交线路终点站", prop: "xlzdz" }, + { label: "行政区划", prop: "xzqy" } ] }); diff --git a/src/views/backOfficeSystem/systemConfig/user-list/index.vue b/src/views/backOfficeSystem/systemConfig/user-list/index.vue index 01d9604..37d202b 100644 --- a/src/views/backOfficeSystem/systemConfig/user-list/index.vue +++ b/src/views/backOfficeSystem/systemConfig/user-list/index.vue @@ -4,7 +4,9 @@
用户管理
- + + + 新增
@@ -12,46 +14,23 @@
- + - + - - + - + - {{ item.label }} + {{ item.label + }} - 查询 重置 @@ -60,71 +39,27 @@
- +
- - - - - + + + + + - + - + @@ -687,7 +448,7 @@ const closeDialog = () => { dialogFormVisible.value = false; }; -const moreAction = (e, item) => {}; +const moreAction = (e, item) => { }; //分配角色 const currentUserId = ref(""); @@ -704,7 +465,7 @@ const restPwd = (row) => { handleFilter(); }); }; -const handleClick = (e) => {}; +const handleClick = (e) => { }; //watch监听路由变化 watch(roleDialogVisible, (val) => { @@ -782,5 +543,4 @@ onUnmounted(() => { // width: 380px; // } // } -// } - +// } diff --git a/src/views/backOfficeSystem/ticketPurchase/components/detailForm.vue b/src/views/backOfficeSystem/ticketPurchase/components/detailForm.vue index 61fc893..7342235 100644 --- a/src/views/backOfficeSystem/ticketPurchase/components/detailForm.vue +++ b/src/views/backOfficeSystem/ticketPurchase/components/detailForm.vue @@ -55,20 +55,12 @@
-
+
{{ item.xm }}
{{ item.sfzh }}
- +
{{ item.hjdz }}
@@ -88,22 +80,13 @@
上车地址
-
+
{{ item.xm }}
{{ item.sfzh }}
- +
-
{{ item.hjdz }}
{{ item.scdz }}
@@ -122,20 +105,12 @@
户籍地址
-
+
{{ item.xm }}
{{ item.sfzh }}
- +
{{ item.hjdz }}
@@ -182,7 +157,9 @@
-
+
+ +
@@ -205,7 +182,6 @@ const show = ref(true); const init = (type, row) => { dialogForm.value = true; // 根据type和row初始化表单数据 - if (type == "track") { show.value = false; gettbGpJbxxgetInfo(row.id); @@ -261,6 +237,7 @@ defineExpose({ init }); align-items: center; margin-bottom: 20px; } + .cntinfo { height: calc(100% - 70px); overflow: hidden; @@ -270,6 +247,7 @@ defineExpose({ init }); .form-row { display: flex; color: #000; + .form-item { line-height: 32px; align-items: center; @@ -277,10 +255,12 @@ defineExpose({ init }); width: 100%; display: flex; } + .el-form-items { flex: 0.5; } } + .lable { background-color: #f7fafb; padding: 0px 8px; @@ -290,6 +270,7 @@ defineExpose({ init }); height: 36px; border: 1px solid #e3e7ed; } + .menu { height: 36px; flex: 1; @@ -297,9 +278,11 @@ defineExpose({ init }); border: 1px solid #e3e7ed; background-color: #fff; } + .control { background-color: #f7fafb; } + .upload-group { display: flex; // gap: 20px; @@ -312,6 +295,7 @@ defineExpose({ init }); .unit { margin-left: 5px; } + ::v-deep .el-input__inner { height: 36px !important; line-height: 36px !important; @@ -319,9 +303,11 @@ defineExpose({ init }); color: #777575; } } + .interval { margin-top: 10px; } + .map { margin-top: 10px; height: 85%; diff --git a/src/views/backOfficeSystem/ticketPurchase/index.vue b/src/views/backOfficeSystem/ticketPurchase/index.vue index 19d83fa..676ae12 100644 --- a/src/views/backOfficeSystem/ticketPurchase/index.vue +++ b/src/views/backOfficeSystem/ticketPurchase/index.vue @@ -5,40 +5,23 @@
- +
- + - +
@@ -77,15 +60,19 @@ const searchConfiger = ref([ showType: "input" }, { - label: "日期", - prop: "endTime", - placeholder: "日期", + label: "购票日期", + prop: "gprq", + placeholder: "购票日期", showType: "date" } ]); const queryFrom = ref({}); const pageData = reactive({ - tableData: [], + tableData: [ + { + cph:'川A8888' + } + ], keyCount: 0, tableConfiger: { rowHieght: 61, @@ -99,16 +86,16 @@ const pageData = reactive({ }, controlsWidth: 200, tableColumn: [ - { label: "车牌号", prop: "gjxlbm" }, - { label: "日期", prop: "zdmc" }, - { label: "车辆驾驶员", prop: "xm" }, - { label: "车辆行驶线路", prop: "xzqhbm" }, - { label: "乘客数量", prop: "xzqhbm" }, - { label: "重点人数量", prop: "xzqhbm" } + { label: "车牌号", prop: "cph" }, + { label: "购票日期", prop: "gprq" }, + { label: "车辆驾驶员", prop: "cljsy" }, + { label: "车辆行驶线路", prop: "clqsxl" }, + { label: "乘客数量", prop: "cksl" }, + { label: "重点人数量", prop: "zdrsl" } ] }); onMounted(() => { - getList(); + // getList(); tabHeightFn(); }); //选择类型 diff --git a/vue.config.js b/vue.config.js index c143e37..6e5a9ad 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,7 +3,7 @@ const path = require("path"); function resolve(dir) { return path.join(__dirname, dir); } -const serverHost = "http://192.168.43.92:8006"; +const serverHost = "http://192.168.1.32:8066"; // const serverHost = "http://127.0.0.1:8006" module.exports = { publicPath: "./",