From 389a3bb6ebf5fa2ff80fef76ae0de7e2a1cbf13c Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Sat, 25 Nov 2023 09:00:46 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/allCar/catMessage.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/allCar/catMessage.vue b/src/views/allCar/catMessage.vue index e030620..6e9afa0 100644 --- a/src/views/allCar/catMessage.vue +++ b/src/views/allCar/catMessage.vue @@ -108,7 +108,10 @@ export default { fetchData: function() { this.listLoading = true carList().then(response => { - this.tableData = response.data.data + this.tableData = response.data + alert(11111) + console.log(2222222222222222) + console.log(response.data) this.listLoading = false }) }, From 4c5d5c713b501bc47f06927766d5b86fdb9ee89f Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Sat, 25 Nov 2023 09:07:04 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86status?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/allCar/catMessage.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/allCar/catMessage.vue b/src/views/allCar/catMessage.vue index 6e9afa0..87d26ab 100644 --- a/src/views/allCar/catMessage.vue +++ b/src/views/allCar/catMessage.vue @@ -28,7 +28,7 @@ @@ -112,6 +112,7 @@ export default { alert(11111) console.log(2222222222222222) console.log(response.data) + console.log(this.tableData) this.listLoading = false }) }, From 6a106e73f01dd500bb4d2ecb426f08e99216c092 Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Sat, 25 Nov 2023 19:41:41 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=E5=89=8D=E5=8F=B0=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/allCar/catMessage.vue | 134 +++++++++++++++++--------------- 1 file changed, 70 insertions(+), 64 deletions(-) diff --git a/src/views/allCar/catMessage.vue b/src/views/allCar/catMessage.vue index 87d26ab..1421194 100644 --- a/src/views/allCar/catMessage.vue +++ b/src/views/allCar/catMessage.vue @@ -1,80 +1,81 @@ + From 894ff7872144f4edda113cee9d4013ca6d0215e0 Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Sun, 26 Nov 2023 19:35:28 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=E5=89=8D=E5=8F=B0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=BF=AD=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/views/allCar/operation.vue | 1287 ++++++++++++++++++++++++++++++++ 2 files changed, 1288 insertions(+) diff --git a/package.json b/package.json index 2ed93d6..2595125 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "screenfull": "5.0.2", "sortablejs": "1.10.2", "vue": "2.6.12", + "vue-amap": "^0.5.10", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", "vue-meta": "2.4.0", diff --git a/src/views/allCar/operation.vue b/src/views/allCar/operation.vue index e82e691..5cd5988 100644 --- a/src/views/allCar/operation.vue +++ b/src/views/allCar/operation.vue @@ -1,2 +1,1289 @@ + + + From 45059cdf837fd056c6158bf31118ae83e1a398cb Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Sun, 26 Nov 2023 19:48:42 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9package.json=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +++ src/api/carList/list.js | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/package.json b/package.json index 2595125..ebbbc4d 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,9 @@ "node": ">=8.9", "npm": ">= 3.0.0" }, + "scripts": { + "build": "vue-cli-service build" + }, "browserslist": [ "> 1%", "last 2 versions" diff --git a/src/api/carList/list.js b/src/api/carList/list.js index 619e8fa..3a5f15e 100644 --- a/src/api/carList/list.js +++ b/src/api/carList/list.js @@ -9,4 +9,36 @@ export function carList(data) { data }) } +//添加车辆信息管理 +export function carAdd(data) { + return request({ + url: 'carBase/car/addCar', + method: 'post', + data + }) +} +//修改车辆信息管理 +export function carUpd(data) { + return request({ + url: 'carBase/car/updCar', + method: 'post', + data + }) +} +//删除车辆信息管理 +export function carDel(vinId){ + return request({ + url:'carBase/car/delCar/' + vinId, + method:'get', + vinId + }) +} +//导出车辆信息管理 +export function carExport(data){ + return request({ + url:'carBase/car/export/', + method:'post', + data + }) +} From a27864143e7ac1bbc607a81241d0348c3b128759 Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Sun, 26 Nov 2023 19:54:03 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index ebbbc4d..2595125 100644 --- a/package.json +++ b/package.json @@ -85,9 +85,6 @@ "node": ">=8.9", "npm": ">= 3.0.0" }, - "scripts": { - "build": "vue-cli-service build" - }, "browserslist": [ "> 1%", "last 2 versions" From 6720c6ff486b15c8638befe040bffa6a9727a17c Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Sun, 26 Nov 2023 20:03:41 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/carList/list.js | 33 +-------------------------------- src/views/allCar/catMessage.vue | 1 + 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/api/carList/list.js b/src/api/carList/list.js index 3a5f15e..8b3bb1c 100644 --- a/src/api/carList/list.js +++ b/src/api/carList/list.js @@ -9,36 +9,5 @@ export function carList(data) { data }) } -//添加车辆信息管理 -export function carAdd(data) { - return request({ - url: 'carBase/car/addCar', - method: 'post', - data - }) -} -//修改车辆信息管理 -export function carUpd(data) { - return request({ - url: 'carBase/car/updCar', - method: 'post', - data - }) -} -//删除车辆信息管理 -export function carDel(vinId){ - return request({ - url:'carBase/car/delCar/' + vinId, - method:'get', - vinId - }) -} -//导出车辆信息管理 -export function carExport(data){ - return request({ - url:'carBase/car/export/', - method:'post', - data - }) -} + diff --git a/src/views/allCar/catMessage.vue b/src/views/allCar/catMessage.vue index 1421194..a87a8de 100644 --- a/src/views/allCar/catMessage.vue +++ b/src/views/allCar/catMessage.vue @@ -129,5 +129,6 @@ export default { From a4b6e96ef0afeeffb405a7c6d656f3d32c6dc31b Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Sun, 26 Nov 2023 20:10:40 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=BD=A8=E8=BF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/allCar/operation.vue | 2562 ++++++++++++++++---------------- 1 file changed, 1281 insertions(+), 1281 deletions(-) diff --git a/src/views/allCar/operation.vue b/src/views/allCar/operation.vue index 5cd5988..86566d0 100644 --- a/src/views/allCar/operation.vue +++ b/src/views/allCar/operation.vue @@ -1,1289 +1,1289 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1ab61098a1da4e3966bd717eff2d9bea568e69bb Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Sun, 26 Nov 2023 22:31:35 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E7=B3=8A=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/carList/list.js | 33 +++++++++ src/views/allCar/catMessage.vue | 123 +++++++++++++++++++++++++++----- 2 files changed, 139 insertions(+), 17 deletions(-) diff --git a/src/api/carList/list.js b/src/api/carList/list.js index 8b3bb1c..329b64e 100644 --- a/src/api/carList/list.js +++ b/src/api/carList/list.js @@ -10,4 +10,37 @@ export function carList(data) { }) } +//添加车辆信息管理 +export function carAdd(data) { + return request({ + url: 'carBase/car/addCar', + method: 'post', + data + }) +} +//修改车辆信息管理 +export function carUpd(data) { + return request({ + url: 'carBase/car/updCar', + method: 'post', + data + }) +} +//删除车辆信息管理 +export function carDel(vinId){ + return request({ + url:'carBase/car/delCar/' + vinId, + method:'get', + vinId + }) +} +//导出车辆信息管理 +export function carExport(data){ + return request({ + url:'carBase/car/export/', + method:'post', + data + }) +} + diff --git a/src/views/allCar/catMessage.vue b/src/views/allCar/catMessage.vue index a87a8de..7f4816e 100644 --- a/src/views/allCar/catMessage.vue +++ b/src/views/allCar/catMessage.vue @@ -1,18 +1,61 @@ @@ -80,7 +123,7 @@ From 69d5fcfa233e2e30b6476d844a463afa690f1911 Mon Sep 17 00:00:00 2001 From: one Date: Tue, 28 Nov 2023 16:43:18 +0800 Subject: [PATCH 10/14] commit --- README.md | 3 + src/main.js | 12 + src/utils/request.js | 1 - src/views/MapStyle.css | 432 ++++++++++ src/views/allCar/operation.vue | 1433 ++++---------------------------- 5 files changed, 599 insertions(+), 1282 deletions(-) create mode 100644 src/views/MapStyle.css diff --git a/README.md b/README.md index 79d4ac0..f230621 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,9 @@ cd cloud-ui # 安装依赖 npm install +#高德题图第三方依赖 +npm install @amap/amap-jsapi-loader + # 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题 npm install --registry=https://registry.npmmirror.com diff --git a/src/main.js b/src/main.js index 8fc3cec..52d9fc3 100644 --- a/src/main.js +++ b/src/main.js @@ -76,7 +76,19 @@ DictData.install() Vue.use(Element, { size: Cookies.get('size') || 'medium' // set element-ui default size }) +//高德地图相关配置 +import AMapLoader from '@amap/amap-jsapi-loader' +Vue.prototype.$AMap = null +AMapLoader.load({ + key: '9a267a434f26f5dd5a87fb89d128f745', + version: '2.0', + //'AMap.Autocomplete', 'AMap.MoveAnimation','AMap.PlaceSearch', 'AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PolyEditor', 'AMap.CircleEditor' + plugins: [], + +}).then((AMap) => { + Vue.prototype.$AMap = AMap +}) Vue.config.productionTip = false new Vue({ diff --git a/src/utils/request.js b/src/utils/request.js index 475e117..df8e748 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -73,7 +73,6 @@ service.interceptors.request.use(config => { // 响应拦截器 service.interceptors.response.use(res => { - debugger // 未设置状态码则默认成功状态 const code = res.data.code || 200; // 获取错误信息 diff --git a/src/views/MapStyle.css b/src/views/MapStyle.css new file mode 100644 index 0000000..714f931 --- /dev/null +++ b/src/views/MapStyle.css @@ -0,0 +1,432 @@ +html { + font-size: 12px; +} +.amap-copyright{ + box-sizing: content-box +} +* { + box-sizing: border-box +} +.input-textarea{ + color:grey; + height:8em; + overflow:auto; + border-radius:0.4rem; + border:1px solid #ced4da; + margin-bottom:1rem; +} +body { + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + line-height: 1.5; + font-weight: 300; + color: #111213; +} + +hr { + margin: 0.5rem 0; + box-sizing: content-box; + height: 0; + overflow: visible; + border: 0; + border-top: 1px solid rgba(0, 0, 0, .1) +} + +p { + margin-top: 0; + margin-bottom: 0; +} + +label { + display: inline-block; + margin-bottom: 0.4rem; +} + +label, .btn { + margin-left: 0; + font-size: 1rem; +} + +button, input, select { + margin: 0; + font-family: inherit; + font-size: inherit; + line-height: inherit; + overflow: visible; + text-transform: none +} + +[type=button]::-moz-focus-inner, [type=reset]::-moz-focus-inner, [type=submit]::-moz-focus-inner, button::-moz-focus-inner { + padding: 0; + border-style: none; +} + +input[type=checkbox], input[type=radio] { + box-sizing: border-box; + padding: 0; + -webkit-box-sizing: border-box; + box-sizing: border-box; + padding: 0; + margin: 0 0.5rem 0 0; +} + +h4 { + font-family: inherit; + line-height: 1.8; + font-weight: 300; + color: inherit; + font-size: 1.1rem; + margin-top: 0; + margin-bottom: .5rem +} + +.btn { + display: inline-block; + font-weight: 400; + text-align: center; + white-space: nowrap; + vertical-align: middle; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + border: 1px solid transparent; + transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out; + background-color: transparent; + background-image: none; + color: #25A5F7; + border-color: #25A5F7; + padding: .25rem .5rem; + line-height: 1.5; + border-radius: 1rem; + -webkit-appearance: button; + cursor:pointer; +} + +.btn:hover { + color: #fff; + background-color: #25A5F7; + border-color: #25A5F7 +} + +.btn:hover { + text-decoration: none +} + +.input-item { + position: relative; + display: -ms-flexbox; + display: flex; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + -ms-flex-align: center; + align-items: center; + width: 100%; + height: 3rem; +} + +.input-item:last-child { + margin-bottom: 0; +} + +.input-item>select, .input-item>input[type=text], .input-item>input[type=date] { + position: relative; + -ms-flex: 1 1 auto; + flex: 1 1 auto; + width: 1%; + margin-bottom: 0; +} + +.input-item>select:not(:last-child), .input-item>input[type=text]:not(:last-child), .input-item>input[type=date]:not(:last-child) { + border-top-right-radius: 0; + border-bottom-right-radius: 0 +} + +.input-item>select:not(:first-child), .input-item>input[type=text]:not(:first-child), .input-item>input[type=date]:not(:first-child) { + border-top-left-radius: 0; + border-bottom-left-radius: 0 +} + +.input-item-prepend { + margin-right: -1px; +} + +.input-item-text, input[type=text],input[type=date], select { + height: calc(2.2rem + 2px); +} + +.input-item-text { + width: 6rem; + text-align: justify; + padding: 0.4rem 0.7rem; + display: inline-block; + text-justify: distribute-all-lines; + /*ie6-8*/ + text-align-last: justify; + /* ie9*/ + -moz-text-align-last: justify; + /*ff*/ + -webkit-text-align-last: justify; + /*chrome 20+*/ + -ms-flex-align: center; + align-items: center; + margin-bottom: 0; + font-size: 1rem; + font-weight: 400; + line-height: 1.5; + color: #495057; + text-align: center; + white-space: nowrap; + background-color: #e9ecef; + border: 1px solid #ced4da; + border-radius: .25rem; + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} + +.input-item-text input[type=checkbox], .input-item-text input[type=radio] { + margin-top: 0 +} + +.input-card { + display: flex; + flex-direction: column; + min-width: 0; + word-wrap: break-word; + background-color: #fff; + background-clip: border-box; + border-radius: .25rem; + width: 22rem; + border-width: 0; + border-radius: 0.4rem; + box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5); + position: fixed; + bottom: 1rem; + right: 1rem; + -ms-flex: 1 1 auto; + flex: 1 1 auto; + padding: 0.75rem 1.25rem; +} + +.input-text { + line-height: 2rem; + margin-right: 2rem; +} + +.info hr { + margin-right: 0; + margin-left: 0; + border-top-color: grey; +} + +.info { + padding: .75rem 1.25rem; + margin-bottom: 1rem; + border-radius: .25rem; + position: fixed; + top: 1rem; + background-color: white; + width: auto; + min-width: 22rem; + border-width: 0; + right: 1rem; + box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5); +} + +.code { + left: 1.5rem; + right: 1.5rem; + top: 1.5rem; + bottom: 1.5rem; + overflow: auto; + margin-bottom: 0rem; +} + +.code .btn { + top: 1rem; + position: absolute; + right: 1rem; +} + +.code .result { + border: 1px solid rgba(0, 0, 0, 0.1); + border-radius: 0.5rem; + padding: 1rem; + bottom: 1rem; + position: absolute; + top: 5.5rem; + right: 1rem; + left: 1rem; + overflow: auto; +} + +.code .status { + color: #80adff; + display: inline-block; + font-size: 14px; +} + +.code h4 { + display: inline-block; + max-width: 20rem; + margin-right: 1rem; + margin-bottom: 1rem; +} + +select, input[type=text], input[type=date] { + display: inline-block; + width: 100%; + padding: .375rem 1.75rem .375rem .75rem; + line-height: 1.5; + color: #495057; + vertical-align: middle; + background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center; + background-size: 8px 10px; + border: 1px solid #ced4da; + border-radius: .25rem; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none +} + +input[type=text],input[type=date] { + background: #fff; + padding: .375rem .75rem; +} + +select:focus, input[type=text]:focus, input[type=date]:focus { + border-color: #80bdff; + outline: 0; + box-shadow: 0 0 0 .1rem rgba(128, 189, 255, .1) +} + +.btn:focus { + outline: 0; + box-shadow: none; +} + +select:focus::-ms-value, input[type=text]:focus::-ms-value,input[type=date]:focus::-ms-value { + color: #495057; + background-color: #fff +} + + +/* native toastr */ +.native-toast { + position: fixed; + background-color: rgba(50, 50, 50, .8); + border-radius: 33px; + color: white; + left: 50%; + text-align: center; + padding: 6px 12px; + opacity: 0; + z-index: 99999; + transition: transform .25s, opacity .25s, top .25s; + box-sizing: border-box; +} + +.native-toast-bottom { + bottom: 50px; + -ms-transform: translateX(-50%) translateY(50px); + transform: translateX(-50%) translateY(50px) +} + +.native-toast-bottom.native-toast-shown { + opacity: 1; + -ms-transform: translateX(-50%) translateY(0); + transform: translateX(-50%) translateY(0); +} + +.native-toast-bottom.native-toast-edge { + bottom: 0; +} + +.native-toast-top { + top: 50px; + -ms-transform: translateX(-50%) translateY(-50px); + transform: translateX(-50%) translateY(-50px) +} + +.native-toast-top.native-toast-shown { + opacity: 1; + -ms-transform: translateX(-50%) translateY(0); + transform: translateX(-50%) translateY(0); +} + +.native-toast-top.native-toast-edge { + top: 0; +} + +.native-toast-center { + top: 0; + -ms-transform: translateX(-50%) translateY(-50px); + transform: translateX(-50%) translateY(-50px) +} + +.native-toast-center.native-toast-shown { + opacity: 1; + top: 50%; + -ms-transform: translateX(-50%) translateY(-50%); + transform: translateX(-50%) translateY(-50%); +} + +.native-toast-edge { + border-radius: 0; + width: 100%; + text-align: left; +} + +@media screen and (min-width: 40rem) { + .native-toast:not(.native-toast-edge) { + max-width: 18rem; + } +} + +/* + max-width does not seem to work in small screen? +*/ + +/*@media screen and (max-width: 768px) { + .native-toast:not(.native-toast-edge) { + max-width: 400px; + } +} + +@media screen and (max-width: 468px) { + .native-toast:not(.native-toast-edge) { + max-width: 300px; + } +}*/ + +/* types */ + +.native-toast-error { + background-color: #d92727; + color: white; +} + +.native-toast-success { + background-color: #62a465; + color: white; +} + +.native-toast-warning { + background-color: #fdaf17; + color: white; +} + +.native-toast-info { + background-color: #5060ba; + color: white; +} + +[class^="native-toast-icon-"] { + vertical-align: middle; + margin-right: 8px +} + +[class^="native-toast-icon-"] svg { + width: 16px; + height: 16px; +} diff --git a/src/views/allCar/operation.vue b/src/views/allCar/operation.vue index 86566d0..eb77a03 100644 --- a/src/views/allCar/operation.vue +++ b/src/views/allCar/operation.vue @@ -1,1289 +1,160 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +--> + this.marker.moveAlong(this.lineArr, + { + duration: 2000 + }) + }, + //暂停 + pauseAnimation() { + this.marker.pauseMove(); + }, + + //继续 + resumeAnimation() { + this.marker.resumeMove(); + }, + + //停止 + stopAnimation() { + this.marker.stopMove(); + }, + + + }, + +} + + From 9b54ce9b7a0bdf264d46fdb41219bdebacba00cc Mon Sep 17 00:00:00 2001 From: one Date: Tue, 28 Nov 2023 16:46:55 +0800 Subject: [PATCH 11/14] commit --- src/views/allCar/operation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/allCar/operation.vue b/src/views/allCar/operation.vue index eb77a03..3f52c26 100644 --- a/src/views/allCar/operation.vue +++ b/src/views/allCar/operation.vue @@ -45,7 +45,7 @@ export default { } }, created() { - this.socket = new WebSocket('ws://10.100.1.8:9802/websocket/1234'); + this.socket = new WebSocket('ws://10.100.1.8:9802/websocket/12345'); }, mounted(){ this.socket.onopen = this.handleOpen; From 0a843231d83c33e82bc16c3868fbe1cb5fd64e1e Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Wed, 29 Nov 2023 13:58:21 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/carList/list.js | 8 + src/views/allCar/catMessage.vue | 128 +++- src/views/allCar/history.vue | 1115 +++++++++++++++++++++++++++++++ src/views/allCar/operation.vue | 104 ++- src/views/login.vue | 2 +- 5 files changed, 1293 insertions(+), 64 deletions(-) create mode 100644 src/views/allCar/history.vue diff --git a/src/api/carList/list.js b/src/api/carList/list.js index 329b64e..ea9bf5e 100644 --- a/src/api/carList/list.js +++ b/src/api/carList/list.js @@ -9,6 +9,14 @@ export function carList(data) { data }) } +//车辆信息列表 +export function carHuiList(carVinId) { + return request({ + url: 'carBase/car//list/' + carVinId, + method: 'get', + carVinId + }) +} //添加车辆信息管理 export function carAdd(data) { diff --git a/src/views/allCar/catMessage.vue b/src/views/allCar/catMessage.vue index 7f4816e..d7f70d0 100644 --- a/src/views/allCar/catMessage.vue +++ b/src/views/allCar/catMessage.vue @@ -56,7 +56,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 取 消 + 确 定 +
+ + + @@ -109,9 +147,9 @@ @@ -123,7 +161,7 @@ diff --git a/src/views/allCar/history.vue b/src/views/allCar/history.vue new file mode 100644 index 0000000..12f0955 --- /dev/null +++ b/src/views/allCar/history.vue @@ -0,0 +1,1115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/allCar/operation.vue b/src/views/allCar/operation.vue index 3f52c26..7aaf64a 100644 --- a/src/views/allCar/operation.vue +++ b/src/views/allCar/operation.vue @@ -1,15 +1,15 @@