Browse Source

安全监控-历史数据设备查询bug修改提交

lxh 10 months ago
parent
commit
9b15f576cc
2 changed files with 10 additions and 9 deletions
  1. 3 2
      .env.development
  2. 7 7
      src/views/vent/monitorManager/comment/HistoryTable.vue

+ 3 - 2
.env.development

@@ -6,7 +6,8 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理,您可以配置多个 ,请注意,没有换行符
 #VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
-VITE_PROXY = [["/jeecgsystem","http://10.10.150.72:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://10.10.150.72:9999"],["/webRtc", "http://192.168.183.216:8051"]]
+VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://182.92.126.35:9050"],["/modelreq", "http://182.92.126.35:9999"],["/webRtc", "http://192.168.183.216:8051"]]
+# VITE_PROXY = [["/jeecgsystem","http://10.10.150.72:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://10.10.150.72:9999"],["/webRtc", "http://192.168.183.216:8051"]]
 #VITE_PROXY = [["/jeecgsystem","http://192.168.1.8:9999"],["/upload","http://localhost:3300/upload"]]
 
 # 控制台不输出
@@ -18,7 +19,7 @@ VITE_GLOB_API_URL=/modelreq
 
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://10.10.150.72:9999
+VITE_GLOB_DOMAIN_URL=http://182.92.126.35:9999
 #VITE_GLOB_DOMAIN_URL=http://192.168.1.8:9999
 
 # 接口前缀

+ 7 - 7
src/views/vent/monitorManager/comment/HistoryTable.vue

@@ -342,16 +342,16 @@
                 {
                   label: '查询设备',
                   field: 'gdeviceid',
-                  component: 'Select',
-                  defaultValue: deviceOptions.value[0] ? deviceOptions.value[0]['value'] : '',
+                  component: 'Input',
+                  // defaultValue: deviceOptions.value[0] ? deviceOptions.value[0]['value'] : '',
                   required: true,
                   componentProps: {
-                    options: deviceOptions,
+                    // options: deviceOptions,
                     onChange: (e, option) => {
-                      if (option && (option['strinstallpos'] || option['strtype'] || option['devicekind']))
-                        historyType.value = option['strtype'] || option['devicekind'];
-                      if (option['strtype']) deviceTypeStr.value = option['strtype'];
-                      stationType.value = option['stationtype'];
+                      // if (option && (option['strinstallpos'] || option['strtype'] || option['devicekind']))
+                      //   historyType.value = option['strtype'] || option['devicekind'];
+                      // if (option['strtype']) deviceTypeStr.value = option['strtype'];
+                      // stationType.value = option['stationtype'];
                       nextTick(async () => {
                         await getDataSource();
                       });