From 16b8895e09f6030718d26cdf11995fe55b5187e2 Mon Sep 17 00:00:00 2001
From: fengdong777 <1478994744@qq.com>
Date: Fri, 22 Sep 2023 16:45:49 +0800
Subject: [PATCH] 9.22
---
.env.development | 2 +-
package.json | 3 +
src/layout/components/Sidebar/index.vue | 4 +-
src/layout/index.vue | 2 +-
src/router/index.js | 10 +-
src/views/renlianshibie/renlianshibieList.vue | 4 +-
src/views/zhiwujiance/zhiwujianceInfo.vue | 2 +-
src/views/zhiwujiance/zhiwujianceList.vue | 99 ++++++++++---------
8 files changed, 65 insertions(+), 61 deletions(-)
diff --git a/.env.development b/.env.development
index efacd23..686a5f3 100644
--- a/.env.development
+++ b/.env.development
@@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
# VUE_APP_URL = "http://huirong.ybkjyl.com/api"
-VUE_APP_URL = "http://127.0.0.1:7103"
+VUE_APP_URL = "http://192.168.1.193:7103"
diff --git a/package.json b/package.json
index 2c6ab49..6b93cdb 100644
--- a/package.json
+++ b/package.json
@@ -28,13 +28,16 @@
"path-to-regexp": "2.4.0",
"portfinder": "^1.0.21",
"qs": "^6.9.4",
+ "regenerator-runtime": "^0.14.0",
"sass-resources-loader": "^2.1.1",
"stompjs": "^2.3.3",
+ "svg-baker-runtime": "^1.4.7",
"viewerjs": "^1.9.0",
"vue": "2.6.10",
"vue-amap": "^0.5.10",
"vue-router": "3.0.6",
"vue-stomp": "^0.0.5",
+ "vue-style-loader": "^4.1.3",
"vuex": "3.1.0",
"vuex-persistedstate": "^4.0.0",
"web-control": "^1.0.2",
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index e95b8b0..383b4f5 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -121,7 +121,7 @@ export default {
component: "zhiwujiance",
meta: {
icon: "icon-renlianshibie",
- title: "质物监测",
+ title: "货堆监测",
},
name: "",
path: "/zhiwujiance/zhiwujianceList",
@@ -130,7 +130,7 @@ export default {
// component: "index",
// meta: {
// icon: "el-icon-help",
- // title: "质物监测",
+ // title: "货堆监测",
// },
// name: "/zhiwujiance/zhiwujianceList",
// path: "/zhiwujiance/zhiwujianceList",
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 320d503..3cb3290 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -11,7 +11,7 @@
diff --git a/src/router/index.js b/src/router/index.js
index c5a05c8..6a69a2a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -280,13 +280,13 @@ export const constantRoutes = [
},
],
},
- ////质物监测
+ ////货堆监测
{
path: "/zhiwujianceList",
component: Layout,
redirect: "/zhiwujiance/zhiwujianceList",
meta: {
- title: "质物监测",
+ title: "货堆监测",
},
children: [
{
@@ -294,7 +294,7 @@ export const constantRoutes = [
component: () => import("@/views/zhiwujiance/zhiwujianceList.vue"),
name: "zhiwujianceList",
meta: {
- title: "质物监测",
+ title: "货堆监测",
noCache: true,
},
},
@@ -305,7 +305,7 @@ export const constantRoutes = [
component: Layout,
redirect: "/renlianshibie/renlianshibieList",
meta: {
- title: "质物监测",
+ title: "货堆监测",
},
children: [
{
@@ -313,7 +313,7 @@ export const constantRoutes = [
component: () => import("@/views/renlianshibie/renlianshibieList.vue"),
name: "renlianshibieList",
meta: {
- title: "质物监测",
+ title: "货堆监测",
noCache: true,
},
},
diff --git a/src/views/renlianshibie/renlianshibieList.vue b/src/views/renlianshibie/renlianshibieList.vue
index 7224e69..c238cf6 100644
--- a/src/views/renlianshibie/renlianshibieList.vue
+++ b/src/views/renlianshibie/renlianshibieList.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/src/views/zhiwujiance/zhiwujianceInfo.vue b/src/views/zhiwujiance/zhiwujianceInfo.vue
index f9315f7..47e131e 100644
--- a/src/views/zhiwujiance/zhiwujianceInfo.vue
+++ b/src/views/zhiwujiance/zhiwujianceInfo.vue
@@ -10,7 +10,7 @@
diff --git a/src/views/zhiwujiance/zhiwujianceList.vue b/src/views/zhiwujiance/zhiwujianceList.vue
index b3f6f98..dc7a514 100644
--- a/src/views/zhiwujiance/zhiwujianceList.vue
+++ b/src/views/zhiwujiance/zhiwujianceList.vue
@@ -1,8 +1,7 @@
-
-
-
+
+
{{ searchxianshitit }}
@@ -29,7 +28,7 @@
-
质物监测信息列表
+
货堆监测信息列表
@@ -39,40 +38,57 @@
@selection-change="handleSelectionChange">
-
+
+
+
+
-
-
仓库名称:{{ row.wareHouseName }}
-
仓库位置:{{ row.wareHouseAddress }}
-
-
联系人:{{ row.linkerName }}
-
联系电话:{{ row.linkerPhone }}
-
+
+
+
-
+
-
-
-
+
+
-
{{ row.similarity }}
相似度
+
{{ row.similarity }}
-
-
+
+
视频
@@ -86,7 +102,6 @@
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
-
@@ -442,20 +457,11 @@ export default {
text-align: left;
}
-/* ///// */
-
-.newslilefts {
- display: flex;
- flex-direction: row;
- flex-wrap: nowrap;
- justify-content: flex-start;
- align-items: center;
-}
/* .news .contents .newslis .tits{padding: 0;width: 20px;color: #8e8e8e;} */
/*
.news .contents .newslis .rentu{padding: 0;width: 80px;height: 80px;border-radius: 5px;border: 1px solid #ff2424;margin: 0 20px;} */
-.newslilefts .yuans {
+ .yuans {
padding: 0;
margin: 0 20px;
width: 80px;
@@ -466,14 +472,13 @@ export default {
display: inline-block;
}
-.newslilefts .yuans p {
- padding: 23px 0 10px 0;
+.yuans p {
+ padding: 32px 0 10px 0;
color: #ff2424;
font-size: 26px;
margin: 0;
}
-
-.newslilefts .yuans span {
+.yuans span {
padding: 0;
margin: 0;
color: #8e8e8e;
@@ -483,38 +488,34 @@ export default {
/* .news .contents .newslis .rightzi{padding: 0 10px;color: #8e8e8e;text-align: left;}
.news .contents .newslis .rightzi p{padding: 1px 0;color: #8e8e8e;font-size: 12px;margin: 0;} */
-.newslilefts .newsli {
- display: flex;
- flex-direction: row;
- flex-wrap: nowrap;
- justify-content: space-between;
- margin: 0px 0px;
+.newsli {
+ margin: 0px auto;
padding: 5px 10px;
/* border-bottom: 1px solid #ececee; */
}
-.newslilefts .newsli .tu {
+.newsli .tu {
padding: 0px 0 0 0;
- width: 120px;
- height: 120px;
+ width: 160px;
+ height: 90px;
border-radius: 5px;
border: 1px solid #ff2424;
}
-.newslilefts .newsli .tu img {
+.newsli .tu img {
width: 100%;
height: 100%;
border-radius: 5px;
border: 1px solid #ff2424;
}
-.newslilefts .newsli .rightwen {
+.newsli .rightwen {
padding: 20px 0 0 20px;
text-align: left;
flex: 3;
}
-.newslilefts .newsli .rightwen .tit {
+.newsli .rightwen .tit {
padding: 7px 0;
font-size: 14px;
font-weight: bold;
@@ -523,7 +524,7 @@ export default {
line-height: 25px; */
}
-.newslilefts .newsli .rightwen .time {
+.newsli .rightwen .time {
padding: 12px 0;
/* color: #848383; */
font-size: 14px;