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

src/views/HeatUserPage/HeatUserPage.vue

+<template>
+    <el-card class="card-contianer" :body-style="{ 'padding': '0px 0px 0px 0px', 'height': '110px' }">
+        <div class="div-header">
+            <el-row>
+                <el-col :span="2">
+                    <div class="div-button">
+                        <el-button class="el-button-button" type="primary" :span="6" @click="refresh" icon="Search">
+                            搜&nbsp;&nbsp;索</el-button>
+                    </div>
+                </el-col>
+                <el-col :span="7">
+                    <div class="div-dropdown text-center">
+                        <span>小区名称&nbsp;:&nbsp;</span>
+                        <el-cascader :options="TransferInfo.tree" v-model="TransferInfo.id" :props="props" collapse-tags
+                            clearable :show-all-levels="false" filterable placeholder="请选择" style="min-width: 200px;" />
+                    </div>
+                </el-col>
+                <el-col :span="4">
+                    <div>
+                        <el-date-picker v-model="value1" type="datetime" placeholder="Pick a Date"
+                            format="YYYY/MM/DD hh:mm:ss" />
+                    </div>
+                </el-col>
+                <el-col :span="11">
+                    <div class="div-button">
+                        <el-row :gutter="10">
+                            <el-col :span="3">
+                            </el-col>
+                            <el-col :span="3">
+                            </el-col>
+                            <el-col :span="3">
+                            </el-col>
+                            <el-col :span="5">
+                            </el-col>
+                            <el-col :span="10">
+                                <div style="display: flex;">
+                                    <div class="div-autoRefresh">
+                                        <el-switch v-model="autoRefresh" class="switch-autoRefresh" active-text="历史数据"
+                                            inactive-text="实时数据"
+                                            style="--el-switch-on-color: #13ce66; --el-switch-off-color: rgb(64, 158, 255)"
+                                            @change="changeRefresh" />
+                                    </div>
+                                </div>
+                            </el-col>
 
+                        </el-row>
+                    </div>
+                </el-col>
+            </el-row>
+        </div>
+    </el-card>
 
