Merge branch 'master' of https://gitee.com/tj-wang-yahui/AMS_HeatSys_Vue_V10

node_modules/.vite/deps/chunk-VID4RN2V.js

+// node_modules/@vue/devtools-api/lib/esm/env.js
+function getDevtoolsGlobalHook() {
+  return getTarget().__VUE_DEVTOOLS_GLOBAL_HOOK__;
+}
+function getTarget() {
+  return typeof navigator !== "undefined" && typeof window !== "undefined" ? window : typeof globalThis !== "undefined" ? globalThis : {};
+}
+var isProxyAvailable = typeof Proxy === "function";
+
+// node_modules/@vue/devtools-api/lib/esm/const.js
+var HOOK_SETUP = "devtools-plugin:setup";
+var HOOK_PLUGIN_SETTINGS_SET = "plugin:settings:set";
+
+// node_modules/@vue/devtools-api/lib/esm/time.js
+var supported;
+var perf;
+function isPerformanceSupported() {
+  var _a;
+  if (supported !== void 0) {
+    return supported;
+  }
+  if (typeof window !== "undefined" && window.performance) {
+    supported = true;
+    perf = window.performance;
+  } else if (typeof globalThis !== "undefined" && ((_a = globalThis.perf_hooks) === null || _a === void 0 ? void 0 : _a.performance)) {
+    supported = true;
+    perf = globalThis.perf_hooks.performance;
+  } else {
+    supported = false;
+  }
+  return supported;
+}
+function now() {
+  return isPerformanceSupported() ? perf.now() : Date.now();
+}
+
+// node_modules/@vue/devtools-api/lib/esm/proxy.js
+var ApiProxy = class {
+  constructor(plugin, hook) {
+    this.target = null;
+    this.targetQueue = [];
+    this.onQueue = [];
+    this.plugin = plugin;
+    this.hook = hook;
+    const defaultSettings = {};
+    if (plugin.settings) {
+      for (const id in plugin.settings) {
+        const item = plugin.settings[id];
+        defaultSettings[id] = item.defaultValue;
+      }
+    }
+    const localSettingsSaveId = `__vue-devtools-plugin-settings__${plugin.id}`;
+    let currentSettings = Object.assign({}, defaultSettings);
+    try {
+      const raw = localStorage.getItem(localSettingsSaveId);
+      const data = JSON.parse(raw);
+      Object.assign(currentSettings, data);
+    } catch (e) {
+    }
+    this.fallbacks = {
+      getSettings() {
+        return currentSettings;
+      },
+      setSettings(value) {
+        try {
+          localStorage.setItem(localSettingsSaveId, JSON.stringify(value));
+        } catch (e) {
+        }
+        currentSettings = value;
+      },
+      now() {
+        return now();
+      }
+    };
+    if (hook) {
+      hook.on(HOOK_PLUGIN_SETTINGS_SET, (pluginId, value) => {
+        if (pluginId === this.plugin.id) {
+          this.fallbacks.setSettings(value);
+        }
+      });
+    }
+    this.proxiedOn = new Proxy({}, {
+      get: (_target, prop) => {
+        if (this.target) {
+          return this.target.on[prop];
+        } else {
+          return (...args) => {
+            this.onQueue.push({
+              method: prop,
+              args
+            });
+          };
+        }
+      }
+    });
+    this.proxiedTarget = new Proxy({}, {
+      get: (_target, prop) => {
+        if (this.target) {
+          return this.target[prop];
+        } else if (prop === "on") {
+          return this.proxiedOn;
+        } else if (Object.keys(this.fallbacks).includes(prop)) {
+          return (...args) => {
+            this.targetQueue.push({
+              method: prop,
+              args,
+              resolve: () => {
+              }
+            });
+            return this.fallbacks[prop](...args);
+          };
+        } else {
+          return (...args) => {
+            return new Promise((resolve) => {
+              this.targetQueue.push({
+                method: prop,
+                args,
+                resolve
+              });
+            });
+          };
+        }
+      }
+    });
+  }
+  async setRealTarget(target) {
+    this.target = target;
+    for (const item of this.onQueue) {
+      this.target.on[item.method](...item.args);
+    }
+    for (const item of this.targetQueue) {
+      item.resolve(await this.target[item.method](...item.args));
+    }
+  }
+};
+
+// node_modules/@vue/devtools-api/lib/esm/index.js
+function setupDevtoolsPlugin(pluginDescriptor, setupFn) {
+  const descriptor = pluginDescriptor;
+  const target = getTarget();
+  const hook = getDevtoolsGlobalHook();
+  const enableProxy = isProxyAvailable && descriptor.enableEarlyProxy;
+  if (hook && (target.__VUE_DEVTOOLS_PLUGIN_API_AVAILABLE__ || !enableProxy)) {
+    hook.emit(HOOK_SETUP, pluginDescriptor, setupFn);
+  } else {
+    const proxy = enableProxy ? new ApiProxy(descriptor, hook) : null;
+    const list = target.__VUE_DEVTOOLS_PLUGINS__ = target.__VUE_DEVTOOLS_PLUGINS__ || [];
+    list.push({
+      pluginDescriptor: descriptor,
+      setupFn,
+      proxy
+    });
+    if (proxy) {
+      setupFn(proxy.proxiedTarget);
+    }
+  }
+}
+
+export {
+  setupDevtoolsPlugin
+};
+//# sourceMappingURL=chunk-VID4RN2V.js.map

