1.17-公司端首页，瓦斯巡检地点管理，预警管控通风

src/hooks/setting/index.ts

@@ -8,7 +8,7 @@ let domainUrl = '',
   homePath = '',
   sysOrgCode = '',
   title = '',
-  sysDataType = 'monitor';
+  sysDataType = 'report';
 
 const getUrl = () => {
   return new Promise((resolve, reject) => {

src/views/vent/gas/gasAnalysis/index.vue

@@ -19,9 +19,9 @@
                 </a-row>
             </div>
             <div class="table-area">
-                <a-table :columns="columns"
+                <a-table :key="keyActive" :columns="columns"
                     :row-selection="{ selectedRowKeys: selectedRowKey, type: 'radio', onChange: onSelectChange }"
-                    size="small" :data-source="tableData" :scroll="{ y: 470 }" class="tableW" :pagination="pagination">
+                    size="small" :data-source="tableData" :scroll="{ y: 470 }" class="tableW" :pagination="pagination" @change="pageChange">
                     <template #bodyCell="{ column, text }">
                         <template v-if="column.dataIndex == 'bc'">
                             <div :style="contentStyle">夜班</div>
@@ -121,7 +121,7 @@ import { columns, pagination, } from './gasAnalysis.data'
 import { gasReportLogList,exportGasInsFx } from './gasAnalysis.api'
 import { message } from 'ant-design-vue';
 
-
+let keyActive=ref(0)
 let searchTime = ref(dayjs().format('YYYY-MM-DD'))//dayjs().format('YYYY-MM-DD HH:mm:ss')
 let tableData = ref<any[]>([])
 let selectedRowKey = ref<any[]>(['1'])
@@ -176,6 +176,7 @@ let onSelectChange = (selectedRowKeys, selectedRows) => {
 async function gasReportLogLists() {
     let res = await gasReportLogList({ reportTime: searchTime.value, pageNo: pagination.current, pageSize: pagination.pageSize })
     console.log(res, '瓦斯巡检统计分析列表')
+    keyActive.value=new Date().getTime()
     if ( res.records.length != 0) {
         pagination.current = 1
         tableData.value = res.records.map(el => {
@@ -202,13 +203,21 @@ async function gasReportLogLists() {
 }
 //查询
 let getSearch = () => {
+    pagination.current=1
     gasReportLogLists()
 }
 //重置
 let getReset = () => {
+    pagination.current=1
     searchTime.value = dayjs().format('YYYY-MM-DD')
     gasReportLogLists()
 }
+//分页切换
+let pageChange=(val)=> {
+    pagination.current = val.current;
+    pagination.pageSize = val.pageSize;
+    gasReportLogLists()
+  }
 //导出
 async function downLoadFx(record){
     let res=await exportGasInsFx({id:record.id})

src/views/vent/gas/gasInspect/index.vue

@@ -44,7 +44,7 @@
                     </a-col>
                 </a-row>
             </div>
-            <a-table :columns="columns" size="small" :data-source="tableData" :scroll="{ y: 500 }" class="tableW"
+            <a-table :key="keyActive" :columns="columns" size="small" :data-source="tableData" :scroll="{ y: 650 }" class="tableW"
                 :pagination="pagination" @change="pageChange">
                 <template #action="{ record }">
                     <a class="table-action-link" @click="handlerEdit(record)">编辑</a>
@@ -119,6 +119,7 @@ import { columns, pagination } from './gasInspect.data'
 import { list, importByExcel, exportGasByExcel, moveOrderNum, edit, deleteCard, taskSubmit, clearCardInfo, teamList } from './gasInspect.api'
 
 
+let keyActive=ref(0)
 let searchId = ref('')
 let tableData = ref<any[]>([])//巡检列表
 let visibleTask = ref(false)//控制任务管理弹窗的显示与隐藏
@@ -212,7 +213,8 @@ let handlerTeam=()=>{
 async function queryByIdList() {
     let res = await list({ id: searchId.value, pageNo: pagination.current, pageSize: pagination.pageSize })
     console.log(res, '列表查询---')
-    tableData.value = res.map((el: any) => {
+    keyActive.value=new Date().getTime()
+    tableData.value = res.records.map((el: any) => {
         return {
             morning: el.insType,
             afterNoon: el.insType,
@@ -220,15 +222,17 @@ async function queryByIdList() {
             ...el
         }
     }) 
-    pagination.total = res.total
+    pagination.total =res.total
 }
 //查询
 let getSearchCardId = () => {
+    pagination.current=1
     queryByIdList()
 }
 //重置
 let getReset = () => {
     searchId.value = ''
+    pagination.current=1
     queryByIdList()
 }
  //分页切换

src/views/vent/gas/gasInspectNonfc/index.vue

@@ -42,8 +42,8 @@
                     </a-col>
                 </a-row>
             </div>
-            <a-table :columns="columns" size="small" :data-source="tableData" :scroll="{ y: 500 }" class="tableW"
-                :pagination="pagination">
+            <a-table :key="keyActive" :columns="columns" size="small" :data-source="tableData" :scroll="{ y: 500 }" class="tableW"
+                :pagination="pagination"  @change="pageChange">
                 <template #action="{ record }">
                     <a class="table-action-link" @click="handlerEdit(record)">编辑</a>
                     <a-popconfirm title="删除内容无法恢复，是否删除" ok-text="确定" cancel-text="取消"
@@ -107,7 +107,7 @@ import { message } from 'ant-design-vue';
 import { columns, pagination } from './gasInspectNonfc.data'
 import { list, importByExcel, exportGasByExcel, moveOrderNum, edit, taskSubmit, clearCardInfo } from './gasInspectNonfc.api'
 
-
+let keyActive=ref(0)
 let searchId = ref('')
 let tableData = ref<any[]>([])//巡检列表
 let visibleTask = ref(false)//控制任务管理弹窗的显示与隐藏
@@ -171,8 +171,7 @@ async function handleDelCardInfo(record) {
 async function queryByIdList() {
     let res = await list({ id: searchId.value, pageNo: pagination.current, pageSize: pagination.pageSize })
     console.log(res, '列表查询---')
-    pagination.current = 1
-
+    keyActive.value=new Date().getTime()
     tableData.value = res.records.map((el: any) => {
         return {
             morning: el.insType,
@@ -185,13 +184,21 @@ async function queryByIdList() {
 }
 //查询
 let getSearchCardId = () => {
+    pagination.current=1
     queryByIdList()
 }
 //重置
 let getReset = () => {
+    pagination.current=1
     searchId.value = ''
     queryByIdList()
 }
+//分页切换
+let pageChange=(val)=> {
+    pagination.current = val.current;
+    pagination.pageSize = val.pageSize;
+    queryByIdList()
+  }
 //导入
 let getupload = () => {
     modalType.value = 'upload'

src/views/vent/home/clique/components/icon-light.vue

@@ -4,7 +4,7 @@
       <div class="icon-point" @click="openModal(item.code, item.label, item.leftV, item.topV)" :style="{ left: item.leftV, top: item.topV }">
         <img :src="item.imgSrc" alt="" />
         <span
-          :class="{ 'icon-text-c': item.align == 'center', 'icon-text-l': item.align == 'left', 'icon-text-r': item.align == 'right' }"
+          :class="{ 'icon-text-c': item.align == 'center', 'icon-text-l': item.align == 'left', 'icon-text-r': item.align == 'right','icon-text-b':item.align=='bottom' }"
           :style="{ color: item.textColor }"
           >{{ item.label }}</span
         >
@@ -120,7 +120,7 @@
             textColor: '#fff',
             align: 'left',
           },
-          { code: 'sdmtjtsgtmk', imgSrc: warningLevel1, label: '石圪台矿', leftV: '514px', topV: '250px', textColor: '#fff', align: 'right' },
+          { code: 'sdmtjtsgtmk', imgSrc: warningLevel1, label: '石圪台矿', leftV: '514px', topV: '250px', textColor: '#fff', align: 'bottom' },
           {
             code: 'sdmtjtbltmk',
             imgSrc: warningLevel1,
@@ -130,7 +130,7 @@
             textColor: '#fff',
             align: 'left',
           },
-          { code: 'sdmtjthlgmk', imgSrc: warningLevel1, label: '哈拉沟矿', leftV: '641px', topV: '268px', textColor: '#fff', align: 'right' },
+          { code: 'sdmtjthlgmk', imgSrc: warningLevel1, label: '哈拉沟矿', leftV: '641px', topV: '258px', textColor: '#fff', align: 'bottom' },
           {
             code: 'sdmtjtswmk',
             imgSrc: warningLevel3,
@@ -140,8 +140,8 @@
             textColor: '#fff',
             align: 'left',
           },
-          { code: 'sdmtjtdltmkhjtj', imgSrc: warningLevel1, label: '活鸡兔井', leftV: '598px', topV: '358px', textColor: '#fff', align: 'left' },
-          { code: 'sdmtjtdltmk', imgSrc: warningLevel2, label: '大柳塔井', leftV: '598px', topV: '308px', textColor: '#fff', align: 'right' },
+          { code: 'sdmtjtdltmkhjtj', imgSrc: warningLevel1, label: '活鸡兔井', leftV: '598px', topV: '368px', textColor: '#fff', align: 'bottom' },
+          { code: 'sdmtjtdltmk', imgSrc: warningLevel2, label: '大柳塔井', leftV: '598px', topV: '308px', textColor: '#fff', align: 'bottom' },
           {
             code: 'sdmtjtjjmk',
             imgSrc: warningLevel1,
@@ -149,7 +149,7 @@
             leftV: '575px',
             topV: '460px',
             textColor: '#fff',
-            align: 'center',
+            align: 'bottom',
           },
           { code: 'sdmtjtyjlmk', imgSrc: warningLevel1, label: '榆家梁矿', leftV: '748px', topV: '370px', textColor: '#fff', align: 'center' },
           {
@@ -248,6 +248,16 @@
         top: -20px;
         left: -12px;
       }
+      .icon-text-b{
+        position: absolute;
+        font-size: 12px;
+        padding: 0px 5px;
+        display: block;
+        width: 100px;
+        text-align: center;
+        left: -28px;
+        bottom:-20px;
+      }
     }
   }
 </style>

src/views/vent/home/clique/index.vue

@@ -340,7 +340,7 @@
                 width: 80px;
                 height: 80px;
                 left: 500px;
-                top: 290px;
+                top: 295px;
                 z-index: 999;
               }
             }

src/views/vent/monitorManager/alarmMonitor/index.vue

@@ -475,7 +475,7 @@
   let fireMonitor1 = reactive<any[]>([]);
   let visibleGrade = ref(false); //控制风险等级弹窗显示与隐藏
   let titleGrade = ref(''); //风险等级弹窗标题
-  let showToggle = ref('');
+  let showToggle = ref('report');
 
   //点击切换实时\报表数据
   let handlerToggle = () => {
@@ -629,7 +629,7 @@
   onMounted(async () => {
     const { sysOrgCode, sysDataType } = useGlobSetting();
     warnLevels.value = sysOrgCode;
-    showToggle.value = sysDataType;
+    showToggle.value = sysDataType || 'report';
     await getLevelNum();
     await getMonitor(true);
     rainBg('rain', 'animation-box');

src/views/vent/monitorManager/alarmMonitor/warn/ventilateWarn.vue

@@ -148,7 +148,7 @@
   });
   let cardListTf = ref<any[]>([]);
   const chartListTf = ref<any[]>([]);
-  let showToggle = ref('');
+  let showToggle = ref('report');
   //通风选项切换
   function btnClick(ind) {
     activeIndex.value = ind;
@@ -411,7 +411,7 @@
 
   onMounted(async () => {
     const { sysOrgCode, sysDataType } = useGlobSetting();
-    showToggle.value = sysDataType;
+    showToggle.value = sysDataType || 'report';
     await getMenuList();
     await getMonitor();
   });