From d5094d6b181b8cc15faec431c431773e1ddc5abd Mon Sep 17 00:00:00 2001
From: 4670101279 <tongwei19940904>
Date: Fri, 30 Sep 2022 10:28:43 +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/data/photo/index.vue  |  7 ++++---
 src/views/data/photo2/index.vue | 17 ++++-------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/views/data/photo/index.vue b/src/views/data/photo/index.vue
index 01255a4..e02c450 100644
--- a/src/views/data/photo/index.vue
+++ b/src/views/data/photo/index.vue
@@ -36,7 +36,7 @@
     <div class="monitor">
       <div class="card" v-for="item in currdataList" :key="item.stnmId">
         <!-- <img src="../../../assets/images/water.jpg" @click="show('http://localhost:81/control/static/img/water.8d19122d.jpg')"> -->
-        <el-image style="width: 300px;height: 168.75px;" :src="item.imgName" :preview-src-list="srcList"
+        <el-image style="width: 300px;height: 168.75px;cursor: pointer;" :src="item.imgName" :preview-src-list="srcList"
           @click="show(item.imgName)"></el-image>
 
         <div class="info">
@@ -161,9 +161,10 @@ export default {
           if (e.imgName == '' || e.imgName == null) {
 
             e.imgName = errorImg
-          } 
+          }
           else {
-            e.imgName = process.env.VUE_APP_BASE_API + e.imgName
+            e.imgName = "https://www.huastech.com.cn" + e.imgName
+            // e.imgName = process.env.VUE_APP_BASE_API + e.imgName
           }
         })
         this.loading = false;
diff --git a/src/views/data/photo2/index.vue b/src/views/data/photo2/index.vue
index d2209b8..b5bf675 100644
--- a/src/views/data/photo2/index.vue
+++ b/src/views/data/photo2/index.vue
@@ -25,25 +25,17 @@
       <el-table-column label="序号" type="index"  align="center"/>
       <el-table-column label="站点名称" align="center" prop="stnm" />
       <el-table-column label="ip地址" align="center" prop="ip" />
-      <el-table-column label="最新数值" align="center" prop="value" />
       <el-table-column label="最新上传时间" align="center" prop="tm"/>
+      <el-table-column label="最新数值" align="center" prop="value" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="showImg(scope.row)"
-          >查看图片</el-button>
+          <el-image style="width: 180px;height: 120px;cursor: pointer;" :src="scope.row.imgName" :preview-src-list="srcList"  @click="showImg(scope.row)"/>
         </template>
       </el-table-column>
     </el-table>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.limit"
       @pagination="getList" />
 
-    <el-dialog title="水尺图片" :visible.sync="open" height="770px"  width="800px" append-to-body>
-      <el-image style="width: 100%;height: 100%;" :src="imgUrl" :preview-src-list="srcList"/>
-    </el-dialog>
   </div>
 
 
@@ -143,7 +135,8 @@ export default {
             e.imgName = errorImg
           }
           else {
-            e.imgName = process.env.VUE_APP_BASE_API + e.imgName
+            e.imgName = "https://www.huastech.com.cn" + e.imgName
+            // e.imgName = process.env.VUE_APP_BASE_API + e.imgName
           }
         })
         this.loading = false;
@@ -162,8 +155,6 @@ export default {
       this.handleQuery();
     },
     showImg(item) {
-      this.open = true;
-      this.imgUrl = item.imgName
       this.srcList = []
       this.srcList.push(item.imgName)