Browse Source

修改发现的bug

liling 8 tháng trước cách đây
mục cha
commit
dab757cf3d

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1803 - 1330
package-lock.json


+ 4 - 1
package.json

@@ -37,7 +37,10 @@
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.16",
+    "@babel/core": "^7.26.0",
+    "@babel/preset-env": "^7.26.0",
+    "@rollup/plugin-babel": "^6.0.4",
+    "@vitejs/plugin-legacy": "^5.4.3",
     "@vue/cli-service": "~5.0.0",
     "sass-loader": "^13.3.2"
   },

+ 1 - 1
public/static/conf.js

@@ -1 +1 @@
-ApiServer = "http://8.142.173.95:9527"; //指定接口服务地址
+ApiServer = "http://127.0.0.1:19527"; //指定接口服务地址

+ 0 - 3
src/pages/components/HeadMenu.vue

@@ -226,8 +226,6 @@ export default {
 </script>
 
 <style scoped>
-@import url('https://fonts.font.im/css?family=Hanalei+Fill');
-
 p {
     margin: 0;
     padding: 0;
@@ -263,7 +261,6 @@ p {
     background-clip: text;
     color: transparent;
     font-size: 26px;
-    font-family: 'Hanalei Fill', cursive;
 }
 
 .setBox {

+ 2 - 0
src/pages/mission/components/CreateMis.vue

@@ -23,6 +23,7 @@
               class="bestInput"
               v-model="newMission.misName"
               placeholder="请输入任务名称"
+              maxlength="20"
               clearable
             />
           </el-form-item>
@@ -935,6 +936,7 @@ const lookNum = (name, id) => {
 //flashcreate.vue返回的模态框值
 const fcBack = (data) => {
   fcModal.value = data;
+  searchAllFlash();
 };
 //checkied.vue返回模态框状态
 const iedBack = (data) => {

+ 0 - 3
src/pages/mission/components/HaveMis.vue

@@ -388,12 +388,9 @@ export default {
 </script>
 
 <style scoped>
-@import url('https://fonts.font.im/css?family=Montserrat');
-
 p {
   margin: 0;
   padding: 0;
-  font-family: 'Montserrat', sans-serif;
 }
 
 .bigBox {

+ 2 - 1
src/pages/mission/components/HistoryMis.vue

@@ -214,7 +214,7 @@ export default {
     }
     function delMis(e) {
       delId.value = e.id;
-      delModal.value = true;
+      delModal.value = true;      
     }
     function relady(row) {
       // pageNum.value = 1
@@ -244,6 +244,7 @@ export default {
     }
     function delBack(data) {
       delModal.value = data;
+      searchMis();
     }
     // 分页组件返回的页码
     function currentBack(data) {

+ 6 - 6
src/pages/mission/modalComp/FlashCreate.vue

@@ -1,8 +1,8 @@
 <template>
     <div>
-        <el-dialog v-model="dialogVisible" title="选择模型" width="30%" @close="sureclose" :close-on-click-modal="false">
+        <el-dialog v-model="dialogVisible" title="创建变电站" width="30%" @close="sureclose" :close-on-click-modal="false">
             <el-form :model="formData" label-width="120px" :rules="dataRule">
-                <el-form-item label="区域名称" prop="areaName">
+                <el-form-item label="变电站名称" prop="areaName">
                     <el-input v-model="formData.areaName" />
                 </el-form-item>
                 <!-- <el-form-item label="父级区域">
@@ -46,7 +46,7 @@ export default {
         let fatherArea = ref([])
         let dataRule = reactive({
             areaName: [
-                { required: true, message: '请输入区域名称', trigger: 'blur' },
+                { required: true, message: '请输入名称', trigger: 'blur' },
             ],
             areaType: [
                 { required: true, message: '请输入区域类型', trigger: 'blur' },
@@ -70,9 +70,9 @@ export default {
                 area_name: formData.value.areaName,
             }).then(res => {
                 console.log(res, 'tianjia');
-            })
-            dialogVisible.value = false
-            emit("fcBack", dialogVisible.value)
+                dialogVisible.value = false
+                emit("fcBack", dialogVisible.value)
+            })            
         }
         onMounted(() => {
             reload()

+ 2 - 2
src/pages/mission/modalComp/ModelTree.vue

@@ -97,10 +97,10 @@ export default {
                 level = levelRes.data
                 if (level.length > 0 && line.length > 0 && mine.length > 0) {
                     let a = level.map(item => {
-                        let filteredLine = line.filter(param => item.name === param.vol_level_name);
+                        let filteredLine = line.filter(param => item.id === param.vol_level_id);
                         if (filteredLine.length > 0) {
                             let children = filteredLine.map(filteredItem => {
-                                let filteredMine = mine.filter(mineItem => mineItem.line_link_style_name === filteredItem.name);
+                                let filteredMine = mine.filter(mineItem => mineItem.line_link_style === filteredItem.id);
                                 return {
                                     model_name: filteredItem.name,
                                     children: filteredMine

+ 1 - 1
src/pages/report/ReportVue.vue

@@ -100,7 +100,7 @@ export default {
         }
         // 下载报告
         function downFile(row) {
-            location.href = window.ApiServer + "/" + row["report_doc"];
+            location.href = window.ApiServer + row["report_doc"];
             //console.log(row, 'row');
         }
         onMounted(() => {

+ 2 - 8
src/pages/report/components/ReportDetails.vue

@@ -217,14 +217,8 @@ export default {
             })
         }
         // 下载报告
-        function downReport() {
-            location.href = window.ApiServer + "/" + reportUrl.value.toString();
-            /*
-            system.downLoad({
-                path: reportUrl.value,
-                save_name:''
-            })
-            */
+        function downReport() {            
+            location.href = window.ApiServer + reportUrl.value.toString();
         }
         // 导出结果至excel
         function excelPort() {

+ 1 - 1
src/utils/request.js

@@ -6,7 +6,7 @@ import router from '@/router';
 // 请求url
 const service = axios.create({
     // baseURL: window.STATIC_CONFIG.proxyUrl, // url = base url + request url
-    baseURL: "http://8.142.173.95:9527/api",
+    baseURL: ApiServer+"/api",
     timeout: 1500000000, // request timeout
     headers:{
         "Content-Type":"application/x-www-form-urlencoded"

+ 1 - 1
src/utils/scdMqtt.js

@@ -11,7 +11,7 @@ class createds {
       console.log(subscribe, "订阅地址");
       //获取传递来的订阅地址
       this.subscribe = subscribe;
-      this.url = "ws://8.142.173.95:8083/mqtt";
+      this.url = "ws://127.0.0.1:8083/mqtt";
     }
    
     //初始化mqtt

+ 1 - 1
vue.config.js

@@ -9,7 +9,7 @@ module.exports = {
         proxy: {
             '/api': {
                 // target: 'http://127.0.0.1:9527', // 设置你的后端 API 地址
-                target: 'http://8.142.173.95:9527', // 设置你的后端 API 地址
+                target: 'http://127.0.0.1:19527', // 设置你的后端 API 地址
                 changeOrigin: true, // 允许跨域
                 // pathRewrite: {
                 //   '^/api': '', // 重写请求路径,去掉 '/api'

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác