Merge remote-tracking branch 'origin/main'

.env.development

@@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
 VITE_PROXY = [["/jeecgboot","http://192.168.2.110:9999"],["/upload","http://192.168.2.110:3300/upload"]]
-#VITE_PROXY = [["/jeecgboot","https://fxnsp.sxcooh.com"],["/upload","http://192.168.2.111:3300/upload"]]
+VITE_PROXY = [["/jeecgboot","https://fxnsp.sxcooh.com/lh-api/"],["/upload","http://192.168.2.111:3300/upload"]]
 
 # 控制台不输出
 VITE_DROP_CONSOLE = false

package.json

@@ -48,6 +48,7 @@
     "@vueuse/shared": "^8.3.0",
     "@zxcvbn-ts/core": "^2.0.1",
     "ant-design-vue": "^3.2.12",
+    "html2canvas": "1.4.1",
     "axios": "^0.26.1",
     "china-area-data": "^5.0.1",
     "clipboard": "^2.0.8",

pnpm-lock.yaml

@@ -96,6 +96,9 @@ importers:
       ezuikit-js:
         specifier: ^7.6.8
         version: 7.7.10
+      html2canvas:
+        specifier: 1.4.1
+        version: 1.4.1
       intro.js:
         specifier: ^5.1.0
         version: 5.1.0

src/views/appmana/station/components/SurvStationInfoForm.vue

@@ -7,6 +7,11 @@
             <a-input v-model:value="formData.stationName" placeholder="请输入站点名称" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
+        <a-col :span="24">
+          <a-form-item label="站点名称简写" v-bind="validateInfos.stationShortName">
+            <a-input v-model:value="formData.stationShortName" placeholder="请输入站点名称简写" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
         <a-col :span="24">
           <a-form-item label="站点类型" v-bind="validateInfos.stationType">
             <JDictSelectTag type="select" v-model:value="formData.stationType" dictCode="surv_station_type" placeholder="请选择运维类型" />
@@ -152,6 +157,7 @@
     updatedTime: '',
     isDel: undefined,
     stationName: '',
+    stationShortName: '',
     stationLatitude: '',
     stationLongitude: '',
     corpId: '',