-<template>
-    热用户数据
-</template>
\ No newline at end of file
+    <el-card class="moduleCard" :height="tableHeight">
+        <el-table :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"
+                fixed />
+            <template v-for="(item, i) in tableInfo.title.otherList">
+                <el-table-column :prop="item.enName" :label="item.alias" :width="item.width">
+                </el-table-column>
+            </template>
+        </el-table>
+    </el-card>
+
+    <el-config-provider :locale="zhCn">
+        <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize"
+            :page-sizes="[30, 40, 50, 100, 200, 300]" :small="true" :disabled="disabled" :background="background"
+            layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="getdata"
+            @current-change="getdata" class="pagination" />
+    </el-config-provider>
+</template>
+
+<style lang="less" scoped>
+.moduleCard {
+    width: auto;
+    overflow: auto;
+    //max-height: 540px;
+    padding: 0px;
+
+    ::v-deep .el-card__body {
+        padding: 0px;
+    }
+}
+
+
+.pagination {
+    padding: 4px;
+    margin-left: 20px;
+    height: 30px;
+    //background-color: #8939cf;
+    vertical-align: middle;
+}
+
+
+//鼠标所在行的颜色
+::v-deep .el-table__body tr:hover>td {
+    background: linear-gradient(to top, rgb(0, 198, 255), rgb(255, 255, 255)) !important;
+}
+
+
+::v-deep .el-table__body tr.current-row>td {
+    background-color: #92cbf1 !important;
+}
+
+//------
+
+.card-contianer {
+    width: calc(100%-1px);
+    font-size: medium;
+    height: 60px;
+    overflow: hidden;
+
+    .div-header {
+        width: 100%;
+        margin: 5px;
+        height: 80px;
+    }
+
+    .div-list {
+        // margin-left: -50px;
+        padding-top: 10px;
+        widows: 100%;
+
+        .span-time {
+            font-family: simhei;
+            font-weight: bold;
+            font-size: medium;
+        }
+    }
+
+    .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 {
+            background-color: white;
+            color: rgb(64, 158, 255);
+            // padding-right: 10px;
+            display: flex;
+            margin-top: 5px;
+            border-radius: var(--el-border-radius-base);
+            padding: 6px 15px;
+            font-size: 14px;
+            height: 20px;
+            overflow: hidden;
+        }
+
+        .switch-autoRefresh {
+            margin-left: 0px;
+            margin-top: -6px;
+        }
+    }
+}
+
+.card-form {
+    width: 100%;
+    height: 300px;
+}
+
+.div-dropdown {
+    //display: flex;
+
+
+    padding-top: 7px;
+    height: 50px;
+    padding-left: 10px;
+
+
+    .el-dropdown-link {
+        margin-top: 5px;
+        color: white;
+    }
+
+}
+
+.text-center {
+    text-align: center;
+}
+
+:deep(.div-form-img) {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+:deep(.col-center) {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.span-text {}
+</style>
+
+<script setup>
+import { ref, reactive, onMounted, onUnmounted, provide, computed, handleError } from 'vue'
+import DataForm from '../../components/DataForm.vue';
+import { useRoute } from 'vue-router'
+import http from '../../api/http'
+import store from "../../store/index";
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+import {
+    Search,
+    ArrowLeft,
+    ArrowRight,
+    Warning
+} from '@element-plus/icons-vue'
+import CfgSupply from '../../components/CfgSupply.vue';
+// import { ca } from 'element-plus/es/locale';
+const enterpriseId = ref(null);
+enterpriseId.value = store.getters.getEnterpriseId();
+var gatherTime = ref([]);
+
+var showSupply = ref([])
+var showBoilder = ref([])
+var useDropdown = ref([false]);
+//ref([{label:'全部',value:''}])
+var selectList = reactive({ supplyList: [], dropdownList: [], pipeInfo: {} });
+var cardForms = reactive({ tableData: [], alarm: [], forms: [], title: [] });//无排序和筛选
+
+var autoRefresh = ref(false);
+var refreshTime = ref(60);
+var timer;
+
+const props = { multiple: true, emitPath: false }
+const TransferInfo = reactive({
+    "enterpriseId": enterpriseId.value,
+    tree: [],
+    "supplyId": [],
+    "deviceType": 3,
+    "id": [],
+    "name": [],
+    "interval": 2,
+    "sort": "",
+    "pageIndex": 0,
+    "pageCount": 30
+})
+
+//分页
+const currentPage = ref(1)
+var pageSize = ref(30)
+const total = ref(100)
+const disabled = ref(false)
+const background = ref(false)
+
+//表格
+var h = window.innerHeight - 230
+const tableHeight = ref(h);
+var tableInfo = reactive({
+    tableData: [],
+    title: { frozenList: [], otherList: [] }
+})
+const loading = ref(false);
+const value = ref(true);
+
+
+</script>
\ No newline at end of file

src/views/HeatUserPage/TapPage.vue

-
 <template>
-    阀门数据
-</template>
\ No newline at end of file
+    <el-card class="card-contianer" :body-style="{ 'padding': '0px 0px 0px 0px', 'height': '110px' }">
+        <div class="div-header">
+            <el-row>
+                <el-col :span="7">
+                    <div class="div-dropdown text-center">
+                        <span>小区名称&nbsp;:&nbsp;</span>
+                        <el-cascader :options="TransferInfo.tree" v-model="TransferInfo.id" :props="props" collapse-tags
+                            clearable :show-all-levels="false" filterable placeholder="请选择" style="min-width: 310px;" />
+                    </div>
+
+
+                </el-col>
+                <el-col :span="2">
+                    <div class="div-button">
+                        <el-button class="el-button-button" type="primary" :span="6" @click="refresh"
+                                    icon="Search">
+                                    搜&nbsp;&nbsp;索</el-button>
+                    </div>
+                    
+                </el-col>
+                <el-col :span="4">
+                </el-col>
+                <el-col :span="11">
+                    <div class="div-button">
+                        <el-row :gutter="10">
+                            <el-col :span="13">
+                            </el-col>
+                            <el-col :span="3">
+                            </el-col>
+                            <el-col :span="3">
+                            </el-col>
+                            <el-col :span="5">
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-col>
+            </el-row>
+        </div>
+    </el-card>
+
+    <el-card class="moduleCard" :height="tableHeight">
+        <el-table :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"
+                fixed />
+            <template v-for="(item, i) in tableInfo.title.otherList">
+                <el-table-column :prop="item.enName" :label="item.alias" :width="item.width">
+                </el-table-column>
+            </template>
+        </el-table>
+    </el-card>
+
+    <el-config-provider :locale="zhCn">
+        <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize"
+            :page-sizes="[30, 40, 50, 100, 200, 300]" :small="true" :disabled="disabled" :background="background"
+            layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="getdata"
+            @current-change="getdata" class="pagination" />
+    </el-config-provider>
+</template>
+
+<style lang="less" scoped>
+.moduleCard {
+    width: auto;
+    overflow: auto;
+    //max-height: 540px;
+    padding: 0px;
+
+    ::v-deep .el-card__body {
+        padding: 0px;
+    }
+}
+
+
+.pagination {
+    padding: 4px;
+    margin-left: 20px;
+    height: 30px;
+    //background-color: #8939cf;
+    vertical-align: middle;
+}
+
+
+//鼠标所在行的颜色
+::v-deep .el-table__body tr:hover>td {
+    background: linear-gradient(to top, rgb(0, 198, 255), rgb(255, 255, 255)) !important;
+}
+
+
+::v-deep .el-table__body tr.current-row>td {
+    background-color: #92cbf1 !important;
+}
+
+//------
+
+.card-contianer {
+    width: calc(100%-1px);
+    font-size: medium;
+    height: 60px;
+    overflow: hidden;
+
+    .div-header {
+        width: 100%;
+        margin: 5px;
+        height: 80px;
+    }
+
+    .div-list {
+        // margin-left: -50px;
+        padding-top: 10px;
+        widows: 100%;
+
+        .span-time {
+            font-family: simhei;
+            font-weight: bold;
+            font-size: medium;
+        }
+    }
+
+    .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 {
+            background-color: white;
+            color: rgb(64, 158, 255);
+            // padding-right: 10px;
+            display: flex;
+            margin-top: 5px;
+            border-radius: var(--el-border-radius-base);
+            padding: 6px 15px;
+            font-size: 14px;
+            height: 20px;
+            overflow: hidden;
+        }
+
+        .switch-autoRefresh {
+            margin-left: 0px;
+            margin-top: -6px;
+        }
+    }
+}
+
+.card-form {
+    width: 100%;
+    height: 300px;
+}
+
+.div-dropdown {
+    //display: flex;
+
+
+    padding-top: 7px;
+    height: 50px;
+    padding-left: 10px;
+
+
+    .el-dropdown-link {
+        margin-top: 5px;
+        color: white;
+    }
+
+}
+
+.text-center {
+    text-align: center;
+}
+
+:deep(.div-form-img) {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+:deep(.col-center) {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.span-text {}
+</style>
+
+<script setup>
+import { ref, reactive, onMounted, onUnmounted, provide, computed, handleError } from 'vue'
+import DataForm from '../../components/DataForm.vue';
+import { useRoute } from 'vue-router'
+import http from '../../api/http'
+import store from "../../store/index";
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+import {
+    Search,
+    ArrowLeft,
+    ArrowRight,
+    Warning
+} from '@element-plus/icons-vue'
+import CfgSupply from '../../components/CfgSupply.vue';
+// import { ca } from 'element-plus/es/locale';
+const enterpriseId = ref(null);
+enterpriseId.value = store.getters.getEnterpriseId();
+var gatherTime = ref([]);
+
+var showSupply = ref([])
+var showBoilder = ref([])
+var useDropdown = ref([false]);
+//ref([{label:'全部',value:''}])
+var selectList = reactive({ supplyList: [], dropdownList: [], pipeInfo: {} });
+var cardForms = reactive({ tableData: [], alarm: [], forms: [], title: [] });//无排序和筛选
+
+var autoRefresh = ref(false);
+var refreshTime = ref(60);
+var timer;
+
+const props = { multiple: true, emitPath: false }
+const TransferInfo = reactive({
+    "enterpriseId": enterpriseId.value,
+    tree: [],
+    "supplyId": [],
+    "deviceType": 3,
+    "id": [],
+    "name": [],
+    "interval": 2,
+    "sort": "",
+    "pageIndex": 0,
+    "pageCount": 30
+})
+
+//分页
+const currentPage = ref(1)
+var pageSize = ref(30)
+const total = ref(100)
+const disabled = ref(false)
+const background = ref(false)
+
+//表格
+var h = window.innerHeight - 230
+const tableHeight = ref(h);
+var tableInfo = reactive({
+    tableData: [],
+    title: { frozenList: [], otherList: [] }
+})
+const loading = ref(false);
+const value = ref(true);
+
+
+</script>
\ No newline at end of file