From 2a10e66220abe60ce0a1fc1105600bda68e8b4f8 Mon Sep 17 00:00:00 2001
From: 4670101279 <tongwei19940904>
Date: Fri, 9 Sep 2022 15:09:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/station/index.vue | 10 +++++-----
 src/views/data/photo/index.vue    |  7 +++----
 src/views/index.vue               | 13 ++++++++-----
 src/views/web/camera/index.vue    | 10 +++++-----
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/views/basic/station/index.vue b/src/views/basic/station/index.vue
index 5e0d31b..d8202d6 100644
--- a/src/views/basic/station/index.vue
+++ b/src/views/basic/station/index.vue
@@ -100,8 +100,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -192,8 +192,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         stnm: null,
       },
       //站点状态
@@ -275,7 +275,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */
diff --git a/src/views/data/photo/index.vue b/src/views/data/photo/index.vue
index 32ff9b2..01255a4 100644
--- a/src/views/data/photo/index.vue
+++ b/src/views/data/photo/index.vue
@@ -161,10 +161,9 @@ export default {
           if (e.imgName == '' || e.imgName == null) {
 
             e.imgName = errorImg
-          } else {
-
-            e.imgName = 'https://www.huastech.com.cn' + e.imgName
-
+          } 
+          else {
+            e.imgName = process.env.VUE_APP_BASE_API + e.imgName
           }
         })
         this.loading = false;
diff --git a/src/views/index.vue b/src/views/index.vue
index 4082ebe..03fcd17 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -92,6 +92,9 @@
 import echarts from 'echarts'
 import "../utils/flexible"
 import "../utils/infoBox_min"
+import markerpng from '@/assets/images/marker.png'
+import closepng from '@/assets/images/close.png'
+import borderpng from '@/assets/images/border.png'
 export default {
   name: "Index",
   data() {
@@ -99,9 +102,9 @@ export default {
       // 版本号
       version: "3.8.2",
       // 数据接口
-      api: ' http://localhost/control-api/api/daping/station/',
+      api: '/control-api/api/daping/station/',
       // 图片接口
-      imgapi: 'https://www.huastech.com.cn',
+      imgapi: process.env.VUE_APP_BASE_API,
       // 接口数据
       station: [],
       level: {},
@@ -545,7 +548,7 @@ export default {
         this.markers = []
       }
       // 标注图标
-      var ico = new BMap.Icon('../assets/images/marker.png', new BMap.Size(50, 24), { anchor: new BMap.Size(25, 12) })
+      var ico = new BMap.Icon(markerpng, new BMap.Size(50, 24), { anchor: new BMap.Size(25, 12) })
       // 创建标注
       this.station.forEach(item => {
         var p = new BMap.Point(item.longitude,item.latitude);
@@ -572,7 +575,7 @@ export default {
       let htmlStr = `
         <div style="height: 100%; position: relative;">
           <div style="position: absolute; left: 14px; top: 33px; z-index: -1; background: hsla(200, 88%, 33%, .6); box-shadow: 0 0 16px hsl(200, 88%, 33%); width: 336px; height: 135px;"></div>
-          <div style="background: url('../assets/images/border.png') center center; width: 100%; height: 100%; color: #effaff; font-size: 18px; text-shadow: 2px 2px 4px #17263C; display: flex;">
+          <div style="background: url('`+borderpng+`') center center; width: 100%; height: 100%; color: #effaff; font-size: 18px; text-shadow: 2px 2px 4px #17263C; display: flex;">
             <div style="flex: 1; padding: 66px 0 0 20px;">
               <div style="height: 30px; white-space: nowrap; word-wrap: ellipsis; overflow: hidden;">站点: ${item.stnm}</div>
               <div style="height: 30px;">水位: ${item.value}m</div>
@@ -588,7 +591,7 @@ export default {
           width: "363px",
           height: "210px"
         },
-        closeIconUrl: '../assets/images/close.png',  //关闭按钮的url地址
+        closeIconUrl: closepng,  //关闭按钮的url地址
       })
       infobox.open(marker)
 
diff --git a/src/views/web/camera/index.vue b/src/views/web/camera/index.vue
index cee7638..8986017 100644
--- a/src/views/web/camera/index.vue
+++ b/src/views/web/camera/index.vue
@@ -33,7 +33,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column min-width="60" align="center" label="序号">
         <template slot-scope="scope">
-          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+          <span>{{ (queryParams.page - 1) * queryParams.limit + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
       <el-table-column label="设备名" align="center" prop="name" />
@@ -109,7 +109,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.limit"
       @pagination="getList" />
 
     <!-- 添加或修改摄像机对话框 -->
@@ -346,8 +346,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         name: null,
         ip: null,
         port: null,
@@ -542,7 +542,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */