feat: 合并代码

package.json

@@ -17,6 +17,7 @@
     "element-plus": "^2.7.5",
     "file-saver": "^2.0.5",
     "jquery": "^3.7.1",
+    "js-cookie": "^3.0.5",
     "jsencrypt": "^3.3.2",
     "less": "^4.2.0",
     "lodash": "^4.17.21",

public/config.js

 
 //  export const ExternalSERVEICE='http://218.69.97.198:8001'
 //  export const WithinSERVEICE='http://192.168.1.252:8001'
-export const ExternalSERVEICE='http://10.5.78.30:5013'
-export const WithinSERVEICE='http://10.5.78.30:5013'
+export const ExternalSERVEICE='http://localhost:5013'
+export const WithinSERVEICE='http://localhost:5013'
 export const CURRLOGO="LOGO_gangyi.png"
 

src/api/analysis.js

@@ -71,6 +71,27 @@ export const postSecAbsTUc = params => {
     })
 }
 
+//二网万平米流量
+export const postSecTrafficUc = params => {
+    return http.post(`/api/analysis/external/SecTrafficUc`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//板换效率趋势一
+export const postFirEffiTrendUc = params => {
+    return http.post(`/api/analysis/external/FirEffiTrendUc`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//板换效率趋势二
+export const postSecEffiTrendUc = params => {
+    return http.post(`/api/analysis/external/SecEffiTrendUc`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
 //热量分析报表
 export const postHeatAnalysis = params => {
     return http.post(`/api/analysis/report/HeatAnalysis`, params).then(res => res).catch(function (error) {
@@ -92,8 +113,15 @@ export const postExternalQOQ = params => {
     })
 }
 
-//换热站机组用量同比接口（耗水量、耗电量、耗热量）
-export const postYOY = params => {
+//换热站机组用量同比接口（耗水量、耗电量、耗热量）网内
+export const postWithinYOY = params => {
+    return http.post(`/api/analysis/within/YOY`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//换热站机组用量同比接口（耗水量、耗电量、耗热量）网外
+export const postExternalYOY = params => {
     return http.post(`/api/analysis/external/YOY`, params).then(res => res).catch(function (error) {
         console.log(error);
     })

src/api/overview.js

+import http from './http'
+
+//能耗总览页---概况接口
+export const postArealist = params => {
+    return http.post(`/api/overview/Area`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+ //能耗总览页---关口实时数据
+export const postGYPipeReal = params => {
+    return http.post(`/api/gis/GYPipeReal`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//能耗总览页---公司当日热量使用情况
+export const postAllHeat = params => {
+    return http.post(`/api/overview/AllHeat`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//能耗总览页---公司整体能耗
+export const postGYCompanyEnergy = params => {
+    return http.post(`/api/overview/GYCompanyEnergy`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//能耗总览页---近七日气象趋势
+export const postGYWeather = params => {
+    return http.post(`/api/overview/GYWeather`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//能耗总览页---服务中心热单耗
+export const postGYCenterHeatUc = params => {
+    return http.post(`/api/overview/GYCenterHeatUc`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//能耗总览页---服务中心度日数热耗
+export const postGYCenterDayHeatUc = params => {
+    return http.post(`/api/overview/GYCenterDayHeatUc`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//能耗总览页---二次侧水耗
+export const postGYCenterWaterUc = params => {
+    return http.post(`/api/overview/GYCenterWaterUc`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//能耗总览页---二次侧电耗
+export const postGYCenterElecUc = params => {
+    return http.post(`/api/overview/GYCenterElecUc`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//能耗总览页---万平米流量（一次侧）
+export const postGYCenterWPMLL = params => {
+    return http.post(`/api/overview/GYCenterWPMLL`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//能耗总览页---一次侧流量分配
+export const postGYSupplyWater = params => {
+    return http.post(`/api/overview/GYSupplyWater`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//能耗总览页---二网均温
+export const postGYCenterSecAvgT = params => {
+    return http.post(`/api/overview/GYCenterSecAvgT`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//能耗总览页---二网温差
+export const postGYCenterSecAbsT = params => {
+    return http.post(`/api/overview/GYCenterSecAbsT`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
+//能耗总览页---二网万平米流量
+export const postGYCenterECWPMLL = params => {
+    return http.post(`/api/overview/GYCenterECWPMLL`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}

src/api/report.js

@@ -21,6 +21,13 @@ export const postPrintHeatForecast = params => {
     })
 }
 
+//明日预测报表（保存打印记录）
+export const postSaveHeatForecast = params => {
+    return http.post(`/api/analysis/report/SaveHeatForecast`, params).then(res => res).catch(function (error) {
+        console.log(error);
+    })
+}
+
 //换热站能耗报表
 export const postTransferEnergy = params => {
     return http.post(`/api/analysis/report/TransferEnergy`, params).then(res => res).catch(function (error) {

src/components/DataForm.vue

@@ -29,6 +29,8 @@
                                 placeholder="" @change="callParentMethod">
                                 <el-option v-for="obj in item.filterText" :key="obj.text" :label="obj.text" :value="obj.value" />
                             </el-select>
+                            <el-cascader v-else-if="item.filterType == 3" :options="item.filterText" v-model="item.filterValue" :props="selectprops"  collapse-tags
+                            clearable :show-all-levels="false" filterable placeholder="请选择" />
                         </template>
                         <template #default="{row, column}">
                             <div v-if="shouldBlink(row,column)" class="blink-animation">{{ getCellValue(row, column)}}</div>
@@ -94,6 +96,9 @@ const visibleData = ref([]); //可视区数据
 const totalCount = ref(1); //总记录数
 const startIndex = ref(0);//可视区起始标
 
+
+const selectprops = { multiple: true, emitPath: false }
+
 // 监听滚动事件来更新显示的数据
 const handleScroll = (event) => {
     if(totalCount.value <= visibleItemCount.value){

src/components/MyMenu.vue

 <template>
     <el-scrollbar>
     <div class="ams-el-menu">
-    <!-- <div class="menu-search">
-       <el-select placement="bottom" v-model="searchValue" clearable filterable remote reserve-keyword
-        :placeholder="'请输入关键字搜索...'" :remote-method="remoteMethod" @change="selectChange" :loading="loading">
+    <div class="menu-search">
+        <el-select placement="bottom" v-model="searchValue" clearable filterable
+        :placeholder="'请输入关键字搜索...'" @change="save(searchValue)">
         <template #prefix><i class="el-icon-search"></i></template>
-        <el-option v-for="item in menus" :key="item.menuId" :label="item.menuName" :value="item.menuName" />
+        <el-option v-for="item in options" :key="item.menuId" :label="item.menuName" :value="item.navigateUrl" />
       </el-select>
-    </div>  -->
+    </div> 
     
     <el-menu unique-opened :collapse-transition='false' :collapse='$store.state.iscollapse' router :default-active="defaultActive" active-text-color="#409EFF" background-color="#32363f" text-color="#fff">
         <!-- 一级菜单 -->
@@ -78,15 +78,28 @@
     import {
         Menu as IconMenu
     } from '@element-plus/icons-vue'
+    import { useRouter } from 'vue-router';
 
-    // const searchValue = ref('');
-    // const proxy = getCurrentInstance();
-    // const props = defineProps(['meun', 'thisIndex']);
-    // const emit = defineEmits(['subEvent']);
-    // const options = ref([]);
-    // const loading = ref(false);
-
+    const searchValue = ref();
+    const router = useRouter();
+    const options = ref([]);
     const store = useStore()
+
+    setTimeout(() => {
+        getoptions(); // 调用你的函数
+    }, 2000); 
+
+    function getoptions(){
+        var menus = store.state.menus;
+        for(let i = 0;i < 100;i++){
+            if(menus[i] === undefined)break;
+            for(let j = 0;j < 100;j++){
+                if(menus[i].childs[j] === undefined)break;
+                options.value.push(menus[i].childs[j])
+            }
+        }
+    }
+
     //定义默认展开
     let defaultActive = ref('/home')
 
@@ -115,5 +128,11 @@
         defaultActive.value=path
         window.sessionStorage.setItem('activePath',path)
     }
+    
+    const save=(routePath)=>{
+        defaultActive.value=routePath
+        window.sessionStorage.setItem('activePath',routePath)
+        router.push({ path: routePath});
+    }
 
 </script>
\ No newline at end of file

src/components/Remote/OutdoorTempControl.vue

-<template>
-    室外温度控制参数组
-    <el-table>
-
-    </el-table>
-</template>
\ No newline at end of file

src/utils/directives.js

@@ -27,5 +27,19 @@ export const vFloatNumber = {
         }
       });
     }
-  };
-  
\ No newline at end of file
+};
+  
+// 只允许输入有符号浮点数
+export const vSignedFloatNumber = {
+  beforeMount(el) {
+    el.addEventListener('input', (e) => {
+      // 获取输入框的当前值
+      let value = e.target.value;
+      value = value.replace(/[^-\d.]/g, '').replace(/^(-)?(\d*)\.(\d{2}).*$/, '$1$2.$3');
+      // 如果值有效，则更新输入框的值
+      if (value !== e.target.value) {
+        e.target.value = value;
+      }
+    });
+  }
+};
\ No newline at end of file

src/utils/request.js

@@ -3,5 +3,5 @@ const port='8001';
 
 //export const SERVEICE='http://218.69.97.198:8001'
 //'http://218.69.97.198:8001'
-//export const TEST_SERVEICE='http://10.5.78.30:5013/'
-export const SERVEICE='http://10.5.78.30:5013/'
+//export const TEST_SERVEICE='http://192.168.1.2:5013/'
+export const SERVEICE='http://192.168.1.2:5013/'

src/views/BackGround/System/LogManage.vue

+<template>
+    日志管理
+</template>
\ No newline at end of file

src/views/BackGround/System/ModelManage.vue

+<template>
+    模块管理
+</template>
\ No newline at end of file

src/views/BackGround/System/ModelPermissions.vue

+<template>
+    角色权限
+</template>
\ No newline at end of file

src/views/BackGround/System/RoleManage.vue

+<template>
+    角色管理
+</template>
\ No newline at end of file

src/views/BackGround/System/UserManage.vue

+<template>
+    用户管理
+</template>
\ No newline at end of file

src/views/Scheduling/AnalysisManage.vue

-<template>
-    生产与结算数据分析表
-</template>
\ No newline at end of file

src/views/Scheduling/AnnualParam.vue

-<template>
-    年度参数管理
-</template>
\ No newline at end of file

src/views/Scheduling/ConfigBoiler.vue

-<template>
-    锅炉参数配置
-</template>
\ No newline at end of file

src/views/Scheduling/EnergyManage.vue

-<template>
-    能源消耗
-</template>
\ No newline at end of file

src/views/Scheduling/InstantHeat.vue

-<template>
-    瞬时热量对比配置
-</template>
\ No newline at end of file

src/views/Scheduling/Phenomenon.vue

-<template>
-    天气工况
-</template>
\ No newline at end of file

src/views/Scheduling/WeatherManage.vue

-<template>
-    气象干预
-</template>
\ No newline at end of file