修复

aidex-admin/src/main/resources/application-druid.yml

@@ -6,12 +6,12 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://152.136.217.148:3306/water_bus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&&allowMultiQueries=true
-#                username: site
-#                password: admin@2022.cn
-                url: jdbc:mysql://192.168.0.116:3306/water_bus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&&allowMultiQueries=true
-                username: root
-                password: Gshk@ssbs@8551398
+                url: jdbc:mysql://152.136.217.148:3306/water_bus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&&allowMultiQueries=true
+                username: site
+                password: admin@2022.cn
+#                url: jdbc:mysql://192.168.0.116:3306/water_bus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&&allowMultiQueries=true
+#                username: root
+#                password: Gshk@ssbs@8551398
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

aidex-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ aidex:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/aidex/uploadPath，Linux配置 /home/aidex/uploadPath）
-  profile: /home/aidex/uploadPath
+  profile: D:/aidex/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -72,7 +72,7 @@ spring:
     # 地址
     host: 127.0.0.1
     # 端口，默认为6379
-    port: 6379
+    port: 16379
     # 数据库索引
     database: 0
     # 密码

aidex-ui/src/views/system/sysship/index.vue

@@ -212,7 +212,7 @@ export default {
           width: '10%'
         },
         {
-          title: '当前维度',
+          title: '当前经度',
           dataIndex: 'lng',
           ellipsis: true,
           align: 'center',

aidex-ui/src/views/system/sysship/modules/SysShipAddForm.vue

@@ -35,8 +35,8 @@
           </a-form-model-item>
         </a-col>
         <a-col :span="12">
-          <a-form-model-item label="当前维度" prop="lng">
-            <a-input v-model="form.lng" placeholder="请输入当前维度"/>
+          <a-form-model-item label="当前经度" prop="lng">
+            <a-input v-model="form.lng" placeholder="请输入当前经度"/>
           </a-form-model-item>
         </a-col>
         <a-col :span="12">

aidex-ui/src/views/system/sysship/modules/SysShipCameraLive.vue

@@ -24,7 +24,7 @@
           <a-card title="未绑定摄像头" :bordered="false">
             <div class="videoPlayer">
               <div class="play-videos">
-                <div  class="xgPlayer">未绑定摄像头</div>
+                <div class="xgPlayer">未绑定摄像头</div>
               </div>
             </div>
           </a-card>
@@ -91,7 +91,14 @@ export default {
         videoFillMode: 'auto',
         enableContextmenu: true,
         loop: false, // 是否自动循环
-        lang: 'zh-cn', // 语言，'en', 'zh-cn', 'zh-tw'
+        lang: 'zh-cn',
+        i18n: [{
+          LANG: 'zh-cn', // 要定义的语言
+          // 文本语言
+          TEXT: {
+            ERROR: '传输网络不稳定，请稍后再试' // 如果内置已经有该文本的定义，则直接覆盖， 没有则扩展
+          }
+        }],
         screenShot: {// 是否允许截图（按钮）
           saveImg: true,
           quality: 0.92,
@@ -162,7 +169,7 @@ export default {
       if (!url) return console.warn('url is not esist')
       if (url) {
         this.xOptions.url = url
-        if (this.url.toLowerCase().indexOf('.flv') > 0) {
+        if (url.toLowerCase().indexOf('.flv') > 0) {
           this.xOptions.plugins = [FlvPlugin]
         } else {
           this.xOptions.plugins = [HlsPlugin]
@@ -189,6 +196,7 @@ export default {
   height: 380px;
   background: black;
   margin: 5px auto 1px 0;
+  padding-left: 40px;
   .xgPlayer .dplayer-video-wrap {
     width: 100% !important;
     height: 100% !important;

aidex-ui/src/views/system/sysship/modules/SysShipEditForm.vue

@@ -36,8 +36,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item label="当前维度" prop="lng">
-              <a-input v-model="form.lng" placeholder="请输入当前维度"/>
+            <a-form-model-item label="当前经度" prop="lng">
+              <a-input v-model="form.lng" placeholder="请输入当前经度"/>
             </a-form-model-item>
           </a-col>
           <!-- <a-col :span="12">