node_modules/.vite/deps/chunk-VID4RN2V.js.map

+{
+  "version": 3,
+  "sources": ["../../@vue/devtools-api/lib/esm/env.js", "../../@vue/devtools-api/lib/esm/const.js", "../../@vue/devtools-api/lib/esm/time.js", "../../@vue/devtools-api/lib/esm/proxy.js", "../../@vue/devtools-api/lib/esm/index.js"],
+  "sourcesContent": ["export function getDevtoolsGlobalHook() {\r\n    return getTarget().__VUE_DEVTOOLS_GLOBAL_HOOK__;\r\n}\r\nexport function getTarget() {\r\n    // @ts-expect-error navigator and windows are not available in all environments\r\n    return (typeof navigator !== 'undefined' && typeof window !== 'undefined')\r\n        ? window\r\n        : typeof globalThis !== 'undefined'\r\n            ? globalThis\r\n            : {};\r\n}\r\nexport const isProxyAvailable = typeof Proxy === 'function';\r\n", "export const HOOK_SETUP = 'devtools-plugin:setup';\r\nexport const HOOK_PLUGIN_SETTINGS_SET = 'plugin:settings:set';\r\n", "let supported;\r\nlet perf;\r\nexport function isPerformanceSupported() {\r\n    var _a;\r\n    if (supported !== undefined) {\r\n        return supported;\r\n    }\r\n    if (typeof window !== 'undefined' && window.performance) {\r\n        supported = true;\r\n        perf = window.performance;\r\n    }\r\n    else if (typeof globalThis !== 'undefined' && ((_a = globalThis.perf_hooks) === null || _a === void 0 ? void 0 : _a.performance)) {\r\n        supported = true;\r\n        perf = globalThis.perf_hooks.performance;\r\n    }\r\n    else {\r\n        supported = false;\r\n    }\r\n    return supported;\r\n}\r\nexport function now() {\r\n    return isPerformanceSupported() ? perf.now() : Date.now();\r\n}\r\n", "import { HOOK_PLUGIN_SETTINGS_SET } from './const.js';\r\nimport { now } from './time.js';\r\nexport class ApiProxy {\r\n    constructor(plugin, hook) {\r\n        this.target = null;\r\n        this.targetQueue = [];\r\n        this.onQueue = [];\r\n        this.plugin = plugin;\r\n        this.hook = hook;\r\n        const defaultSettings = {};\r\n        if (plugin.settings) {\r\n            for (const id in plugin.settings) {\r\n                const item = plugin.settings[id];\r\n                defaultSettings[id] = item.defaultValue;\r\n            }\r\n        }\r\n        const localSettingsSaveId = `__vue-devtools-plugin-settings__${plugin.id}`;\r\n        let currentSettings = Object.assign({}, defaultSettings);\r\n        try {\r\n            const raw = localStorage.getItem(localSettingsSaveId);\r\n            const data = JSON.parse(raw);\r\n            Object.assign(currentSettings, data);\r\n        }\r\n        catch (e) {\r\n            // noop\r\n        }\r\n        this.fallbacks = {\r\n            getSettings() {\r\n                return currentSettings;\r\n            },\r\n            setSettings(value) {\r\n                try {\r\n                    localStorage.setItem(localSettingsSaveId, JSON.stringify(value));\r\n                }\r\n                catch (e) {\r\n                    // noop\r\n                }\r\n                currentSettings = value;\r\n            },\r\n            now() {\r\n                return now();\r\n            },\r\n        };\r\n        if (hook) {\r\n            hook.on(HOOK_PLUGIN_SETTINGS_SET, (pluginId, value) => {\r\n                if (pluginId === this.plugin.id) {\r\n                    this.fallbacks.setSettings(value);\r\n                }\r\n            });\r\n        }\r\n        this.proxiedOn = new Proxy({}, {\r\n            get: (_target, prop) => {\r\n                if (this.target) {\r\n                    return this.target.on[prop];\r\n                }\r\n                else {\r\n                    return (...args) => {\r\n                        this.onQueue.push({\r\n                            method: prop,\r\n                            args,\r\n                        });\r\n                    };\r\n                }\r\n            },\r\n        });\r\n        this.proxiedTarget = new Proxy({}, {\r\n            get: (_target, prop) => {\r\n                if (this.target) {\r\n                    return this.target[prop];\r\n                }\r\n                else if (prop === 'on') {\r\n                    return this.proxiedOn;\r\n                }\r\n                else if (Object.keys(this.fallbacks).includes(prop)) {\r\n                    return (...args) => {\r\n                        this.targetQueue.push({\r\n                            method: prop,\r\n                            args,\r\n                            resolve: () => { },\r\n                        });\r\n                        return this.fallbacks[prop](...args);\r\n                    };\r\n                }\r\n                else {\r\n                    return (...args) => {\r\n                        return new Promise((resolve) => {\r\n                            this.targetQueue.push({\r\n                                method: prop,\r\n                                args,\r\n                                resolve,\r\n                            });\r\n                        });\r\n                    };\r\n                }\r\n            },\r\n        });\r\n    }\r\n    async setRealTarget(target) {\r\n        this.target = target;\r\n        for (const item of this.onQueue) {\r\n            this.target.on[item.method](...item.args);\r\n        }\r\n        for (const item of this.targetQueue) {\r\n            item.resolve(await this.target[item.method](...item.args));\r\n        }\r\n    }\r\n}\r\n", "import { getDevtoolsGlobalHook, getTarget, isProxyAvailable } from './env.js';\r\nimport { HOOK_SETUP } from './const.js';\r\nimport { ApiProxy } from './proxy.js';\r\nexport * from './api/index.js';\r\nexport * from './plugin.js';\r\nexport * from './time.js';\r\nexport function setupDevtoolsPlugin(pluginDescriptor, setupFn) {\r\n    const descriptor = pluginDescriptor;\r\n    const target = getTarget();\r\n    const hook = getDevtoolsGlobalHook();\r\n    const enableProxy = isProxyAvailable && descriptor.enableEarlyProxy;\r\n    if (hook && (target.__VUE_DEVTOOLS_PLUGIN_API_AVAILABLE__ || !enableProxy)) {\r\n        hook.emit(HOOK_SETUP, pluginDescriptor, setupFn);\r\n    }\r\n    else {\r\n        const proxy = enableProxy ? new ApiProxy(descriptor, hook) : null;\r\n        const list = target.__VUE_DEVTOOLS_PLUGINS__ = target.__VUE_DEVTOOLS_PLUGINS__ || [];\r\n        list.push({\r\n            pluginDescriptor: descriptor,\r\n            setupFn,\r\n            proxy,\r\n        });\r\n        if (proxy) {\r\n            setupFn(proxy.proxiedTarget);\r\n        }\r\n    }\r\n}\r\n"],
+  "mappings": "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",
+  "names": []
+}

