bug修复

src/store/modules/routes.js

@@ -98,31 +98,6 @@ const actions = {
         //     }]
         // })
 
-        // data.push({
-        //     path: "/alarmManage",
-        //     hidden: false,
-        //     redirect: "/alarmManage/index",
-        //     component: "Layout",
-        //     meta: {
-        //         title: "告警管理",
-        //         icon: "alarmManage",
-
-        //     },
-        //     children: [{
-        //         meta: {
-        //             title: "告警管理",
-        //             icon: "alarmManage",
-
-        //         },
-        //         path: "/alarmManage",
-        //         hidden: false,
-        //         component: "@/views/alarmManage/index",
-
-        //     }, ]
-        // }, )
-
-
-
 
         data.push({
             path: "/platManage",

src/vab/plugins/permissions.js

@@ -80,6 +80,8 @@ router.beforeEach(async(to, from, next) => {
                         var aa = (store.state.homePageUrl).slice(7)
                         var bb = aa.slice(0, -6)
 
+                        // alert(bb)
+
                         // 首页请求地址动态配置
                         if (store.state.homePageUrl) {
                             var pathUrl = bb

src/views/alarmManage/dialogComponent.vue

@@ -175,13 +175,13 @@ export default defineComponent({
     const dialogVisible = ref(false)
     const accessToken = ref(store.state.user.accessToken)
     const dialogImageUrl = ref('')
-    const fileImages = ref(window.PLATFROM_CONFIG.images)
+    const fileImages = ref(process.env.VUE_APP_IMAGES)
     const image = ref('')
     const imageFile = ref([])
 
     const dataSet = reactive({
       uploadUrl:
-        window.PLATFROM_CONFIG.baseUrl +
+        process.env.VUE_APP_BASE_URL +
         '/patrolInspectionDevice/pictureUpload',
       fileList: [],
     })

src/views/dataManage/energyReport/tables/index.vue

@@ -127,7 +127,7 @@ export default defineComponent({
             deviceCode: deviceCode.value,
       }).then((requset) => {
         if (requset.status === 'SUCCESS') {
-          window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+          window.location.href = process.env.VUE_APP_FILE_URL + requset.data
           ElMessage.success({
             message: '导出成功',
             type: 'success',

src/views/deviceManage/powerEquip/communicateEquip/index.vue

@@ -242,7 +242,7 @@ export default defineComponent({
     const cloneDialogBool = ref(false)
     const DialogArray = ref([])
 
-    const fileUrl = ref(window.PLATFROM_CONFIG.baseUrl)
+    const fileUrl = ref(process.env.VUE_APP_BASE_URL)
     const fileList = ref([])
     const accessToken = ref(store.state.user.accessToken)
 
@@ -292,7 +292,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            window.location.href = process.env.VUE_APP_IMAGES + requset.data
             ElMessage.success({
               message: '导出成功',
               type: 'success',

src/views/perCenter/index.vue

@@ -79,10 +79,11 @@
         <!-- 修改密码start -->
         <el-tab-pane label="修改密码" name="second">
           <el-form
-            :model="form"
             ref="formInfo2"
-            :rules="rules"
-            label-width="120px"
+              :model="form"
+              class="demo-form-inline"
+              label-width="150px"
+              :rules="rules"
           >
             <el-form-item label="账号" prop="userName">
               <el-input v-model="form.userName" disabled />
@@ -139,8 +140,6 @@ export default defineComponent({
 
     const form = ref([])
     const formInfo = ref(null)
-
-    const form2 = ref([])
     const formInfo2 = ref(null)
 
     const validatePass = (rule, value, callback) => {
@@ -227,7 +226,9 @@ export default defineComponent({
 
     // 保存-修改密码操作
     const submitForm2 = () => {
-      formInfo.value.validate((valid) => {
+      alert(2)
+      formInfo2.value.validate((valid) =>{
+         alert(3)
         if (valid) {
           api
             .updatePwd({
@@ -289,6 +290,7 @@ export default defineComponent({
       activeName,
       form,
       formInfo,
+      formInfo2,
       rules: {
         tenantName: [
           { required: true, message: '请输入分组名称', trigger: 'blur' },
@@ -324,23 +326,8 @@ export default defineComponent({
           { validator: validatePass2, trigger: 'blur', required: true },
         ],
       },
-      form2,
-      formInfo2,
-      rules2: {
-        userName: [{ required: true, message: '请输入账号', trigger: 'blur' }],
-        password: [
-          { required: true, message: '请输入原密码', trigger: 'blur' },
-          { validator: validatePass, trigger: 'blur' },
-        ],
-        newPass: [
-          { required: true, message: '请输入密码', trigger: 'blur' },
-          { validator: validatePass, trigger: 'blur' },
-        ],
-        passAgain: [
-          { required: true, message: '请再次输入密码', trigger: 'blur' },
-          { validator: validatePass2, trigger: 'blur', required: true },
-        ],
-      },
+
+      
     }
   },
 })

src/views/planOutage/index.vue

@@ -342,7 +342,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            window.location.href = process.env.VUE_APP_FILE_URL + requset.data
             ElMessage.success({
               message: '导出成功',
               type: 'success',

src/views/platManage/dialogComponent.vue

@@ -13,7 +13,7 @@
       :rules="rules"
     >
       <el-form-item
-        label="平台名称:"
+        label="模板名称:"
         prop="platformName"
         v-if="dialogTitle == '添加模板'"
       >
@@ -260,7 +260,7 @@ export default defineComponent({
 
       rules: {
         platformName: [
-          { required: true, message: '请输入平台名称', trigger: 'blur' },
+          { required: true, message: '请输入模板名称', trigger: 'blur' },
           {
             min: 1,
             max: 30,

src/views/platManage/index.vue

@@ -19,7 +19,7 @@
     <div class="filter-container mb-10">
       <div style="margin-top: 20px">
         <div class="filter-item">
-          平台名称：
+          模板名称：
           <el-input
             v-model="platformName"
             placeholder="请输入内容"
@@ -64,7 +64,7 @@
       <el-table-column type="index" label="序号" width="50px"></el-table-column>
       <el-table-column
         prop="platformName"
-        label="平台名称"
+        label="模板名称"
       ></el-table-column>
       <el-table-column
         prop="tenantCount"
@@ -311,7 +311,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            window.location.href = process.env.VUE_APP_FILE_URL + requset.data
             ElMessage.success({
               message: '导出成功',
               type: 'success',

src/views/siteManage/basicInfo/index.vue

@@ -250,7 +250,7 @@ export default defineComponent({
     activeName: String,
   },
   setup(props, context) {
-    const fileImages = ref(window.PLATFROM_CONFIG.images)
+    const fileImages = ref(process.env.VUE_APP_IMAGES)
     const store = useStore()
     const isDisable = ref(false)
     const routeDropData = ref([])
@@ -276,7 +276,7 @@ export default defineComponent({
 
     const dataSet = reactive({
       uploadUrl:
-        window.PLATFROM_CONFIG.baseUrl +
+        process.env.VUE_APP_BASE_URL +
         '/patrolInspectionDevice/pictureUpload',
       // uploadUrl:'https://wx.ewoogi.com/USKYOF/USKYOF.php/Home/MonitoringReporting/setUpload',
       fileList: [],

src/views/siteManage/camera/index.vue

@@ -223,7 +223,7 @@ export default defineComponent({
     const tableItem = reactive([])
     const dialogTitle = ref('')
 
-    const fileUrl = ref(window.PLATFROM_CONFIG.baseUrl)
+    const fileUrl = ref(process.env.VUE_APP_BASE_URL)
     const fileList = ref([])
     const accessToken = ref(store.state.user.accessToken)
     const labelCom = ref(store.state.siteManageLabelCom)
@@ -377,7 +377,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            window.location.href = process.env.VUE_APP_IMAGES + requset.data
             ElMessage.success({
               message: '导出成功',
               type: 'success',

src/views/siteManage/variableList/index.vue

@@ -221,7 +221,7 @@ export default defineComponent({
     const showDialog = ref(false)
     const dialogTitle = ref('')
 
-    const fileUrl = ref(window.PLATFROM_CONFIG.baseUrl)
+    const fileUrl = ref(process.env.VUE_APP_BASE_URL)
     const fileList = ref([])
     const accessToken = ref(store.state.user.accessToken)
 
@@ -408,7 +408,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            window.location.href = process.env.VUE_APP_IMAGES + requset.data
             ElMessage.success({
               message: '导出成功',
               type: 'success',

src/views/siteManage/watchDog/index.vue

@@ -189,7 +189,7 @@ export default defineComponent({
   setup(props, { emit }) {
     const store = useStore()
     store
-    const fileUrl = ref(window.PLATFROM_CONFIG.baseUrl)
+    const fileUrl = ref(process.env.VUE_APP_BASE_URL)
     const fileList = ref([])
     const accessToken = ref(store.state.user.accessToken)
 
@@ -352,7 +352,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            window.location.href = process.env.VUE_APP_IMAGES + requset.data
             ElMessage.success({
               message: '导出成功',
               type: 'success',

src/views/statisManage/loginLog/index.vue

@@ -372,7 +372,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            window.location.href = process.env.VUE_APP_FILE_URL + requset.data
             ElMessage.success({
               message: '导出成功',
               type: 'success',

src/views/statisManage/operLog/index.vue

@@ -417,7 +417,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            window.location.href = process.env.VUE_APP_FILE_URL + requset.data
             ElMessage.success({
               message: '导出成功',
               type: 'success',

src/views/tenantManage/adminConfig/index.vue

@@ -286,7 +286,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            window.location.href = process.env.VUE_APP_FILE_URL + requset.data
             ElMessage.success({
               message: '导出成功',
               type: 'success',

src/views/tenantManage/authConfig/index.vue

@@ -391,7 +391,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            window.location.href = process.env.VUE_APP_FILE_URL + requset.data
             ElMessage.success({
               message: '导出成功',
               type: 'success',

src/views/tenantManage/systemConfig/dialogComponent.vue

@@ -339,7 +339,7 @@ export default defineComponent({
 
     const dataSet = reactive({
       uploadUrl:
-        window.PLATFROM_CONFIG.baseUrl +
+        process.env.VUE_APP_BASE_URL +
         '/patrolInspectionDevice/pictureUpload',
       fileList: [],
     })
@@ -358,22 +358,22 @@ export default defineComponent({
 
     //上传成功的回调
     function handleUpAvatar(res) {
-      form.value.homeLogo = window.PLATFROM_CONFIG.fileUrl + res.data
+      form.value.homeLogo = process.env.VUE_APP_IMAGES + res.data
     }
     function handleUpAvatar2(res) {
-      form.value.loginLogo = window.PLATFROM_CONFIG.fileUrl + res.data
+      form.value.loginLogo = process.env.VUE_APP_IMAGES + res.data
     }
     function handleUpAvatar22(res) {
-      form.value.loginBackUrl = window.PLATFROM_CONFIG.fileUrl + res.data
+      form.value.loginBackUrl = process.env.VUE_APP_IMAGES + res.data
     }
     function handleUpAvatar222(res) {
-      form.value.labelIcon = window.PLATFROM_CONFIG.fileUrl + res.data
+      form.value.labelIcon = process.env.VUE_APP_IMAGES + res.data
     }
     function handleUpAvatar3(res) {
-      form.value.middleLogo = window.PLATFROM_CONFIG.fileUrl + res.data
+      form.value.middleLogo = process.env.VUE_APP_IMAGES + res.data
     }
     function handleUpAvatar33(res) {
-      form.value.middleBackUrl = window.PLATFROM_CONFIG.fileUrl + res.data
+      form.value.middleBackUrl = process.env.VUE_APP_IMAGES + res.data
     }
 
     function handleRemove() {

src/views/tenantManage/systemConfig/index.vue

@@ -316,7 +316,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            window.location.href = process.env.VUE_APP_FILE_URL + requset.data
             ElMessage.success({
               message: '导出成功',
               type: 'success',

src/views/tenantManage/tenantUnit/index.vue

@@ -422,7 +422,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            window.location.href = process.env.VUE_APP_FILE_URL + requset.data
             ElMessage.success({
               message: '导出成功',
               type: 'success',