Browse Source

Merge branch 'master' into test-dev

duy 2 months ago
parent
commit
9b0f00cc4a

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20250625173536"
+  "value": "20250730173408"
 }

+ 1 - 1
src/config/index.json

@@ -4,7 +4,7 @@
     "target55": "http://39.108.216.210:8090",
     "target3": "http://192.168.0.125:8090",
     "target4": "http://183.247.216.148:28090",
-    "target":   "http://192.168.0.127:8090",
+    "target":   "http://192.168.0.109:8090",
     "target33": "http://219.151.181.73:8090",
     "socket1": "wss://measure.hczcxx.cn/websocket",
     "socket2": "ws://192.168.0.125:9527/websocket",

+ 8 - 1
src/views/data-fill/query.vue

@@ -311,7 +311,14 @@
                 </div>
                 <div>
                     <span>批量设置:</span>
-                    <el-select v-model="setValue" placeholder="请选择" style="width: 240px" multiple>
+                    <el-select 
+                        v-model="setValue" 
+                        placeholder="请选择" 
+                        style="width: 240px" 
+                        multiple
+                        collapse-tags
+                        :popper-append-to-body="false"
+                    >
                         <el-option
                             v-for="item in nodeTypeData"
                             :key="item.value"

+ 1 - 1
src/views/login/index.vue

@@ -225,7 +225,7 @@ const clickableClick = () => {
 
 //协议
 const protocolClick = () => {
-    window.open('https://xinan1.zos.ctyun.cn/blade-oss-chongqing/upload/20231213/73025c8aba72e1165e0731942f6e66c9.pdf', '_blank')
+    window.open('http://fileinfo.hczcxx.cn/nodePDF/95d4f2d2df3251e96e7a671d5e9fd2f8.pdf', '_blank')
 }
 </script>
 

+ 1 - 1
src/views/login/new.vue

@@ -159,7 +159,7 @@ const clickableClick = () => {
 
 //协议
 const protocolClick = () => {
-    window.open('https://xinan1.zos.ctyun.cn/blade-oss-chongqing/upload/20231213/73025c8aba72e1165e0731942f6e66c9.pdf', '_blank')
+    window.open('http://fileinfo.hczcxx.cn/nodePDF/95d4f2d2df3251e96e7a671d5e9fd2f8.pdf', '_blank')
 }
 </script>