适配新的法律法规和管理制度

src/view/Home2.vue

@@ -239,7 +239,10 @@ const handleClick = () => {
 const getRecentlyUsed = (jumpPath) => {
   const url = '/sgsafe/MenuRecentlyUsed/updateMenuRecentlyUsedStatus'
   const param = {
-    jumpPath
+    json: JSON.stringify({
+      jumpPath,
+      applicationId: 'c77da6a732d34400b24374e2cea811ee',
+    })
   }
   proxy.$axios.post(url,param).then(res => {
     if (res.data.code !== 0) {

src/view/institution/institutionRegime.vue

@@ -1,10 +1,6 @@
 <script setup>
-import { getCurrentInstance, onMounted, ref } from 'vue';
-import { useRouter } from 'vue-router';
-
-const {
-  proxy
-} = getCurrentInstance()
+import { getCurrentInstance, ref } from 'vue';
+const { proxy } = getCurrentInstance()
 
 /* 通用方法： 重置list数据 */
 const basicReset = () => {
@@ -14,11 +10,9 @@ const basicReset = () => {
   list.value = []
 }
 
-/* 返回上一级页面 */
-const router = useRouter()
-
 /* 在线预览实现 */
 import {Base64} from "js-base64";
+import { showFailToast } from 'vant';
 const linShiFid=ref({
   fileId:''
 })
@@ -68,7 +62,8 @@ const total = ref(0)
 const resultData = ref([])
 const fetchData = ref({
   regimeName:'',
-  regimeScope: ''
+  regimeScope: '',
+  regimeType: 'safe'
 })
 
 const onSearch = async () => {
@@ -78,13 +73,18 @@ const onSearch = async () => {
 
 const resetCondition = async () => {
   basicReset()
-  fetchData.value = {
-    regimeName:'',
-    regimeScope: ''
-  }
+  fetchData.value.regimeName = ''
+  fetchData.value.regimeScope = ''
   await onLoad()
 }
 
+const currentTab = ref('safe');
+const handleClick = (tab) => {
+  currentTab.value = tab;
+  fetchData.value.regimeType = tab;
+  onRefresh();
+};
+
 /* 查询请求 */
 const queryFetch = async () => {
   fetchData.value.regimeScope = postBackRegimeScope.value
@@ -157,7 +157,6 @@ const showBottom = ref(false)
 const postBackRegimeScope = ref()
 const currentDeptName = ref('')
 import OrganizationalWithLeaf from '@/components/OrganizationalWithLeaf.vue';
-import { showFailToast } from 'vant';
 const showPickerHandle = () => {
   showBottom.value = true
 }
@@ -184,7 +183,18 @@ const getDeptInfo = (currentDeptInfo) => {
 <template>
   <div class="page-container">
     <van-sticky>
-      <van-nav-bar title="安全制度管理" />
+      <van-nav-bar
+        title="安全制度管理"
+        @click-left="handleClick('safe')"
+        @click-right="handleClick('env')"
+      >
+        <template #left>
+          <div class="custom-tab" :class="{ 'custom-tab--active': currentTab === 'safe' }">安全</div>
+        </template>
+        <template #right>
+          <div class="custom-tab" :class="{ 'custom-tab--active': currentTab === 'env' }">环保</div>
+        </template>
+      </van-nav-bar>
 
       <van-search
         v-model="fetchData.regimeName"
@@ -280,4 +290,27 @@ const getDeptInfo = (currentDeptInfo) => {
   color: #333;
 }
 
+.custom-tab {
+  padding: 8px 0;
+  font-size: 14px;
+  color: var(--van-gray-7, #646566);
+  position: relative;
+  cursor: pointer;
+}
+
+.custom-tab--active {
+  color: var(--van-primary-color, #1989fa);
+}
+
+.custom-tab--active::after {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 3px;
+  background-color: var(--van-primary-color, #1989fa);
+  border-radius: 2px;
+}
+
 </style>

src/view/institution/law.vue

@@ -1,65 +1,62 @@
 <script setup>
-import { getCurrentInstance, onActivated, onMounted, ref } from 'vue';
-import { onBeforeRouteUpdate, useRouter } from 'vue-router';
-import { useEmergencyStore } from '@/stores/emergencyManager.js';
-
-const emergencyInfo =  useEmergencyStore()
-const {
-  proxy
-} = getCurrentInstance()
+import { getCurrentInstance, ref } from 'vue';
+const { proxy } = getCurrentInstance();
 
 /* 通用方法： 重置list数据 */
 const basicReset = () => {
   finished.value = false;
   loading.value = true;
-  pageNum.value = 1
-  list.value = []
-}
-
-/* 返回上一级页面 */
-const router = useRouter()
+  pageNum.value = 1;
+  list.value = [];
+};
 
 /* 查询数据 */
-const pageNum = ref(1)
-const pageSize = ref(10)
-const total = ref(0)
-const resultData = ref([])
+const pageNum = ref(1);
+const pageSize = ref(10);
+const total = ref(0);
+const resultData = ref([]);
 const fetchData = ref({
-  lawName:''
-})
+  lawName: '',
+  lawType: 'safe'
+});
 
 const onSearch = () => {
-  basicReset()
-  onLoad()
-}
+  basicReset();
+  onLoad();
+};
 
 const resetCondition = () => {
-  basicReset()
-  fetchData.value = {
-    lawName:''
-  }
-  onLoad()
-}
+  basicReset();
+  fetchData.value.lawName = '';
+  onLoad();
+};
+
+const currentTab = ref('safe');
+const handleClick = (tab) => {
+  currentTab.value = tab;
+  fetchData.value.lawType = tab;
+  onRefresh();
+};
 
 /* 查询请求 */
 const queryFetch = async () => {
-  if (sessionStorage.getItem("lawName")) {
-    fetchData.value.lawName = sessionStorage.getItem("lawName")
-    sessionStorage.removeItem("lawName")
+  if (sessionStorage.getItem('lawName')) {
+    fetchData.value.lawName = sessionStorage.getItem('lawName');
+    sessionStorage.removeItem('lawName');
   }
-  const url = '/sgsafe/InstitutionLaw/query'
+  const url = '/sgsafe/InstitutionLaw/query';
   const param = {
     page: pageNum.value,
     rows: pageSize.value,
     params: JSON.stringify(fetchData.value)
-  }
+  };
   try {
-    const res = await proxy.$axios.post(url,param);
+    const res = await proxy.$axios.post(url, param);
     if (res.data.code === 0) {
-      total.value = res.data.data.total
-      resultData.value = res.data.data.records
+      total.value = res.data.data.total;
+      resultData.value = res.data.data.records;
     } else {
-      console.log('操作失败!' + res.data.msg)
+      console.log('操作失败!' + res.data.msg);
     }
   } catch (error) {
     console.error('请求出错:', error);
@@ -68,12 +65,12 @@ const queryFetch = async () => {
 
 /* 列表加载与下拉刷新 */
 const list = ref([]);
-const refreshing = ref(false)
-const loading = ref(false)
-const finished = ref(false)
+const refreshing = ref(false);
+const loading = ref(false);
+const finished = ref(false);
 
 const onRefresh = () => {
-  basicReset()
+  basicReset();
   onLoad();
 };
 
@@ -86,10 +83,10 @@ const onLoad = async () => {
   try {
     await queryFetch();
     if (pageSize.value * pageNum.value < total.value) {
-      list.value = [...list.value,...resultData.value ]
+      list.value = [...list.value, ...resultData.value];
       pageNum.value++;
     } else {
-      list.value = [...list.value,...resultData.value ]
+      list.value = [...list.value, ...resultData.value];
       finished.value = true;
     }
   } catch (error) {
@@ -101,27 +98,25 @@ const onLoad = async () => {
 };
 
 /* 在线预览实现 */
-import {Base64} from "js-base64";
+import { Base64 } from 'js-base64';
 import { showFailToast } from 'vant';
-const linShiFid=ref({
-  fileId:''
-})
+const linShiFid = ref({ fileId: '' });
 const handlePreview = (fileId) => {
   if (fetchData.value.lawName) {
-    sessionStorage.setItem("lawName", fetchData.value.lawName)
+    sessionStorage.setItem('lawName', fetchData.value.lawName);
   }
-  linShiFid.value.fileId= fileId
-  getTableDataQueryFile()
-}
-const bucket = ref(import.meta.env.VITE_BUCKET)
+  linShiFid.value.fileId = fileId;
+  getTableDataQueryFile();
+};
+const bucket = ref(import.meta.env.VITE_BUCKET);
 const getTableDataQueryFile = () => {
-  var url = 'framework/Common/queryFileWithValues'
-  var param = {
-    fId: linShiFid.value.fileId,
-  }
+  const url = 'framework/Common/queryFileWithValues';
+  let param = {
+    fId: linShiFid.value.fileId
+  };
   proxy.$axios.get(url, param).then(response => {
-    if (response.data.code == 0) {
-      const downloadPath = import.meta.env.VITE_BASE_API + '/framework/Common/downloadFileS3?bucket='+ bucket.value + '&id='
+    if (response.data.code === 0) {
+      const downloadPath = import.meta.env.VITE_BASE_API + '/framework/Common/downloadFileS3?bucket=' + bucket.value + '&id=';
       const fileListWithUrls = response.data.data.map(file => ({
         ...file,
         url: `${downloadPath}${file.id}`, // 添加完整的下载路径
@@ -131,23 +126,35 @@ const getTableDataQueryFile = () => {
         id: file.id
       }));
 
-      var originUrl = import.meta.env.VITE_PREVIEW_BASE_API + 'framework/Common/downloadFileS3?bucket=' + bucket.value +'&id=' + fileListWithUrls[0].id
-      var previewUrl = originUrl + '&fullfilename=' + Date.now() + fileListWithUrls[0].name
-      var url = import.meta.env.VITE_PREVIEW_API + 'onlinePreview?url=' + encodeURIComponent(Base64.encode(
-        previewUrl)) + '&officePreviewType=pdf'
+      let originUrl = import.meta.env.VITE_PREVIEW_BASE_API + 'framework/Common/downloadFileS3?bucket=' + bucket.value + '&id=' + fileListWithUrls[0].id;
+      let previewUrl = originUrl + '&fullfilename=' + Date.now() + fileListWithUrls[0].name;
+      let url = import.meta.env.VITE_PREVIEW_API + 'onlinePreview?url=' + encodeURIComponent(Base64.encode(
+        previewUrl)) + '&officePreviewType=pdf';
       window.open(url);
     } else {
-      showFailToast('失败！' + response.data.msg)
+      showFailToast('失败！' + response.data.msg);
     }
-  })
-}
+  });
+};
 
 </script>
 
 <template>
   <div class="page-container">
     <van-sticky>
-      <van-nav-bar title="法律法规" />
+      <van-nav-bar
+        title="法律法规"
+        @click-left="handleClick('safe')"
+        @click-right="handleClick('env')"
+      >
+        <template #left>
+          <div class="custom-tab" :class="{ 'custom-tab--active': currentTab === 'safe' }">安全</div>
+        </template>
+        <template #right>
+          <div class="custom-tab" :class="{ 'custom-tab--active': currentTab === 'env' }">环保</div>
+        </template>
+      </van-nav-bar>
+
       <van-search
         v-model="fetchData.lawName"
         @search="onSearch"
@@ -208,15 +215,32 @@ const getTableDataQueryFile = () => {
   background-color: #fff;
 }
 
-.label-content {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-}
-
 .bold-title {
   font-weight: bold;
   color: #333;
 }
 
+.custom-tab {
+  padding: 8px 0;
+  font-size: 14px;
+  color: var(--van-gray-7, #646566);
+  position: relative;
+  cursor: pointer;
+}
+
+.custom-tab--active {
+  color: var(--van-primary-color, #1989fa);
+}
+
+.custom-tab--active::after {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 3px;
+  background-color: var(--van-primary-color, #1989fa);
+  border-radius: 2px;
+}
+
 </style>