src/views/AlarmPage/AlarmStatusPage.vue

@@ -219,6 +219,13 @@
     }
   }
   
+//获取用户信息
+getuser()
+function getuser(){
+  var user = store.getters.getUserInfo();
+  console.log(user);
+}
+
   //获取总管列表
   function getPipes(){
     loading.value = true;
@@ -258,6 +265,7 @@
     AlarmInfo.length = 0;
     var result = store.getters.getEnterprise();
     if (result) {
+      console.log(result)
       result.forEach(element=>{
         if(element.enterpriseId=== enterpriseId.value){
           if(element.enterpriseId ===  "9BCA54BC-8F27-4849-8D7D-50C5099E1949".toLowerCase()){
@@ -329,7 +337,6 @@
   }
   
 function getImgUrl(scope,item) {
-    console.log(scope,item)
     var url = null;
     switch (scope.row[item]) {
         case true: url = new URL('/imgs/status/status_alarm.png', import.meta.url).href; break;

src/views/HeatUserPage/HeatUserPage.vue

@@ -16,9 +16,12 @@
                     </div>
                 </el-col>
                 <el-col :span="4">
-                    <div>
-                        <el-date-picker v-model="value1" type="datetime" placeholder="Pick a Date"
+                    <div class="div-time-picker" v-show="isHisData">
+                        <el-config-provider :locale="zhCn">
+                            <el-date-picker v-model="value1" type="datetime" placeholder="Pick a Date"
                             format="YYYY/MM/DD hh:mm:ss" />
+                        </el-config-provider>
+                        
                     </div>
                 </el-col>
                 <el-col :span="11">
@@ -35,10 +38,10 @@
                             <el-col :span="10">
                                 <div style="display: flex;">
                                     <div class="div-autoRefresh">
-                                        <el-switch v-model="autoRefresh" class="switch-autoRefresh" active-text="历史数据"
+                                        <el-switch v-model="isHisData" class="switch-autoRefresh" active-text="历史数据"
                                             inactive-text="实时数据"
                                             style="--el-switch-on-color: #13ce66; --el-switch-off-color: rgb(64, 158, 255)"
-                                            @change="changeRefresh" />
+                                            @change="changeData" />
                                     </div>
                                 </div>
                             </el-col>
@@ -51,11 +54,23 @@
     </el-card>
 
     <el-card class="moduleCard" :height="tableHeight">
-        <el-table :data="tableInfo.tableData" :height="tableHeight" v-loading="loading" :cell-style="setCellStyle"
+        <el-table v-show="!isHisData" :data="tableInfo.tableData" :height="tableHeight" v-loading="loading" :cell-style="setCellStyle"
             border highlight-current-row :header-cell-style="setHeaderCellStyle"
             :header-cell-class-name="handleHeadAddClass">
             <el-table-column v-for="(item, i) in tableInfo.title.frozenList" :prop="item.field" :label="item.title"
-                :width="item.width" :sortable="(item.field === 'name' || item.field === 'gatherTime') ? true : false"
+                :width="item.width" sortable
+                fixed />
+            <template v-for="(item, i) in tableInfo.title.otherList">
+                <el-table-column :prop="item.enName" :label="item.alias" :width="item.width" sortable>
+                </el-table-column>
+            </template>
+        </el-table>
+
+        <el-table v-show="isHisData" :data="tableInfo.tableData" :height="tableHeight" v-loading="loading" :cell-style="setCellStyle"
+            border highlight-current-row :header-cell-style="setHeaderCellStyle"
+            :header-cell-class-name="handleHeadAddClass">
+            <el-table-column v-for="(item, i) in tableInfo.title.frozenList" :prop="item.field" :label="item.title"
+                :width="item.width" 
                 fixed />
             <template v-for="(item, i) in tableInfo.title.otherList">
                 <el-table-column :prop="item.enName" :label="item.alias" :width="item.width">
@@ -76,7 +91,6 @@
 .moduleCard {
     width: auto;
     overflow: auto;
-    //max-height: 540px;
     padding: 0px;
 
     ::v-deep .el-card__body {
@@ -89,7 +103,6 @@
     padding: 4px;
     margin-left: 20px;
     height: 30px;
-    //background-color: #8939cf;
     vertical-align: middle;
 }
 
@@ -106,6 +119,10 @@
 
 //------
 
+.div-time-picker{
+    padding-top: 10px;
+}
+
 .card-contianer {
     width: calc(100%-1px);
     font-size: medium;
@@ -119,7 +136,6 @@
     }
 
     .div-list {
-        // margin-left: -50px;
         padding-top: 10px;
         widows: 100%;
 
@@ -131,23 +147,15 @@
     }
 
     .div-button {
-
-
-        // width: 100%;
         text-align: right;
-        // margin-left: 10px;
-        //margin-right: 10px;
         padding-top: 2px;
         padding-left: 15px;
         padding-right: 0px;
         height: 80px;
 
-
         .el-button-button {
             margin-top: 5px;
             width: 80px;
-            // height: 40px;
-            // color: rgb(64, 158, 255);
         }
 
         .div-autoRefresh {
@@ -236,7 +244,7 @@ var useDropdown = ref([false]);
 var selectList = reactive({ supplyList: [], dropdownList: [], pipeInfo: {} });
 var cardForms = reactive({ tableData: [], alarm: [], forms: [], title: [] });//无排序和筛选
 
-var autoRefresh = ref(false);
+var isHisData = ref(false);
 var refreshTime = ref(60);
 var timer;
 
@@ -266,10 +274,190 @@ var h = window.innerHeight - 230
 const tableHeight = ref(h);
 var tableInfo = reactive({
     tableData: [],
+    realData:[],
+    hisData:[],
     title: { frozenList: [], otherList: [] }
 })
 const loading = ref(false);
 const value = ref(true);
 
 
+
+//数据控制，根据isHisData的值决定数据控制逻辑，false为实时数据，true为历史数据
+var dataUrl=isHisData.value?'/api/tiger/TigerHeatUser/Real':'/api/tiger/TigerHeatUser/Real';
+
+function initTitle(){
+    tableInfo.title.frozenList.length=0;
+    pushFrozenList("gatherTime", "采集时间", true, 180, true)
+    pushFrozenList("supplyName", "供热站", false, 180, true);
+    pushFrozenList("name", "小区", true, 180, true);
+    pushFrozenList("append", "设备名称", true, 180, true);
+    tableInfo.title.otherList.length=0;
+    pushOtherList('building',"楼栋");
+    pushOtherList('unit',"单元");
+    pushOtherList('household',"户");
+    pushOtherList('tempTar',"目标室温");
+    pushOtherList('tempTar',"实际室温");
+    pushOtherList('houseType',"户型");
+    pushOtherList('toward',"安装朝向");
+    pushOtherList('position',"安装位置");
+}
+
+//固定列标题添加
+function pushFrozenList(field, title, sortable, width, isVisible) {
+    var tmpFrozen = {
+        field: field,
+        title: title,
+        sortable: sortable,
+        width: width,
+        color: "b5e6ff",
+        isVisible: isVisible
+    }
+    tableInfo.title.frozenList.push(tmpFrozen);
+}
+//非固定列标题添加
+function pushOtherList(enName,alias, width) {
+    var tmpOther = {
+        alias: alias,
+        backColor: 'FFFFFF',
+        enName: enName,
+        width: width,
+    }
+    tableInfo.title.otherList.push(tmpOther);
+}
+
+//初始化控制
+function init(){
+    initTitle();
+    if(isHisData.value){
+        initHis();
+    }else{
+        initReal();
+    }
+}
+
+//数据切换
+function changeData(){
+    init();
+}
+
+//实时数据初始化
+function initReal(){
+    dataUrl='/api/tiger/TigerHeatUser/Real';
+    tableInfo.tableData.length=0;
+    tableInfo.realData.length=0;
+    getRealData();
+}
+//历史数据初始化
+function initHis(){
+    dataUrl='/api/tiger/TigerHeatUser/Real';
+    tableInfo.tableData.length=0;
+    tableInfo.hisData.length=0;
+    getHisData();
+}
+
+//获得数据
+async function getRealData(){
+    loading.value = true
+    await http.post(dataUrl).then((result) => {
+        if (result.status === 0) {
+            //处理返回数据
+            tableInfo.realData=result.data;
+            setshowData();
+        } else {
+            tableInfo.tableData.length=0;
+        }
+    })
+    loading.value = false
+}
+
+async function getHisData(){
+    loading.value = true
+    await http.post(dataUrl).then((result) => {
+        if (result.status === 0) {
+            //处理返回数据
+            makeFormsTitle(result.data.title);
+            titleData.value = result.data.title;
+            makeFormsData(result.data.realData);
+        } else {
+            makeFormsData([]);
+        }
+    })
+    loading.value = false
+}
+
+
+function setshowData(){
+    if(isHisData.value){
+        tableInfo.tableData=tableInfo.hisData;
+    }else{
+        tableInfo.tableData=tableInfo.realData;
+    }
+}
+
+//排序
+
+//实时数据，本地排序
+//历史数据，接口排序
+
+
+//搜索
+
+//实时数据，本地搜索
+//历史数据，接口排序
+
+//分页
+
+//实时数据，本地分页
+function changeRealPage(){
+
+}
+
+//历史数据，接口分页
+function changeHisPage(){
+
+}
+
+
+//表格样式设置
+
+function setHeaderCellStyle({ row, column, rowIndex, columnIndex }) {
+    let css_color;
+    tableInfo.title.frozenList.forEach(element => {
+        if (element.field === column.property) {
+            var backcolor = (element.color == 'FFFFFF') ? 'd9f1ff' : element.color;
+            css_color = { 'background-color': '#' + backcolor, 'padding-left': '0px', 'padding-right': '0px', 'borderColor': '#97d5fd', 'color': '#000', 'text-align': 'center', 'vertical-align': 'top' };
+        }
+    })
+    tableInfo.title.otherList.forEach(element => {
+        if (element.enName === column.property) {
+            var backcolor = (element.backColor == 'FFFFFF') ? 'd9f1ff' : element.backColor;
+            css_color = { 'background-color': '#' + backcolor, 'padding-left': '0px', 'padding-right': '0px', 'borderColor': '#97d5fd', 'color': '#000', 'text-align': 'center', 'vertical-align': 'top' };
+        }
+    })
+
+    return css_color;
+}
+
+function setCellStyle({ row, column, rowIndex, columnIndex }) {
+    let css_color = {};
+    css_color['padding-left'] = '0px';
+    css_color['padding-right'] = '0px';
+    css_color['borderColor'] = '#97d5fd';
+    css_color['padding'] = '0px';
+    tableInfo.title.frozenList.forEach(element => {
+        if (element.field === column.property) {
+            css_color['background-color'] = '#' + element.color;
+        }
+    })
+    tableInfo.title.otherList.forEach(element => {
+        if (element.enName === column.property) {
+            css_color['background-color'] = '#' + element.backColor;
+        }
+    })
+    return css_color;
+}
+
+//页面载入
+init();
 </script>
\ No newline at end of file