瓦斯日报表修改提交

src/views/vent/gas/gasReportInspect/comment/common/treeList.vue

@@ -131,7 +131,7 @@
   }
 
   .vtl-node {
-    --node-select-bg: #1c4869;
+    --node-select-bg: rgba(26, 91, 127,.4);
     .vtl-node-main {
       display: flex;
       align-items: center;

src/views/vent/gas/gasReportInspect/gasReportInspect.api.ts

@@ -1,7 +1,8 @@
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
- queryReportData='/safety/reportLocalData/queryReportData'
+ queryReportData='/safety/reportLocalData/queryReportData',
+ queryReportList='/safety/reportLocalData/list'
 }
 
 
@@ -11,3 +12,9 @@ enum Api {
  */
 export const queryReportData = (params) => defHttp.post({ url: Api.queryReportData,params },);
 
+/**
+ * 树列表
+ * @param params
+ */
+export const queryReportList = (params) => defHttp.get({ url: Api.queryReportList,params });
+

src/views/vent/gas/gasReportInspect/index-time.vue

@@ -24,8 +24,8 @@
                 </div>
             </div>
             <div class="right-box">
-                <a-table :columns="columns" size="small" :data-source="tableData" :scroll="{ y: 754 }"
-                    class="tableW" :pagination="false"></a-table>
+                <a-table :columns="columns" size="small" :data-source="tableData" :scroll="{ y: 754 }" class="tableW"
+                    :pagination="false"></a-table>
             </div>
         </div>
     </div>1
@@ -36,11 +36,11 @@ import { ref, nextTick, reactive, onMounted } from 'vue';
 import fileSystem from './comment/common/cameraTree.vue';
 import { SvgIcon } from '/@/components/Icon';
 import treeIcon from './comment/common/Icon/treeIcon.vue';
-import { columnsType,columnBlt,columnBd,columnSgt,columnCctr,columnYjl,columnCct,columnWlml} from './gasReportInspect.data';
-import { queryReportData } from './gasReportInspect.api';
+import { columnsType, columnBlt, columnBd, columnSgt, columnCctr, columnYjl, columnCct, columnWlml } from './gasReportInspect.data';
+import { queryReportData, queryReportList } from './gasReportInspect.api';
 import { useGlobSetting } from '/@/hooks/setting';
 
-let glob= useGlobSetting();
+let glob = useGlobSetting();
 let gasType = ref('gasDayNight')
 //左侧菜单列表
 let listArr = reactive<any[]>([]);
@@ -51,27 +51,35 @@ let selected = reactive<any>({
     title: '',
     isFolder: false,
 });
-let columns=glob.sysOrgCode=='sdmtjtbltmk' ? columnBlt : glob.sysOrgCode=='sdmtjtbdmk' ? columnBd :  glob.sysOrgCode=='sdmtjtsgtmk' ? columnSgt : glob.sysOrgCode=='sdmtjtcctrk' ? columnCctr : glob.sysOrgCode=='sdmtjtyjlmk' ? columnYjl : glob.sysOrgCode=='sdmtjtcctmk' ? columnCct : glob.sysOrgCode=='sdmtjtwlmlmk' ? columnWlml : columnsType
+let columns = glob.sysOrgCode == 'sdmtjtbltmk' ? columnBlt : glob.sysOrgCode == 'sdmtjtbdmk' ? columnBd : glob.sysOrgCode == 'sdmtjtsgtmk' ? columnSgt : glob.sysOrgCode == 'sdmtjtcctrk' ? columnCctr : glob.sysOrgCode == 'sdmtjtyjlmk' ? columnYjl : glob.sysOrgCode == 'sdmtjtcctmk' ? columnCct : glob.sysOrgCode == 'sdmtjtwlmlmk' ? columnWlml : columnsType
 let tableData = ref<any[]>([])
+let tableList = ref<any[]>([])
 let handlerToggle = (param) => {
     gasType.value = param
-    getTreeList(gasType.value)
+    getTreeList({ type: gasType.value })
 }
 //获取左侧菜单树
 async function getTreeList(param) {
+    // const res = await queryReportData({ type: param })
     listArr.length = 0
-    const res = await queryReportData({ type: param })
-    console.log(res, '早中晚----------------')
-    if (res) {
-        listArr.push({
-            id: res.id,
-            pid: null,
-            title: res.fileName,
-            isFolder: true,
+    const res = await queryReportList({ pageNo: 1, pageSize: 100, ...param })
+    tableList.value = res.records || []
+    selected.id = tableList.value[0].id;
+    selected.pid = tableList.value[0].pid;
+    selected.title = tableList.value[0].title;
+    selected.isFolder = tableList.value[0].isFolder;
+    selected.ppid = tableList.value[0].ppid
+    if (tableList.value && tableList.value.length != 0) {
+        tableList.value.forEach(el => {
+            listArr.push({
+                id: el.id,
+                pid: null,
+                title: el.fileName,
+                isFolder: true,
+            })
         })
-        tableData.value = JSON.parse(res.content)
     }
-
+    tableData.value = JSON.parse(tableList.value[0].content)
 }
 //点击目录
 function onClick(node) {
@@ -80,10 +88,11 @@ function onClick(node) {
     selected.title = node.title;
     selected.isFolder = node.isFolder;
     selected.ppid = node.ppid
+    tableData.value = JSON.parse(tableList.value.filter(v => v.id == selected.id)[0].content)
 };
 
 onMounted(() => {
-    getTreeList(gasType.value)
+    getTreeList({ type: gasType.value })
 })
 </script>
 
@@ -92,6 +101,7 @@ onMounted(() => {
     width: 100%;
     height: 100%;
     position: relative;
+
     .content {
         width: 100%;
         height: 100%;
@@ -165,7 +175,9 @@ onMounted(() => {
         }
     }
 }
-::v-deep .zxm-table-thead > tr > th:last-child, .zxm-table-thead .zxm-table-column-title:last-child{
+
+::v-deep .zxm-table-thead>tr>th:last-child,
+.zxm-table-thead .zxm-table-column-title:last-child {
     border-right: 1px solid #91e9fe !important;
 }
 </style>

src/views/vent/gas/gasReportInspect/index-type.vue

@@ -31,7 +31,7 @@ import fileSystem from './comment/common/cameraTree.vue';
 import { SvgIcon } from '/@/components/Icon';
 import treeIcon from './comment/common/Icon/treeIcon.vue';
 import { columnsGas1,columnsGas2, } from './gasReportInspect.data';
-import { queryReportData } from './gasReportInspect.api';
+import { queryReportData,queryReportList } from './gasReportInspect.api';
 
 
 let gasType = ref('gasDay1')
@@ -45,33 +45,43 @@ let selected = reactive<any>({
     isFolder: false,
 });
 let tableData = ref<any[]>([])
+let tableList=ref<any[]>([])
 let columnsType = ref<any[]>(columnsGas1)
 let handlerToggle = (param) => {
     gasType.value = param
     switch (gasType.value) {
         case 'gasDay1':
             columnsType.value = columnsGas1
-            getTreeList()
+            getTreeList({ type: gasType.value })
             break;
         case 'gasDay2':
             columnsType.value=columnsGas2
-            getTreeList()
+            getTreeList({ type: gasType.value })
             break;
     }
 }
 //获取左侧菜单树
-async function getTreeList() {
+async function getTreeList(param) {
+    // const res = await queryReportData({ type: param })
     listArr.length = 0
-    const res = await queryReportData({ type: gasType.value })
-    if (res) {
-        listArr.push({
-            id: res.id,
-            pid: null,
-            title: res.fileName,
-            isFolder: true,
+    const res = await queryReportList({ pageNo: 1, pageSize: 100, ...param })
+    tableList.value = res.records || []
+    selected.id = tableList.value[0].id;
+    selected.pid = tableList.value[0].pid;
+    selected.title = tableList.value[0].title;
+    selected.isFolder = tableList.value[0].isFolder;
+    selected.ppid = tableList.value[0].ppid
+    if (tableList.value && tableList.value.length != 0) {
+        tableList.value.forEach(el => {
+            listArr.push({
+                id: el.id,
+                pid: null,
+                title: el.fileName,
+                isFolder: true,
+            })
         })
-        tableData.value = JSON.parse(res.content)
     }
+    tableData.value = JSON.parse(tableList.value[0].content)
 }
 //点击目录
 function onClick(node) {
@@ -80,10 +90,11 @@ function onClick(node) {
     selected.title = node.title;
     selected.isFolder = node.isFolder;
     selected.ppid = node.ppid
+    tableData.value = JSON.parse(tableList.value.filter(v => v.id == selected.id)[0].content)
 };
 
 onMounted(() => {
-    getTreeList()
+    getTreeList({ type: gasType.value })
 })
 </script>