From cd3d20994151c35c1603d7268599dc92ab22968e Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 29 Aug 2023 17:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=9B=BE=E7=89=87=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/carouselChart.vue | 36 +++++++++++++++++++-------
 src/views/realTimeMonitor/index.vue    | 13 +++++-----
 vue.config.js                          |  6 ++---
 3 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index b840129..f301fc0 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -90,6 +90,7 @@
           >
             <img :src="item.path + '!260x160'" @error="setDefaultImage" />
             <p class="timeInfo">
+              <!-- <i class="el-icon-picture"></i> -->
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -128,8 +129,9 @@
               v-if="item.thumb == null"
             />
             <img :src="item.thumb" v-else />
-            <p class="videoicon"><i class="el-icon-video-play"></i></p>
+
             <p class="timeInfo">
+              <i class="el-icon-video-camera-solid"></i>
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -792,22 +794,36 @@ export default {
         font-size: 12px;
         text-align: center;
         color: #333;
-      }
-      .videoicon {
-        position: absolute;
-        top: 73%;
-        left: 10%;
-        transform: translate(-50%, -50%);
-        i {
-          font-size: 28px;
-          color: #fff;
+        .el-icon-picture,
+        .el-icon-video-camera-solid {
+          font-size: 14px;
+          margin-right: 8px;
+          align-items: center;
+          color: @color-primary;
         }
       }
+      // .videoicon {
+      //   position: absolute;
+      //   top: 73%;
+      //   left: 10%;
+      //   transform: translate(-50%, -50%);
+      //   i {
+      //     font-size: 28px;
+      //     color: #fff;
+      //   }
+      // }
       .borderActive {
         .timeInfo {
           //background: @color-primary;
           background: linear-gradient(180deg, #00eaff 10%, @color-primary 100%);
           color: #fff;
+          .el-icon-picture,
+          .el-icon-video-camera-solid {
+            font-size: 14px;
+            margin-right: 8px;
+            align-items: center;
+            color: #fff;
+          }
         }
       }
       // .borderActive {
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 8ff0f98..e75bb6b 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -323,16 +323,16 @@
             { type: 'number', message: '时间必须为数字值' },
           ]"
         >
-          <!-- <el-input-number
+          <el-input-number
             v-model="videoForm.time"
             :min="1"
-            :max="30"
-          ></el-input-number> -->
+            :max="60"
+          ></el-input-number>
           <!-- <el-input v-model="videoForm.time" autocomplete="off"></el-input> -->
-          <el-input
+          <!-- <el-input
             v-model.number="videoForm.time"
             autocomplete="off"
-          ></el-input>
+          ></el-input> -->
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -1593,7 +1593,8 @@ export default {
     .el-dialog {
       width: 380px;
     }
-    .el-input {
+    .el-input,
+    .el-input-number {
       width: 214px;
     }
   }
diff --git a/vue.config.js b/vue.config.js
index 0c32024..040028d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,11 +29,11 @@ module.exports = defineConfig({
     proxy: {
       "/api": {
         //表示拦截以/api开头的请求路径
-        // target: "http://47.96.238.157:8093", //阿里云服务器环境
-        target: "http://180.166.218.222:40080", //dell
+        target: "http://47.96.238.157:8093", //阿里云服务器环境
+        //target: "http://180.166.218.222:40080", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
-          "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
+          "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
         },
       },
     },