20260421

git

@@ -0,0 +1 @@
+git commit -m "20260418" --no-verify

package.json

@@ -109,7 +109,7 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged"
+      "pre-commit": ""
     }
   },
   "repository": {

src/components/Breadcrumb/index.vue

@@ -2,7 +2,7 @@
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">
+        <span v-if="item.redirect==='noRedirect'||index === levelList.length - 1" class="no-redirect">
           {{ generateTitle(item.meta.title) }}
         </span>
         <a v-else @click.prevent="handleLink(item)">{{ generateTitle(item.meta.title) }}</a>

src/lang/en.js

@@ -11,7 +11,7 @@ export default {
     factorySetting: 'System Management',
     profile: 'Profile',
     urlTitle: 'Network Broadcast Terminal',
-    operationLog: 'Operation Log'
+    operationLog: 'Operation Log',
   },
   navbar: {
     dashboard: 'Dashboard',
@@ -25,22 +25,22 @@ export default {
     logIn: 'Login',
     register: 'Register',
     logCancel: 'Cancel',
-    username: 'UserName',
+    username: 'Username',
     password: 'Password',
     any: 'any',
     thirdparty: 'Or connect with',
     thirdpartyTips:
-      'Can not be simulated on local, so please combine you own business simulation! ! !',
+      'Can not be simulated on local, so please combine you own business simulation!',
     confirmLogout: 'Confirm Logout',
     loggedOut:
       'You have been logged out, you can cancel to stay on this page or log in again!',
     toLogin: 'To Login',
     changePassword: 'Change Password',
     changePasswordTip:
-      'Detected that the password is too weak or has expired. Please modify the password before logging in',
+      'Detected that the password is too weak or has expired. Please modify the password before logging in.',
     changePasswordMsg:
-      'Password expired, please modify the password before logging in!',
+      'Password expired, please modify the password before logging in.',
-    upDateMsg: 'Firmware is being upgraded, please wait for a while。'
+    upDateMsg: 'Firmware is being updated, please wait for a while.'
   },
   table: {
     productName: 'Product Name',
@@ -51,20 +51,20 @@ export default {
     deviceIP: 'Terminal IP',
     gatewal: 'Gateway',
     suonetMask: 'Subnet Mask',
-    storageSpaces: 'Storage Spaces',
+    storageSpaces: 'Storage Capacity',
     serverIP: 'Server IP',
-    corverCommandDort: 'Server Command Port',
+    corverCommandDort: 'Server Port',
-    deviceCommandPort: 'Terminal Command Port',
+    deviceCommandPort: 'Terminal Port',
-    deviceStreamPort: 'Terminal Code Stream Port',
+    deviceStreamPort: 'Terminal Stream Port',
     macAddress: 'MAC Address',
     serverPort: 'Server Port',
-    isEmpty: ' cannot be empty',
+    isEmpty: ' cannot be empty.',
     isRight: ' is invalid.',
     isRight1: ' is out of range (10000-49999).',
     isRight2: ' is out of range (1000-9999).',
     isRight3: ' is out of range (1-9999).',
     open: 'Enable',
-    close: 'Disable',
+    close: 'Close',
     save: 'Save',
     submit: 'Submit',
     toTop: 'Back to top',
@@ -77,8 +77,8 @@ export default {
     factorySettings: 'Restore Factory Settings',
     routerRestart: 'Reboot The Device',
     SIPserver: 'SIP Server IP',
-    SIPUserName: 'SIP UserName',
+    SIPUserName: 'SIP Username',
-    SIPPassword: 'SIP PassWord',
+    SIPPassword: 'SIP Password',
     programTip:
       'Tip: the total size of uploaded files cannot exceed the capacity of the device storage space!',
     firmwareUpdateTip:
@@ -86,12 +86,12 @@ export default {
     factoryTip:
       'After returning to the factory setting, the configuration of the device will return to the factory state. Please use with caution!',
     routerRestartTips:
-      'The device is about to reboot. Are you sure to continue！',
+      'The device is about to reboot. Are you sure to continue!',
-    programDeteleTip: 'Confirm to delete this file！',
+    programDeteleTip: 'Confirm to delete this file!',
-    logDeteleTip: 'Confirm to delete this log！',
+    logDeteleTip: 'Confirm to delete this log!',
-    freeSpace: 'Free Space',
+    freeSpace: 'Available Space',
     chooseFile: 'Upgrade File',
-    microphoneSwitch: 'Microphone Switch',
+    microphoneSwitch: 'Microphone Input',
     factorySettingsTips:
       'The default IP address of the device in the factory state is 192.168.1.108. After the restoration, you need to log in again.',
     fileUpload: 'File uploading...',
@@ -141,14 +141,14 @@ export default {
     updateFileTypeTip: 'The uploaded file can only be in Bin format！',
     fileSurplusSizeTip: 'Insufficient remaining storage space！',
     upDateTip: 'Please select a file before upgrading!',
-    audio: 'AudioFormat',
+    audio: 'Audio Format',
-    playStatus: 'Playing status',
+    playStatus: 'Status',
 
     aoVol: 'Play Volume',
     aiVol: 'Recording Volume',
 
     auth: 'Authentication',
-    httpAuth: 'Http Authentication',
+    httpAuth: 'HTTP Authentication',
 
     warningTitle: 'Alarm File',
     warningFormTitle: 'AlarmIn',
@@ -165,10 +165,10 @@ export default {
     sleCode: 'Login expired, please login again.', // 402code
     lllCode: 'The password is too weak, please change it.', // 600code
     llyCode: 'The firmware is being updated, please wait.', // 601code
-    lleCode: '用户登录名称/密码错误.', // 602code
+    lleCode: 'The username or password is incorrect.', // 602code
     llsCode: 'Too many failed login attempts, the account has been locked (30 minutes).', // 603code
-    llssCode: 'The account has been logged in elsewhere. Do you want to force logout?.', // 604code
+    llssCode: 'The account has been logged in elsewhere. Do you want to force login?', // 604code
-    lylCode: 'The old password is wrong.', // 610code
+    lylCode: 'The old password is incorrect.', // 610code
     lyyCode: 'The new password must be different from the old password.', // 611code
     lelCode: 'The file upload failed because it cannot be played.', // 620code
     leyCode: 'The file upload failed because a file with the same name already exists.', // 621code
@@ -177,19 +177,27 @@ export default {
     lessCode: 'Failed to rename, please avoid using special characters.', // 624Code
     lewCode: 'Failed to delete, because the file is playing.', // 625Code
 
-    lslCode: '节目文件开始播放失败，节目已在播放中.', // 630code
+    lslCode: 'Failed to start playing, because the file is already playing.', // 630code
-    lsyCode: '节目文件停止播放失败，节目未在播放中.', // 631code
+    lsyCode: 'Failed to stop playing, because the file is not playing.', // 631code
     lsslCode: 'The firmware update has not started.', // 640code
     lssyCode: 'The firmware is being updated, please wait.', // 641code
     lsseCode: 'The firmware update completed, the device will reboot soon.', // 642code
     lssCode: 'Failed to update the firmware, because the file cannot be parsed.', // 643code
     lsssCode: 'Failed to update the firmware, because the file version is too low.', // 644code
-    WAN_IP_AddressIP: 'WAN DomainName',
+    WAN_IP_AddressIP: 'NAT DomainName',
-    WAN_IP_Address: 'WAN IP address',
+    WAN_IP_Address: 'NAT IP address',
-    WAN_IP_DomainName: 'WAN domain name',
+    WAN_IP_DomainName: 'NAT domain name',
-    WAN_IP_Type: 'WAN Type',
+    WAN_IP_Type: 'NAT Type',
-    WAN_Port: 'WAN Port',
+    WAN_Port: 'NAT Port',
-    WAN_RTSP_Port: 'WAN RTSP Port'
+    WAN_RTSP_Port: 'NAT RTSP Port',
+    httpPort: 'HTTP Port',
+    webPort: 'Web Port',
+    rtspPort: 'RTSP Port',
+    rtpPort: 'RTP Port',
+    portConflict: ' Conflict',
+    PortNumbersCannotBeTheSame: 'The ports cannot be the same',
+    SIP_Port:'SIP Port',
+    SIP_RTP_Port:'SIP RTP Port'
   },
   theme: {
     change: 'Change Theme',
@@ -218,20 +226,20 @@ export default {
     password2: 'Confirm Password',
     update: 'Update',
     oldPassword: 'Please enter your old password！',
-    newPassword: 'Please enter a new password！',
+    newPassword: 'Please enter a new password!',
-    newPassword2: 'Please enter the new password again！',
+    newPassword2: 'Please enter the new password again!',
-    passwordDifferent: 'The two password entered is inconsistent！',
+    passwordDifferent: 'The two password entered is inconsistent!',
     newAndOldPassword:
-      'Operation exception: the new password is the same as the old password',
+      'Operation exception: the new password is the same as the old password.',
-    updatePasswordSuccess: 'User password updated successfully',
+    updatePasswordSuccess: 'Password updated successfully.',
-    passwordLengthError: 'Enter a password of at least 8 digits',
+    passwordLengthError: 'Enter a password of at least 8 digits.',
     passwordStrongError:
       'The Password strength is insufficient. Please ensure that the length is at least 8 digits and at most 16 digits, and must contain at least three of numbers, Minuscule, uppercase letters, and special symbols!',
     confirmPassword: 'Confirm Password',
-    inputusername: 'Please enter your username!',
+    inputusername: 'Please enter the username!',
-    inputpassword: 'Please enter the password！',
+    inputpassword: 'Please enter the password!',
-    inputpassword2: 'Please enter the password again！',
+    inputpassword2: 'Please enter the password again!',
-    registerSuccess: 'User registration successful！',
+    registerSuccess: 'User registration successful!',
-    gologin: 'Do you want to login？'
+    gologin: 'Do you want to login?'
   }
 }

src/lang/pt.js

@@ -11,7 +11,7 @@ export default {
     factorySetting: 'Sistema',
     profile: 'Usuário',
     urlTitle: 'Corneta Khomp',
-    operationLog: 'Registros'
+    operationLog: 'Registros',
   },
   navbar: {
     dashboard: 'Configurações',
@@ -63,7 +63,7 @@ export default {
     isRight2: 'está fora do intervalo (1000-9999).',
     isRight3: 'está fora do intervalo (1-9999).',
     open: 'Ativar',
-    close: 'Desativar',
+    close: 'Fechar',
     save: 'Salvar',
     submit: 'Enviar',
     toTop: 'Voltar ao topo',
@@ -184,12 +184,20 @@ export default {
     lsseCode: 'A atualização do firmware foi concluída, o dispositivo será reiniciado em breve.', // 642code
     lssCode: 'Falha ao atualizar o firmware, porque o arquivo não pode ser analisado.', // 643code
     lsssCode: 'Falha ao atualizar o firmware, porque a versão do arquivo é muito baixa.', // 644code
-    WAN_IP_AddressIP: 'Nome de domínio de rede ampla',
+    WAN_IP_AddressIP: 'Endereço IP NAT',
-    WAN_IP_Address: 'Endereço IP de rede ampla',
+    WAN_IP_Address: 'Endereço IP NAT',
-    WAN_IP_DomainName: 'Nome de domínio de rede de longa distância',
+    WAN_IP_DomainName: 'nome de domínio NAT',
-    WAN_IP_Type: 'Formato de rede de longa distância',
+    WAN_IP_Type: 'Tipo de NAT',
-    WAN_Port: 'Número da porta pública',
+    WAN_Port: 'Porta NAT',
-    WAN_RTSP_Port: 'Porta RTSP pública'
+    WAN_RTSP_Port: 'RTSP Porta NAT',
+    httpPort: 'Porta HTTP',
+    webPort: 'Porta WEB',
+    rtspPort: 'Porta RTSP',
+    rtpPort: 'Porta RTP',
+    portConflict: ' Conflito',
+    PortNumbersCannotBeTheSame: 'As portas não podem ser iguais',
+    SIP_Port:'Porta SIP',
+    SIP_RTP_Port:'Porta SIP RTP',
   },
   theme: {
     change: 'Mudar Tema',

src/lang/zh.js

@@ -181,7 +181,15 @@ export default {
     WAN_IP_DomainName: '广域网域名',
     WAN_IP_Type: '广域网格式',
     WAN_Port: '公网端口号',
-    WAN_RTSP_Port: '公网RTSP端口号'
+    WAN_RTSP_Port: '公网RTSP端口号',
+    httpPort: 'http端口',
+    webPort: 'Web端口',
+    rtspPort: 'RTSP端口',
+    rtpPort: 'RTP端口',
+    portConflict: ' 冲突',
+    PortNumbersCannotBeTheSame: '端口号不能相同',
+    SIP_Port:'SIP端口',
+    SIP_RTP_Port:'SIP RTP端口',
   },
   theme: {
     change: '换肤',

src/layout/components/Sidebar/SidebarItem.vue

@@ -56,6 +56,9 @@ export default {
     // TODO: refactor with render function
     this.onlyOneChild = null
     return {}
+  },
+  mounted() {
+
   },
   methods: {
     hasOneShowingChild(children = [], parent) {

src/layout/components/Sidebar/index.vue

@@ -12,7 +12,12 @@
         :collapse-transition="false"
         mode="vertical"
       >
-        <sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path" />
+        <sidebar-item
+            v-for="route in filteredRoutes"
+            :key="route.path"
+            :item="route"
+            :base-path="route.path"
+        />
       </el-menu>
     </el-scrollbar>
   </div>
@@ -26,11 +31,21 @@ import variables from '@/styles/variables.scss'
 
 export default {
   components: { SidebarItem, Logo },
+  mounted(){
+    console.log(this.permission_routes);
+    // if(this.alarmPage === 'off'){
+    //
+    // }
+  },
   computed: {
     ...mapGetters([
       'permission_routes',
-      'sidebar'
+      'sidebar',
+      'alarmPage'
     ]),
+    filteredRoutes() {
+      return this.permission_routes
+    },
     activeMenu() {
       const route = this.$route
       const { meta, path } = route

src/layout/components/TagsView/index.vue

@@ -29,6 +29,7 @@
 import ScrollPane from './ScrollPane'
 import { generateTitle } from '@/utils/i18n'
 import path from 'path'
+import { mapGetters } from 'vuex'
 
 export default {
   components: { ScrollPane },
@@ -42,6 +43,9 @@ export default {
     }
   },
   computed: {
+    ...mapGetters([
+      'alarmPage'
+    ]),
     visitedViews() {
       return this.$store.state.tagsView.visitedViews
     },

src/store/modules/permission.js

@@ -21,7 +21,8 @@ function hasPermission(roles, route) {
  */
 export function filterAsyncRoutes(routes, roles) {
   const res = []
-  const data = JSON.parse(getLoginData())?.menuRole || 1
+  const loginData = getLoginData()
+  const data = loginData?.menuRole || 1
   routes.forEach(route => {
     const tmp = { ...route }
     if (hasPermission(roles, tmp)) {

src/store/modules/user.js

@@ -20,6 +20,7 @@ const mutations = {
   },
   SET_LOGIN_DATA: (state, data) => {
     state.loginData = data
+    console.log(state, data)
     setLoginData(data)
   },
   SET_KEY: (state, key) => {
@@ -55,7 +56,10 @@ const actions = {
         commit('SET_TOKEN', data.token)
         commit('SET_NAME', username)
         data.menuRole = 1
-        if (data.alarmPage === 'off') data.menuRole = 2
+        if (data.alarmPage !== 'off') {
+          data.menuRole = 2
+          // console.log('data.alarmPage',data.alarmPage)
+        }
         commit('SET_LOGIN_DATA', data)
         if (response.code === 200) {
           resolve()

src/utils/auth.js

@@ -15,11 +15,14 @@ export function setToken(token) {
 }
 
 export function getLoginData() {
-  return Cookies.get(LoginData)
+  const data = Cookies.get(LoginData)
+  return data ? JSON.parse(data) : null
+  // return Cookies.get(LoginData)
 }
 
 export function setLoginData(data) {
-  return Cookies.set(LoginData, data)
+  // return Cookies.set(LoginData, data)
+  return Cookies.set(LoginData, JSON.stringify(data))
 }
 
 export function getKey() {

src/views/agreement/index.vue

@@ -4,15 +4,19 @@
       {{ $t("route.agreement") }}
     </div>
     <div class="pageCon pageCon2">
-      <el-tabs v-model="selectIndex" style="margin-top: 15px">
+      <el-tabs
+        v-model="selectIndex"
+        style="margin-top: 15px"
+      >
         <el-tab-pane
           v-for="(item, index) in tabOptions"
-          :key="index"
+          :key="item.key"
           :label="item.label"
+          :name="item.key"
         />
       </el-tabs>
       <el-form
-        v-show="selectIndex === '2'"
+        v-show="selectIndex === '0'"
         class="detail-form agree-form"
         label-width="180px"
         label-position="right"
@@ -44,14 +48,6 @@
         <el-form-item :label="$t('table.deviceStreamPort')">
           <el-input v-model="formUDPData.corestreamPort" />
         </el-form-item>
-        <el-form-item :label="$t('table.httpAuth')">
-          <el-radio v-model="formUDPData.httpApiAuth" label="on">{{
-            $t("table.open")
-          }}</el-radio>
-          <el-radio v-model="formUDPData.httpApiAuth" label="off">{{
-            $t("table.close")
-          }}</el-radio>
-        </el-form-item>
         <el-form-item label="SSH">
           <el-radio v-model="formUDPData.ssh" label="on">{{
             $t("table.open")
@@ -100,9 +96,15 @@
             <svg-icon :icon-class="sip2PasswordType === 'password' ? 'eye' : 'eye-open'" />
           </span>
         </el-form-item>
+        <el-form-item :label="$t('table.SIP_Port')">
+          <el-input v-model="formSIPData.sipPort" type="number" :min="1" :max="65535"/>
+        </el-form-item>
+        <el-form-item :label="$t('table.SIP_RTP_Port')">
+          <el-input v-model="formSIPData.sipRtpPort" type="number" :min="1" :max="65535"/>
+        </el-form-item>
       </el-form>
       <el-form
-        v-show="selectIndex === '0'"
+        v-show="selectIndex === '2'"
         class="detail-form agree-form"
         label-width="180px"
         label-position="right"
@@ -144,7 +146,7 @@
           <el-select
             v-model="formONVIFData.rtspAudioType"
             style="width:350px;"
-            placeholder="请选择"
+            placeholder="Please select"
             @change="selectChange"
           >
             <el-option
@@ -163,6 +165,12 @@
             $t("table.close")
           }}</el-radio>
         </el-form-item>
+        <el-form-item :label="$t('table.rtspPort')">
+          <el-input v-model="formONVIFData.rtspPort" type="number" :min="0" :max="65535" />
+        </el-form-item>
+        <el-form-item :label="$t('table.rtpPort')">
+          <el-input v-model="formONVIFData.rtpPort" type="number" :min="0" :max="65535" />
+        </el-form-item>
         <el-form-item :label="$t('table.WAN_IP_Type')">
           <el-select
             v-model="formONVIFData.wanType"
@@ -190,6 +198,28 @@
           <el-input v-model="formONVIFData.wanRTSPPort" type="number" :min="0" :max="65535" />
         </el-form-item>
       </el-form>
+      <el-form
+        v-show="selectIndex === '3'"
+        class="detail-form agree-form"
+        label-width="180px"
+        label-position="right"
+        :model="formHTTPData"
+      >
+        <el-form-item :label="$t('table.webPort')">
+          <el-input v-model="formHTTPData.webPort" type="number" :min="0" :max="65535" />
+        </el-form-item>
+        <el-form-item :label="$t('table.httpPort')">
+          <el-input v-model="formHTTPData.httpPort" type="number" :min="0" :max="65535" />
+        </el-form-item>
+        <el-form-item :label="$t('table.httpAuth')">
+          <el-radio v-model="formHTTPData.httpApiAuth" label="on">{{
+            $t("table.open")
+          }}</el-radio>
+          <el-radio v-model="formHTTPData.httpApiAuth" label="off">{{
+            $t("table.close")
+          }}</el-radio>
+        </el-form-item>
+      </el-form>
       <el-button
         type="primary"
         style="width: 10%; margin-left: 40%;margin-top: 20px;"
@@ -205,6 +235,7 @@
 import { mapGetters } from 'vuex'
 import { deviceInfo, deviceEdit } from '@/api/index.js'
 import { encryptData, decryptData } from '@/utils/encryption/entrypt'
+
 export default {
   name: 'Agreement',
   data() {
@@ -222,6 +253,10 @@ export default {
         {
           label: 'UDP',
           key: '0'
+        },
+        {
+          label: 'HTTP',
+          key: '3'
         }
       ],
       NetType: [
@@ -234,7 +269,7 @@ export default {
           key: '1'
         }
       ],
-      selectIndex: '0',
+      selectIndex: '2',
       formUDPData: {
         udp: '',
         id: '',
@@ -243,7 +278,6 @@ export default {
         serverPort: '',
         instructPort: '',
         corestreamPort: '',
-        httpApiAuth: '',
         ssh: ''
       },
       formSIPData: {
@@ -253,7 +287,9 @@ export default {
         sipAddress: '',
         sipUsername: '',
         sipPassword: '',
-        sipPassword2: ''
+        sipPassword2: '',
+        sipPort: '',
+        sipRtpPort:''
       },
       formONVIFData: {
         onvif: '',
@@ -270,7 +306,14 @@ export default {
         wanOnvifPort: '',
         wanRTSPPort: '',
         wanDomainName: '',
-        wanType: '0'
+        wanType: '0',
+        rtspPort: '',
+        rtpPort: ''
+      },
+      formHTTPData: {
+        httpPort: '',
+        webPort: '',
+        httpApiAuth: ''
       },
 
       sipPasswordType: 'password',
@@ -282,9 +325,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters([
+    ...mapGetters(['udpPage']) // 获取到 'on' 或 'off'
-      'udpPage'
-    ])
   },
   mounted() {
     if (this.udpPage === 'off') {
@@ -343,7 +384,6 @@ export default {
           this.formUDPData.serverPort = res.data.serverPort
           this.formUDPData.instructPort = res.data.instructPort
           this.formUDPData.corestreamPort = res.data.corestreamPort
-          this.formUDPData.httpApiAuth = res.data.httpApiAuth
           this.formUDPData.ssh = res.data.ssh
 
           this.formSIPData.sip = res.data.sip
@@ -354,6 +394,8 @@ export default {
           res.data.sipPassword = decryptData(res.data.sipPassword)
           this.formSIPData.sipPassword = res.data.sipPassword
           this.formSIPData.sipPassword2 = res.data.sipPassword
+          this.formSIPData.sipPort = res.data.sipPort
+          this.formSIPData.sipRtpPort = res.data.sipRtpPort
 
           this.formONVIFData.onvif = res.data.onvif
           this.formONVIFData.id = res.data.id
@@ -366,6 +408,8 @@ export default {
           this.formONVIFData.rtspAudioTypeArr = res.data.rtspAudioTypeArr
           this.formONVIFData.rtspAudioType = res.data.rtspAudioType
           this.formONVIFData.onvifAuth = res.data.onvifAuth
+          this.formONVIFData.rtspPort = res.data.rtspPort
+          this.formONVIFData.rtpPort = res.data.rtpPort
 
           this.formONVIFData.wanIP = res.data.wanIP
           this.formONVIFData.wanOnvifPort = res.data.wanOnvifPort
@@ -373,6 +417,11 @@ export default {
           this.formONVIFData.wanDomainName = res.data.wanDomainName
           this.formONVIFData.wanType = res.data.wanType
 
+          this.formHTTPData.httpApiAuth = res.data.httpApiAuth
+          this.formHTTPData.httpPort = res.data.httpPort
+          this.formHTTPData.webPort = res.data.webPort
+
+          // console.log('data', res.data)
           this.$forceUpdate()
         } else {
           this.$message.error(res.message)
@@ -384,7 +433,56 @@ export default {
       const portRegex = /^(1\d{4}|[2-4]\d{4}|49999)$/
       const portRegex2 = /^(?:[2-9]\d{0,3}|1\d{0,3}|9999)$/
       const ipv4Regex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/
-      if (this.selectIndex === '2') {
+      const ports = [
+          this.formHTTPData.webPort,
+          this.formHTTPData.httpPort,
+          this.formONVIFData.onvifPort,
+          this.formONVIFData.rtspPort,
+          this.formONVIFData.rtpPort,
+          this.formSIPData.sipPort,
+          this.formSIPData.sipRtpPort
+      ]
+      console.log('ports', ports)
+
+      // 使用 HashMap 检测端口冲突 - O(n) 时间复杂度
+      const portNames = ['webPort', 'httpPort', 'onvifPort', 'rtspPort', 'rtpPort', 'sipPort', 'sipRtpPort']
+      const portMap = new Map()
+      const conflicts = []
+
+      for (let i = 0; i < ports.length; i++) {
+        const portValue = Number(ports[i])
+
+        // 跳过空值
+        if (ports[i] === '' || ports[i] === null || ports[i] === undefined || isNaN(portValue)) {
+          continue
+        }
+
+        // 检查该端口值是否已存在
+        if (portMap.has(portValue)) {
+          const existingPort = portMap.get(portValue)
+          conflicts.push({
+            port1: { name: existingPort.name, value: existingPort.value, index: existingPort.index },
+            port2: { name: portNames[i], value: ports[i], index: i }
+          })
+        } else {
+          // 将端口值和对应的索引存入 Map
+          portMap.set(portValue, { name: portNames[i], value: ports[i], index: i })
+        }
+      }
+
+      // 如果有冲突，显示错误信息
+      if (conflicts.length > 0) {
+        const conflictMessages = conflicts.map(item =>
+          `${item.port1.name}(${item.port1.value}) & ${item.port2.name}(${item.port2.value})`
+        )
+
+        this.$message({
+          type: 'warning',
+          message: this.$i18n.t('table.PortNumbersCannotBeTheSame') + ' : ' + conflictMessages.join(', ')
+        })
+        return
+      }
+      if (this.selectIndex === '0') {
         param = {
           ...this.formUDPData
         }
@@ -444,7 +542,8 @@ export default {
           })
           return
         }
-      } else if (this.selectIndex === '1') {
+      }
+      else if (this.selectIndex === '1') {
         param = {
           ...this.formSIPData
         }
@@ -473,7 +572,8 @@ export default {
         }
         param.sipPassword = encryptData(param.sipPassword)
         param.sipPassword2 = encryptData(param.sipPassword2)
-      } else if (this.selectIndex === '0') {
+      }
+      else if (this.selectIndex === '2') {
         param = {
           ...this.formONVIFData
         }
@@ -528,8 +628,41 @@ export default {
           })
           return
         }
+        if (!param.rtspPort) {
+          this.$message({
+            type: 'warning',
+            message: this.$i18n.t('table.rtspPort') + this.$i18n.t('table.isEmpty')
+          })
+          return
+        }
+        if (!param.rtpPort) {
+          this.$message({
+            type: 'warning',
+            message: this.$i18n.t('table.rtpPort') + this.$i18n.t('table.isEmpty')
+          })
+          return
+        }
       }
-      console.log(param)
+      else if (this.selectIndex === '3') {
+        param = {
+          ...this.formHTTPData
+        }
+        if (!param.webPort) {
+          this.$message({
+            type: 'warning',
+            message: this.$i18n.t('table.webPort') + this.$i18n.t('table.isEmpty')
+          })
+          return
+        }
+        if (!param.httpPort) {
+          this.$message({
+            type: 'warning',
+            message: this.$i18n.t('table.httpPort') + this.$i18n.t('table.isEmpty')
+          })
+          return
+        }
+      }
+      // console.log(param)
       deviceEdit(param).then((res) => {
         if (res.code === 200) {
           this.$message({
@@ -543,10 +676,14 @@ export default {
           })
         }
       })
+    },
+    changeTab(item, index) {
+      console.log(item, index)
     }
   }
 }
 </script>
+
 <style lang="scss">
 .agree-form .el-form-item {
   width: 50%;
@@ -565,7 +702,6 @@ export default {
     z-index: 99;
   }
 }
-
 .pageCon2{
   padding-bottom: 120px;
 }

src/views/firmwareUpdate/index.vue

@@ -103,7 +103,7 @@ export default {
         })
         return
       }
-      if (files.size / 1024 / 1024 > 5) {
+      if (files.size / 1024 / 1024 > 30) {
         this.$message({
           type: 'error',
           message: this.$i18n.t('table.fileSizeTip')

src/views/program/index.vue

@@ -14,42 +14,42 @@
       <el-scrollbar>
         <div class="operatebox">
           <el-upload
-              class="upload-demo"
+            class="upload-demo"
-              action="#"
+            action="#"
-              :auto-upload="false"
+            :auto-upload="false"
-              accept=".mp3, .MP3, .Mp3, .mP3"
+            accept=".mp3, .MP3, .Mp3, .mP3"
-              :show-file-list="false"
+            :show-file-list="false"
-              :on-change="handleChange"
+            :on-change="handleChange"
           >
             <el-button
-                type="primary"
+              type="primary"
-                style="width: 92px; margin-left: 12px;margin-top: 15px;margin-right: 10px;"
+              style="width: 92px; margin-left: 12px;margin-top: 15px;margin-right: 10px;"
             >
               {{ $t("table.upload") }}
             </el-button>
           </el-upload>
           <el-form
-              class="detail-form program-form"
+            class="detail-form program-form"
-              label-width="180px"
+            label-width="180px"
-              label-position="right"
+            label-position="right"
-              :model="formData"
+            :model="formData"
           >
             <el-form-item :label="$t('table.aiVol')">
               <el-slider
-                  v-model="formData.aiVol"
+                v-model="formData.aiVol"
-                  :step="1"
+                :step="1"
-                  :max="10"
+                :max="10"
-                  @change="aiVolChange"
+                style="width: 120px;"
-                  style="width: 120px;"
+                @change="aiVolChange"
               />
             </el-form-item>
             <el-form-item :label="$t('table.aoVol')" style="margin-left: 12px;">
               <el-slider
-                  v-model="formData.aoVol"
+                v-model="formData.aoVol"
-                  :step="1"
+                :step="1"
-                  :max="10"
+                :max="10"
-                  @change="aoVolChange"
+                style="width: 120px;"
-                  style="width: 120px;"
+                @change="aoVolChange"
               />
             </el-form-item>
           </el-form>
@@ -255,7 +255,7 @@ export default {
         })
         return
       }
-      if (files.size / 1024 / 1024 > 5) {
+      if (files.size / 1024 / 1024 > 30) {
         this.$message({
           type: 'error',
           message: this.$i18n.t('table.fileSizeTip')