Procházet zdrojové kódy

分站管理历史数据

bobo04052021@163.com před 2 měsíci
rodič
revize
d285e4ab4e

+ 1 - 1
src/views/vent/deviceManager/comment/HistoryTable.vue

@@ -130,7 +130,7 @@ function resetFormParam() {
   formData['pageSize'] = pagination['pageSize'];
   formData['column'] = 'createTime';
   const params = {
-    pageNum: pagination['current'],
+    pageNo: pagination['current'],
     pageSize: pagination['pageSize'],
     column: pagination['createTime'],
     starttime_begin: formData['starttime_begin'],

+ 1 - 1
src/views/vent/deviceManager/substationTabel/index.vue

@@ -62,7 +62,7 @@ const normalTabel = ref();
 let timer = undefined;
 let activeKey = ref('device');
 const scroll = reactive({
-  y: 230,
+  y: 710,
 });
 function reload() {
   timer = setInterval(() => {

+ 2 - 2
src/views/vent/safetyList/common/HistoryTable.vue

@@ -219,7 +219,7 @@ const { tableContext, onExportXlsPost } = useListPage({
                 label: '连接状态',
                 field: 'status',
                 component: 'Select',
-                defaultValue: '连接成功',
+                defaultValue: '1',
                 componentProps: () => {
                   return {
                     options: [
@@ -237,7 +237,7 @@ const { tableContext, onExportXlsPost } = useListPage({
     // fetchSetting: {
     pagination: {
       current: 1,
-      pageSize: 10,
+      pageSize: 20,
       pageSizeOptions: ['10', '30', '50', '100'],
       showQuickJumper: false,
     },

+ 13 - 4
src/views/vent/safetyList/common/detail.vue

@@ -169,6 +169,7 @@
                   ]"
                   @click="cardClick(item, index)"
                 >
+                  <a-button type="primary" size="small" @click="getAllShow">显示全部</a-button>
                   <div class="card-item-label">{{ item.strname }}</div>
                 </div>
                 <div :class="activeIndex % 4 == 3 ? 'card-modal1' : 'card-modal'" v-if="activeIndex == index && isShow">
@@ -181,7 +182,7 @@
             </div>
           </div>
           <div class="right-box">
-            <HistoryTable :scroll="scroll" :historyColumns="historyColumns" :stationId="stationId" />
+            <HistoryTable class="historytable" :scroll="scroll" :historyColumns="historyColumns" :stationId="stationId" />
           </div>
         </div>
         <!-- 监测详情 -->
@@ -372,7 +373,6 @@ let ljList = reactive<any[]>([
 let selectedIndex = ref(0);
 let openNum = ref(0);
 let clsoeNum = ref(0);
-let stationId = ref(null);
 let tableData = ref<any[]>([]);
 let tableData1 = ref<any[]>([]);
 //分页参数配置
@@ -456,8 +456,9 @@ let derictList = reactive<any[]>([
   { label: '反向', value: '1' },
 ]);
 let devStationId = ref('');
+let stationId = ref('');
 const scroll = reactive({
-  y: 230,
+  y: 680,
 });
 //读取分站设备下拉选项数据
 let timer: null | NodeJS.Timeout = null;
@@ -759,6 +760,12 @@ async function getStationList1() {
   tableData.value = res;
   pagination.total = res.total;
 }
+//显示全部
+function getAllShow() {
+  pagination.current = 1;
+  stationId.value = '';
+  getStationList1({ pageNo: pagination.current, pageSize: pagination.pageSize });
+}
 //启动新设备
 function handlerunDeviceMonitor(record, val) {
   devId.value = record.id;
@@ -1309,7 +1316,9 @@ onUnmounted(() => {
           box-sizing: border-box;
           background: url('/@/assets/images/fire/bj1.png') no-repeat center;
           background-size: 100% 100%;
-
+          .historytable {
+            height: 100%;
+          }
           .right-title {
             display: flex;
             height: 30px;