界面调整

.env

@@ -2,7 +2,7 @@
 VITE_PORT = 3100
 
 #  网站标题
-VITE_GLOB_APP_TITLE = 河津市农业面源污染在线监测平台
+VITE_GLOB_APP_TITLE = 汾西面源污染在线监测平台
 
 VITE_GLOB_APP_ZY = 123123
 

.env.production

@@ -2,7 +2,7 @@
 VITE_USE_MOCK = true
 
 # 发布路径
-VITE_PUBLIC_PATH = /
+VITE_PUBLIC_PATH = /admin
 
 # 控制台不输出
 VITE_DROP_CONSOLE = true
@@ -16,7 +16,7 @@ VITE_BUILD_COMPRESS = 'gzip'
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 #后台接口父地址(必填)
-VITE_GLOB_API_URL=/zh-api
+VITE_GLOB_API_URL=/lh-api
 
 #后台接口全路径地址(必填)
 #VITE_GLOB_DOMAIN_URL=http://192.168.2.111:9999/jeecg-boot

src/components/Application/src/AppLogo.vue

@@ -7,7 +7,7 @@
     <img src="../../../assets/images/logo.png" />
     <div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
       <!-- {{ title }} -->
-      河津市农业面源污染
+      汾西农业面源污染
     </div>
   </div>
 </template>

src/layouts/default/header/index.vue

@@ -11,7 +11,7 @@
       />
       <LayoutBreadcrumb v-if="getShowContent && getShowBread" :theme="getHeaderTheme" />
       <!-- 欢迎语 -->
-      <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`,'headerIntroductionClass']"> 欢迎进入 河津市农业面源污染在线监测平台   </span>
+      <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`,'headerIntroductionClass']"> 欢迎进入 汾西农业面源污染在线监测平台   </span>
     </div>
     <!-- left end -->
 

src/locales/lang/zh-CN/sys.ts

@@ -67,8 +67,8 @@ export default {
     signUpFormTitle: '注册',
     forgetFormTitle: '重置密码',
 
-    signInTitle: '河津市农业面源污染在线监测平台',
+    signInTitle: '汾西面源污染在线监测平台',
-    signInDesc: '河津市农业面源污染在线监测平台',
+    signInDesc: '汾西面源污染在线监测平台',
     policy: '隐私政策',
     scanSign: `扫码后，即可完成登录`,
     scanSuccess: `扫码成功，登录中`,

src/views/appmana/deploy/components/SurvDeviceDeployForm.vue

@@ -85,11 +85,11 @@
             <a-input v-model:value="formData.deployDes" placeholder="请输入备注" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
-        <!-- <a-col :span="24">
+        <a-col :span="24">
-          <a-form-item label="设备数据流地址" v-bind="validateInfos.deviceUrl">
+          <a-form-item label="设备链接" v-bind="validateInfos.deviceUrl">
-            <a-input v-model:value="formData.deviceUrl" placeholder="设备数据流地址(摄像头类设备专用)" :disabled="disabled"></a-input>
+            <a-input v-model:value="formData.deviceUrl" placeholder="摄像头时，为m3u8地址" :disabled="disabled"></a-input>
           </a-form-item>
-        </a-col> -->
+        </a-col>
         <a-col :span="24">
           <a-form-item label="设备排序" v-bind="validateInfos.sortNo">
 	          <a-input-number v-model:value="formData.sortNo" placeholder="请输入设备排序" :min="0" style="width: 100%" :disabled="disabled"/>
@@ -118,8 +118,14 @@
         </a-col> -->
 
         <a-col :span="24">
-          <a-form-item label="部署图片" v-bind="validateInfos.deployPic">
+          <a-form-item label="物联网地址" v-bind="validateInfos.deviceIotUrl">
-            <JImageUpload :fileMax="3" v-model:value="formData.deployPic" :disabled="disabled"></JImageUpload>
+            <a-input v-model:value="formData.deviceIotUrl" placeholder="设备为摄像头时，为萤石云地址" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+
+        <a-col :span="24">
+          <a-form-item label="物联网地址2" v-bind="validateInfos.deviceReverseIotUrl">
+            <a-input v-model:value="formData.deviceReverseIotUrl" placeholder="设备为摄像头时，为萤石云回放地址" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
 
@@ -159,6 +165,18 @@
           </a-form-item>
         </a-col>
 
+        <a-col :span="24">
+          <a-form-item label="部署图片" v-bind="validateInfos.deployPic">
+            <JImageUpload :fileMax="3" v-model:value="formData.deployPic" :disabled="disabled"></JImageUpload>
+          </a-form-item>
+        </a-col>
+
+
+        <a-col :span="24">
+          <a-form-item label="地图图标" v-bind="validateInfos.mapIcon">
+            <JImageUpload :fileMax="1" v-model:value="formData.mapIcon" :disabled="disabled"></JImageUpload>
+          </a-form-item>
+        </a-col>
 
         <!-- <a-col :span="24">
           <a-form-item label="上次同步时间" v-bind="validateInfos.lastsyncTime" >
@@ -216,12 +234,15 @@
     deployType:'',
     xyId:'',
     deployPic:'',
+    mapIcon:'',
     protocolDetail:{},
     protocolArr:[],
     izBaojing:'0',
     ipAddr:'',
     port:'',
     valveStatus:'',
+    deviceReverseIotUrl:'',
+    deviceIotUrl:'',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });

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

@@ -88,6 +88,16 @@
             <a-input v-model:value="formData.stationOrg" placeholder="请输入站点管理" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
+        <a-col :span="24">
+          <a-form-item label="分组标识" v-bind="validateInfos.groupId">
+            <a-input v-model:value="formData.groupId" placeholder="请输入分组标识" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="分组名称" v-bind="validateInfos.groupName">
+            <a-input v-model:value="formData.groupName" placeholder="请输入分组名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
         <a-col :span="24">
           <a-form-item label="大屏站点图标" v-bind="validateInfos.stationIcon">
             <JImageUpload :fileMax="1" v-model:value="formData.stationIcon" :disabled="disabled"></JImageUpload>
@@ -159,6 +169,8 @@
     stationIntro:'',
     stationPic:[],
     stationIcon:'',
+    groupId:'',
+    groupName:'',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });

src/views/sys/login/TokenLoginPage.vue

@@ -5,7 +5,7 @@
             <div class="app-loading-dots">
                 <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
             </div>
-            <div class="app-loading-title">河津市农业面源污染在线监测平台</div>
+            <div class="app-loading-title">汾西农业面源污染在线监测平台</div>
         </div>
     </div>
 </template>