Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr

god-ui/src/views/index.vue

@@ -82,6 +82,7 @@ export default {
     this.port = window.location.port
     if (this.port === '9280') this.$router.push('/waterhome')
     if (this.port === '9290') this.$router.push('/constructionsitedata/analysis')
+    if (this.port === '9405') this.$router.push('/template/templateInfo')
   }
 }
 </script>

god-ui/src/views/login.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="login" id="loginDom">
+    <div class="main-big-title" v-if="port === '9405'">汉丰湖Vlog短视频应用系统</div>
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
      <h3 class="title">{{ title }}</h3>
       <el-form-item prop="username">
@@ -93,7 +94,8 @@ export default {
       captchaEnabled: false,
       // 注册开关
       register: false,
-      redirect: undefined
+      redirect: undefined,
+      port: window.location.port
     };
   },
   watch: {
@@ -274,7 +276,7 @@ export default {
           break;
         case '9405':
           document.title = '汉丰湖Vlog短视频应用系统'
-          this.title = '汉丰湖Vlog短视频应用系统'
+          this.title = '欢迎登录'
           loginDom.style.backgroundImage = 'url(/images/vlog.png)'
           this.redirect = '/index'
           const dom133 = document.querySelector('.login-form')
@@ -343,6 +345,16 @@ export default {
   height: 100%;
   background-image: url("../assets/images/login.png");
   background-size: 100% 100%;
+  position: relative;
+}
+
+.main-big-title {
+  position: fixed;
+  left: 16vw;
+  top: 15vh;
+  font-size: 36px;
+  font-family: 'BiaoTiFont';
+  letter-spacing: 2px;
 }
 .title {
   margin: 0px auto 30px auto;

god-ui/src/views/vlog/video/index.vue

@@ -140,7 +140,10 @@
           controls
         />
         <div class="moving-card-info">
-          <div class="moving-card-title">{{ item.equipName }}</div>
+          <div class="moving-card-title">
+            <span>{{ item.userName }}</span>
+            <span style="padding-left: 1rem;">({{ item.userId }})</span>
+          </div>
           <div class="moving-card-time">
             <span style="font-size: 12px;">{{ item.videoTime }}</span>
             <el-button