1. 孟家窑子token登录功能接口调整

2. 新增瓦斯抽采调控页面

src/api/sys/user.ts

@@ -98,12 +98,10 @@ export function phoneLoginApi(params: LoginParams, mode: ErrorMessageMode = 'mod
 }
 
 export function tokenLogin(params: TokenInfo, mode: ErrorMessageMode = 'modal', successMode: SuccessMessageMode = 'success') {
-  return defHttp.get<GetUserInfoModel>(
+  return defHttp.post<GetUserInfoModel>(
     {
       url: Api.tokenLogin,
-      headers: {
-        Token: params.token,
-      },
+      data: params.token,
     },
     {
       successMessageMode: successMode,

src/components/chart/BarAndLine.vue

@@ -77,7 +77,7 @@
               iconStyle: {
                 borderColor: '#ffffff',
               },
-              show: true,
+              show: false,
             },
           },
         },

src/components/vent/micro/ventModal.vue

@@ -41,7 +41,11 @@
     height: 100%;
   }
   #micro-vent-3dModal {
+    position: absolute;
+    left: 0;
+    top: 0;
     width: 100%;
     height: 100%;
+    pointer-events: auto;
   }
 </style>

src/hooks/vent/useAutoLogin.ts

@@ -76,10 +76,10 @@ export function useAutoLogin() {
   }
 
   async function doTokenLogin(token: string) {
-    tokenLogin({ token }).then(async () => {
-      await userStore.setToken(token);
-      await userStore.getUserInfoAction();
-    });
+    const res = await tokenLogin({ token });
+    userStore.setUserInfo(res['userInfo']);
+    userStore.setAllDictItems(res['sysAllDictItems']);
+    userStore.setToken(res['token']);
   }
 
   return {

src/main.ts

@@ -1,6 +1,6 @@
 import 'uno.css';
 import '/@/design/index.less';
-
+import animate from 'animate.css';
 //lxh
 import './assets/iconfong/iconfont.css';
 import './assets/iconfong/iconfont.js';
@@ -35,7 +35,7 @@ await getRemoteSetting();
 async function bootstrap() {
   // 创建应用实例
   const app = createApp(App);
-
+  app.use(animate);
   // 多语言配置,异步情况:语言文件可以从服务器端获得
   await setupI18n(app);
 

src/router/guard/permissionGuard.ts

@@ -39,7 +39,7 @@ const whitePathList: PageEnum[] = [LOGIN_PATH, OAUTH2_LOGIN_PAGE_PATH, SYS_FILES
 const glob = useGlobSetting();
 
 export function createPermissionGuard(router: Router) {
-  // debugger;
+  debugger;
   const userStore = useUserStoreWithOut();
   const permissionStore = usePermissionStoreWithOut();
   const { doAutoLogin, doTokenLogin, validateRoute, tokenValidateRoute } = useAutoLogin();

src/router/routes/basic.ts

@@ -65,22 +65,11 @@ export const QIANKUN_ROUTE: AppRouteRecordRaw = {
   },
   children: [
     {
-      path: '/micro-need-air/:path(.*)*',
-      name: QIANKUN_ROUTE_NAME,
-      component: QIANKUN_COMPONENT,
+      path: '/micro-vent-3dModal/gas/home',
+      name: 'gas-home',
+      component: () => import('/@/views/vent/gas/gasHome/index.vue'),
       meta: {
-        title: '子应用',
-        hideBreadcrumb: true,
-        hideMenu: true,
-      },
-      ver: '1',
-    },
-    {
-      path: '/micro-fire-front/:path(.*)*',
-      name: QIANKUN_ROUTE_NAME,
-      component: QIANKUN_COMPONENT,
-      meta: {
-        title: '子应用',
+        title: '抽采综合管控',
         hideBreadcrumb: true,
         hideMenu: true,
       },

src/views/vent/comment/components/bottomMenu.vue

@@ -76,6 +76,8 @@
     bottom: 10px;
     align-items: center;
     justify-content: center;
+    pointer-events: auto;
+    z-index: 999;
 
     .btn-item {
       width: 182px;

src/views/vent/gas/gasAssessment/components/customHeader.vue

@@ -65,7 +65,7 @@
     position: absolute;
     margin: auto;
     top: 40px;
-    z-index: 999;
+    z-index: 9999;
     left: 50%;
     transform: translateX(-50%);
   }

src/views/vent/gas/gasAssessment/components/gasUnit.vue

@@ -1,41 +1,15 @@
 <template>
   <CustomBadges class="w-1710px ml-100px mt-50px" :badges="unitHeaderBadges" />
   <div class="monitor-container">
-    <div class="lr left-box">
-      <ventBox1>
-        <template #title>
-          <div>评价单元基础信息</div>
-        </template>
-        <template #container>
-          <ListItem
-            v-for="(item, index) in gasUnitBase"
-            :key="index"
-            class="w-100% mb-5px"
-            :value="get(dataSource, item.code)"
-            :label="item.title"
-            labelWidth="200px"
-          />
-        </template>
-      </ventBox1>
-
-      <ventBox1 class="vent-margin-t-10">
-        <template #title>
-          <div>单元累计抽采混量</div>
-        </template>
-        <template #container>
-          <CustomChart :chart-config="gasUnitHlOption" :chart-data="mockGasUnitHlData" height="280px" />
-        </template>
-      </ventBox1>
-    </div>
-    <div class="lr right-box">
-      <div class="item-box">
+    <transition enter-active-class="animate__animated animate__fadeInLeft" leave-active-class="animate__animated animate__fadeOutLeft">
+      <div class="lr left-box" v-if="loading">
         <ventBox1>
           <template #title>
-            <div>实时监测数据</div>
+            <div>评价单元基础信息</div>
           </template>
           <template #container>
             <ListItem
-              v-for="(item, index) in gasUnitMonitor"
+              v-for="(item, index) in gasUnitBase"
               :key="index"
               class="w-100% mb-5px"
               :value="get(dataSource, item.code)"
@@ -44,16 +18,46 @@
             />
           </template>
         </ventBox1>
+
         <ventBox1 class="vent-margin-t-10">
           <template #title>
-            <div>单元累计抽采纯量</div>
+            <div>单元累计抽采混量</div>
           </template>
           <template #container>
-            <CustomChart :chart-config="gasUnitClOption" :chart-data="mockGasUnitClData" height="280px" />
+            <CustomChart :chart-config="gasUnitHlOption" :chart-data="mockGasUnitHlData" height="280px" />
           </template>
         </ventBox1>
       </div>
-    </div>
+    </transition>
+    <transition enter-active-class="animate__animated animate__fadeInRight" leave-active-class="animate__animated  animate__fadeOutRight">
+      <div class="lr right-box" v-if="loading">
+        <div class="item-box">
+          <ventBox1>
+            <template #title>
+              <div>实时监测数据</div>
+            </template>
+            <template #container>
+              <ListItem
+                v-for="(item, index) in gasUnitMonitor"
+                :key="index"
+                class="w-100% mb-5px"
+                :value="get(dataSource, item.code)"
+                :label="item.title"
+                labelWidth="200px"
+              />
+            </template>
+          </ventBox1>
+          <ventBox1 class="vent-margin-t-10">
+            <template #title>
+              <div>单元累计抽采纯量</div>
+            </template>
+            <template #container>
+              <CustomChart :chart-config="gasUnitClOption" :chart-data="mockGasUnitClData" height="280px" />
+            </template>
+          </ventBox1>
+        </div>
+      </div>
+    </transition>
   </div>
 </template>
 
@@ -105,7 +109,6 @@
             timer = null;
           }
           await getMonitor();
-          loading.value = false;
         },
         flag ? 0 : 1000
       );
@@ -116,7 +119,7 @@
 
   onMounted(async () => {
     getMonitor(true);
-    loading.value = false;
+    loading.value = true;
   });
 
   onUnmounted(() => {

src/views/vent/gas/gasAssessment/components/workFace.vue

@@ -1,41 +1,15 @@
 <template>
   <CustomBadges class="w-1710px ml-100px mt-50px" :badges="headerBadges" />
   <div class="monitor-container">
-    <div class="lr left-box">
-      <ventBox1>
-        <template #title>
-          <div>工作面基础信息</div>
-        </template>
-        <template #container>
-          <ListItem
-            v-for="(item, index) in gasMonitor"
-            :key="index"
-            class="w-100% mb-5px"
-            :value="get(dataSource, item.code)"
-            :label="item.title"
-            labelWidth="200px"
-          />
-        </template>
-      </ventBox1>
-
-      <ventBox1 class="vent-margin-t-10">
-        <template #title>
-          <div>工作面基础信息</div>
-        </template>
-        <template #container>
-          <CustomChart :chart-config="gasUnitBarOption" :chart-data="mockData" height="280px" />
-        </template>
-      </ventBox1>
-    </div>
-    <div class="lr right-box">
-      <div class="item-box">
+    <transition enter-active-class="animate__animated  animate__fadeInLeft" leave-active-class="animate__animated  animate__fadeOutLeft">
+      <div class="lr left-box" v-if="loading">
         <ventBox1>
           <template #title>
-            <div>工作面支管抽采信息</div>
+            <div>工作面基础信息</div>
           </template>
           <template #container>
             <ListItem
-              v-for="(item, index) in gasPumpValve"
+              v-for="(item, index) in gasMonitor"
               :key="index"
               class="w-100% mb-5px"
               :value="get(dataSource, item.code)"
@@ -44,16 +18,46 @@
             />
           </template>
         </ventBox1>
+
         <ventBox1 class="vent-margin-t-10">
           <template #title>
             <div>工作面基础信息</div>
           </template>
           <template #container>
-            <CustomChart :chart-config="gasUnitPieOption" :chart-data="mockPieData" height="280px" />
+            <CustomChart :chart-config="gasUnitBarOption" :chart-data="mockData" height="280px" />
           </template>
         </ventBox1>
       </div>
-    </div>
+    </transition>
+    <transition enter-active-class="animate__animated  animate__fadeInRight" leave-active-class="animate__animated  animate__fadeInRight">
+      <div class="lr right-box" v-if="loading">
+        <div class="item-box">
+          <ventBox1>
+            <template #title>
+              <div>工作面支管抽采信息</div>
+            </template>
+            <template #container>
+              <ListItem
+                v-for="(item, index) in gasPumpValve"
+                :key="index"
+                class="w-100% mb-5px"
+                :value="get(dataSource, item.code)"
+                :label="item.title"
+                labelWidth="200px"
+              />
+            </template>
+          </ventBox1>
+          <ventBox1 class="vent-margin-t-10">
+            <template #title>
+              <div>工作面基础信息</div>
+            </template>
+            <template #container>
+              <CustomChart :chart-config="gasUnitPieOption" :chart-data="mockPieData" height="280px" />
+            </template>
+          </ventBox1>
+        </div>
+      </div>
+    </transition>
   </div>
 </template>
 
@@ -79,7 +83,7 @@
             timer = null;
           }
           await getMonitor();
-          loading.value = false;
+          // loading.value = false;
         },
         flag ? 0 : 1000
       );
@@ -88,7 +92,8 @@
 
   onMounted(async () => {
     timer = null;
-    getMonitor(true);
+    await getMonitor(true);
+    loading.value = true;
   });
 </script>
 

src/views/vent/gas/gasAssessment/gasAssessment.data.ts

@@ -7,16 +7,19 @@ import { ModuleDataChart } from '/@/views/vent/deviceManager/configurationTable/
 export const monitorNav = [
   {
     title: '达标评判监测',
+    pathName: 'gasAssessment',
     isShow: true,
   },
+  {
+    title: '瓦斯智能调控',
+    pathName: 'gasControl',
+    isShow: false,
+  },
   {
     title: '历史曲线',
+    pathName: 'unitEcharts',
     isShow: false,
   },
-  // {
-  //   title: '防灭火监测与管控',
-  //   isShow: false,
-  // },
 ];
 
 export const echartsOption = reactive({
@@ -632,6 +635,85 @@ export const mockGasUnitClData = {
   ],
 };
 
+export const gasUnitOption = [
+  {
+    legend: '瓦斯浓度',
+    seriesName: '(m³/t)',
+    ymax: 10000,
+    yname: 'm³/t',
+    linetype: 'line',
+    yaxispos: 'left',
+    color: '#37BCF2',
+    sort: 1,
+    xRotate: 10,
+    dataIndex: 'nd',
+  },
+  {
+    legend: '抽采负压',
+    seriesName: '(MPa)',
+    ymax: 50,
+    yname: 'MPa',
+    linetype: 'line',
+    yaxispos: 'right',
+    color: '#FC4327',
+    sort: 2,
+    xRotate: 10,
+    dataIndex: 'fy',
+  },
+  {
+    legend: '瓦斯流量',
+    seriesName: '(%)',
+    ymax: 50,
+    yname: '%',
+    linetype: 'line',
+    yaxispos: 'right',
+    color: '#91CC75',
+    sort: 3,
+    xRotate: 10,
+    dataIndex: 'flowNum',
+  },
+];
+export const mockGasUnitData = {
+  history: [
+    {
+      time: '08:12:00',
+      flowNum: '103.76',
+      fy: '786.87',
+      nd: '43',
+    },
+    {
+      time: '08:12:01',
+      flowNum: '123.76',
+      fy: '886.87',
+      nd: '43',
+    },
+    {
+      time: '08:12:02',
+      flowNum: '153.76',
+      fy: '896.87',
+      nd: '43',
+    },
+    {
+      time: '08:12:03',
+      flowNum: '173.76',
+      fy: '1010.87',
+      nd: '43',
+    },
+    {
+      time: '08:12:04',
+      flowNum: '163.76',
+      fy: '900.87',
+      nd: '43',
+    },
+    {
+      time: '08:12:05',
+      flowNum: '113.76',
+      fy: '983.87',
+      nd: '43',
+    },
+  ],
+};
+
 export const unitHeaderBadges = ref([
   {
     value: 'T1',

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

@@ -31,24 +31,38 @@
       </FourBorderBg>
     </div>
   </div>
-  <WorkFace class="point-event" v-if="pageType == 'workFace'" />
-  <gasUnit class="point-event" v-if="pageType == 'gasUnit'" />
+  <template v-if="activeKey == 'gasAssessment'">
+    <WorkFace class="point-event" v-if="pageType == 'workFace'" />
+    <gasUnit class="point-event" v-if="pageType == 'gasUnit'" />
+  </template>
+  <template v-if="activeKey == 'gasControl'">
+    <GasControl class="point-event" />
+  </template>
+  <BottomMenu :navList="monitorNav" @change="changeActive" />
 </template>
 
 <script setup lang="ts">
   import FourBorderBg from '/@/components/vent/fourBorderBg.vue';
   import { onBeforeMount, ref, onMounted, onUnmounted, nextTick, watch } from 'vue';
   import CustomHeader from '/@/components/vent/customHeader.vue';
-  import { gasUnitDetail } from './gasAssessment.data';
+  import { gasUnitDetail, monitorNav } from './gasAssessment.data';
   import { mountedThree, destroy, setModelType, setCss3D } from './threejs/gasAssessmen.threejs';
   import { useSystemSelect } from '/@/hooks/vent/useSystemSelect';
   import gasUnit from './components/gasUnit.vue';
+  import GasControl from './components/gasControl.vue';
   import WorkFace from './components/workFace.vue';
+  import BottomMenu from '/@/views/vent/comment/components/bottomMenu.vue';
 
+  const activeKey = ref('gasAssessment');
   const loading = ref(false);
   const dataSource = ref({});
   const pageType = ref('workFace');
   const activeUnitId = ref('');
+
+  function changeActive(activeValue) {
+    activeKey.value = activeValue;
+  }
+
   // 获取模型类型
   const changeModalType = (currentData) => {
     gasUnitNum.value = 4;

src/views/vent/gas/gasHome/components/customHeader.vue

@@ -66,6 +66,8 @@
     height: 140px;
     padding: 35px 0;
     color: @white;
+    position: relative;
+    z-index: initial;
   }
 
   .custom-header__badge {

src/views/vent/gas/gasHome/components/gasMonitor.vue

@@ -1,40 +1,58 @@
 <template>
   <div class="monitor-container" style="margin-top: 20px">
-    <div class="lr left-box" style="margin-top: 0">
-      <ventBox1>
-        <template #title>
-          <div>矿井概况</div>
-        </template>
-        <template #container>
-          <ListItem v-for="(item, index) in sysInfo" :key="index" class="w-100% mb-5px" :value="get(dataSource, item.code)" :label="item.title" />
-        </template>
-      </ventBox1>
-      <ventBox1 class="vent-margin-t-10">
-        <template #title>
-          <div>瓦斯抽采泵站概况</div>
-        </template>
-        <template #container>
-          <ListItem v-for="(item, index) in gasPump" :key="index" class="w-100% mb-5px" :value="get(dataSource, item.code)" :label="item.title" />
-        </template>
-      </ventBox1>
-    </div>
-    <div class="lr right-box" style="margin-top: 0">
-      <div class="item-box sensor-container">
+    <transition enter-active-class="animate__animated animate__fadeInLeft" leave-active-class="animate__animated animate__fadeOutLeft">
+      <div class="lr left-box" style="margin-top: 0" v-if="loading">
         <ventBox1>
           <template #title>
-            <div>井下抽采区域</div>
+            <div>矿井概况</div>
           </template>
           <template #container>
-            <ListItem v-for="(item, index) in caikongqu" :key="index" class="w-100% mb-5px" :value="get(dataSource, item.code)" :label="item.title" />
+            <ListItem
+              v-for="(item, index) in sysInfo"
+              :key="index"
+              class="w-100% mb-5px"
+              label-width="180px"
+              :value="get(dataSource, item.code)"
+              :label="item.title"
+            />
           </template>
         </ventBox1>
+        <ventBox1 class="vent-margin-t-10">
+          <template #title>
+            <div>瓦斯抽采泵站概况</div>
+          </template>
+          <template #container>
+            <ListItem v-for="(item, index) in gasPump" :key="index" class="w-100% mb-5px" :value="get(dataSource, item.code)" :label="item.title" />
+          </template>
+        </ventBox1>
+      </div>
+    </transition>
+    <transition enter-active-class="animate__animated animate__fadeInRight" leave-active-class="animate__animated  animate__fadeOutRight">
+      <div class="lr right-box" style="margin-top: 0" v-if="loading">
+        <div class="item-box sensor-container">
+          <ventBox1>
+            <template #title>
+              <div>井下抽采区域</div>
+            </template>
+            <template #container>
+              <ListItem
+                v-for="(item, index) in caikongqu"
+                :key="index"
+                class="w-100% mb-5px"
+                :value="get(dataSource, item.code)"
+                :label="item.title"
+                label-width="180px"
+              />
+            </template>
+          </ventBox1>
+        </div>
       </div>
-    </div>
+    </transition>
   </div>
 </template>
 
 <script setup lang="ts" name="gas-pump-monitor">
-  import { onMounted, defineProps, computed } from 'vue';
+  import { onMounted, defineProps, computed, ref } from 'vue';
   import ventBox1 from '/@/components/vent/ventBox1.vue';
   import ListItem from '@/views/vent/gas/components/list/listItem.vue';
   import { sysInfo, gasPump, caikongqu } from '../gasHome.data';
@@ -47,6 +65,7 @@
       require: true,
     },
   });
+  const loading = ref(false);
   const dataSource = computed(() => props.dataSource);
   // 抽放泵相关
   // const activedPump = ref<any>({});
@@ -56,7 +75,9 @@
   //   activedPump.value = fakePP;
   // }
 
-  onMounted(async () => {});
+  onMounted(async () => {
+    loading.value = true;
+  });
 </script>
 
 <style lang="less" scoped>

src/views/vent/gas/gasHome/gasHome.data.ts

@@ -5,11 +5,11 @@ export const navList = ref([
     pathName: 'gasHome',
     isHover: false,
   },
-  {
-    title: '抽采泵站管控',
-    pathName: 'gasPump',
-    isHover: false,
-  },
+  // {
+  //   title: '抽采泵站管控',
+  //   pathName: 'gasPump',
+  //   isHover: false,
+  // },
   {
     title: '抽采达标评判',
     pathName: 'gasStandard',

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

@@ -1,21 +1,36 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <template>
-  <VentModal style="position: absolute; width: 100%; height: 100%" />
-  <div class="scene-box">
-    <customHeader> 瓦斯抽采综合管控系统 </customHeader>
-    <CustomBadges class="w-1710px ml-100px mt-50px" :badges="headerBadges" />
-    <GasMonitor v-if="dataSource" :dataSource="dataSource" />
+  <div class="scene-box" style="position: relative">
+    <CustomHeader> 瓦斯抽采综合管控系统 </CustomHeader>
+    <template v-if="activeKey == 'gasHome'">
+      <VentModal />
+      <div class="gas-container">
+        <CustomBadges class="w-1710px ml-100px mt-50px" :badges="headerBadges" />
+        <GasMonitor v-if="dataSource" :dataSource="dataSource" />
+      </div>
+    </template>
+    <template v-if="activeKey == 'gasStandard'">
+      <GasAssessment />
+    </template>
+    <BottomMenu :navList="navList" @change="changeActive" />
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, onBeforeMount, onBeforeUnmount } from 'vue';
+  import { ref, onBeforeMount, onBeforeUnmount, onMounted } from 'vue';
   import CustomHeader from '/@/components/vent/customHeader.vue';
   import CustomBadges from './components/customHeader.vue';
   import GasMonitor from './components/gasMonitor.vue';
   import VentModal from '/@/components/vent/micro/ventModal.vue';
+  import GasAssessment from '../gasAssessment/index.vue';
   import { gasSystem } from './gasHome.api';
   import { unmountMicroApps } from '/@/qiankun';
+  import BottomMenu from '/@/views/vent/comment/components/bottomMenu.vue';
+  import { navList } from './gasHome.data';
+  const activeKey = ref('gasHome');
   const dataSource = ref<any | null>(null);
+  function changeActive(activeValue) {
+    activeKey.value = activeValue;
+  }
 
   const headerBadges = ref([
     {
@@ -47,17 +62,24 @@
   onBeforeMount(async () => {
     dataSource.value = await gasSystem();
   });
+  onMounted(() => {});
   onBeforeUnmount(() => {
     unmountMicroApps(['/micro-vent-3dModal']);
   });
 </script>
 
 <style lang="less" scoped>
-  .main-container {
-    .left-box {
-    }
-    .right-box {
-    }
+  .gas-container {
+    width: 100%;
+    position: absolute;
+    z-index: 999;
+  }
+  .modal-box {
+    width: 100%;
+    height: calc(100%);
+    position: absolute;
+    top: 0;
+    left: 0;
   }
   :deep(.vent-home-header) {
     background-color: var(--vent-base-color) !important;

src/views/vent/monitorManager/deviceMonitor/components/emergency/index.vue

@@ -120,7 +120,6 @@ import { sensorColumns, networkColumns, warningColumns, locationColumns, emergen
 import dayjs from 'dayjs'
 import { formatNum } from '/@/utils/ventutil'
 import customHeader from '/@/components/vent/customHeader.vue';
-import { Empty } from 'ant-design-vue';
 
 const emit = defineEmits(['changePageType'])
 const props = defineProps({