From acc80d900b2407a746ddc94f23b678c9e758623c Mon Sep 17 00:00:00 2001
From: FrancisHu <2756004617@qq.com>
Date: Mon, 4 Mar 2024 16:46:53 +0800
Subject: [PATCH] =?UTF-8?q?3.4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/stquery/deviceStatusRecord.vue | 15 ++++++++-------
 sgzb-ui/vue.config.js                            |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
index c848e087..bf3ebdd1 100644
--- a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
+++ b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
@@ -76,11 +76,6 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-
-      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -88,9 +83,15 @@
           size="mini"
           @click="handleExport"
         >导出</el-button>
-      </el-col>
+      </el-form-item>
+    </el-form>
 
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+
+      <!-- <el-col :span="1.5">
+        
+      </el-col> -->
+
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
 
 
     <el-table 
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index e8634b5a..05cb940e 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -36,13 +36,13 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         //  target:  `http://112.29.103.165:21626`,//线上环境-重庆
-        // target: `http://112.29.103.165:21624`,//线上环境-宁夏
+        target: `http://112.29.103.165:21624`,//线上环境-宁夏
         // target: `http://192.168.0.14:21624`,//线上环境
         // target: `http://1.12.248.179:23028`,//线上环境-南网
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `http://10.40.92.14:8080`,//超
         // target: `http://10.40.92.12:8080`,//韩
-        target: `http://10.40.92.206:8080`,//川
+        // target: `http://10.40.92.209:8080`,//川
 
         changeOrigin: true,
         pathRewrite: {