htui-yllkbz 1.5.8 → 1.5.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.5.8",
+  "version": "1.5.11",
   "port": "8082",
   "typings": "types/index.d.ts",
   "main": "lib/htui.common.js",
@@ -52,4 +52,4 @@
     "typescript": "~3.9.3",
     "vue-template-compiler": "^2.6.11"
   }
-}
+}

package/src/packages/HtRealTime/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2022-09-28 10:24:08
  * @LastEditors: hutao
- * @LastEditTime: 2023-11-28 15:03:04
+ * @LastEditTime: 2024-01-24 11:19:14
 -->
 <template>
   <span>
@@ -75,9 +75,9 @@ export default class HtRealTime extends Vue {
       clearInterval(this.state.myTimer);
     }
   }
-  getHistory() {
+  getHistory(hour = 1) {
     const data = {
-      begin: moment().subtract(1, "h").format("YYYY-MM-DDTHH:mm:ss"),
+      begin: moment().subtract(hour, "h").format("YYYY-MM-DDTHH:mm:ss"),
       end: moment().format("YYYY-MM-DDTHH:mm:ss"),
       flag: 2,
       dataFlagStep: 2,
@@ -103,6 +103,12 @@ export default class HtRealTime extends Vue {
             history: items,
           });
         }
+        else {
+          if (hour === 1) {
+            this.getHistory(2)
+          }
+
+        }
       });
   }
   destroyed() {

package/src/views/Index.vue

@@ -1,25 +1,25 @@
 <template>
   <div id="index">
-    <el-container style="height: 100vh" class="index">
+    <el-container style="height: 100vh"
+                  class="index">
       <el-header style="padding: 0; height: min-content">
-        <xhkj-layout02 @leftMenu="leftMenu" :hide="true">
-          <router-link to="/login" slot="navEnd">注销</router-link>
+        <xhkj-layout02 @leftMenu="leftMenu"
+                       :hide="true">
+          <router-link to="/login"
+                       slot="navEnd">注销</router-link>
         </xhkj-layout02>
       </el-header>
       <el-container class="body">
-        <el-aside :width="state.collapsed ? '66px' : '230px'" class="left">
-          <HtMenu
-            :data="state.menusList"
-            :collapse="state.collapsed"
-            baseUrl="/asset-management"
-          ></HtMenu>
+        <el-aside :width="state.collapsed ? '66px' : '230px'"
+                  class="left">
+          <HtMenu :data="state.menusList"
+                  :collapse="state.collapsed"
+                  baseUrl="/asset-management"></HtMenu>
           <!--导航菜单-->
-          <el-menu
-            :default-active="state.defaultIndex"
-            router
-            :collapse="state.collapsed"
-            :collapse-transition="false"
-          >
+          <el-menu :default-active="state.defaultIndex"
+                   router
+                   :collapse="state.collapsed"
+                   :collapse-transition="false">
             <el-menu-item index="/">
               <i class="el-icon-s-check"></i>
               <span slot="title">导航1</span>
@@ -33,34 +33,36 @@
               <span slot="title">导航3</span>
             </el-menu-item>
           </el-menu>
-          <el-button
-            class="action-btn"
-            :title="state.collapsed ? '展开菜单' : '收起菜单'"
-            type="text"
-            size="medium"
-            :icon="state.collapsed ? 'el-icon-s-unfold' : 'el-icon-s-fold'"
-            @click="state.collapsed = !state.collapsed"
-            style="font-size: 16px"
-          ></el-button>
+          <el-button class="action-btn"
+                     :title="state.collapsed ? '展开菜单' : '收起菜单'"
+                     type="text"
+                     size="medium"
+                     :icon="state.collapsed ? 'el-icon-s-unfold' : 'el-icon-s-fold'"
+                     @click="state.collapsed = !state.collapsed"
+                     style="font-size: 16px"></el-button>
         </el-aside>
-        <el-main style="padding: 8px 0 0 15px" class="cont">
+        <el-main style="padding: 8px 0 0 15px"
+                 class="cont">
+           <HtRealTime dataType="group"
+                       @change="changeData"
+                      :dataGroup="'kjyyq'"></HtRealTime>
           <router-view v-if="state.loading"></router-view>
         </el-main>
       </el-container>
     </el-container>
-    <div
-      v-if="state.isLogin"
-      is="common-datas"
-      @commonDatas="commonDatas"
-      @error="error"
-    ></div>
+    <div v-if="state.isLogin"
+         is="common-datas"
+         @commonDatas="commonDatas"
+         @error="error"></div>
   </div>
 </template>
 
 <script lang="ts">
-import { Component, Vue, Watch } from 'vue-property-decorator';
-import { baseConfig } from 'vue-kst-auth';
-import HtMenu from '@/packages/HtMenu/index.vue';
+import { Component, Vue, Watch } from "vue-property-decorator";
+import { baseConfig } from "vue-kst-auth";
+import HtMenu from "@/packages/HtMenu/index.vue";
+import HtRealTime from "@/packages/HtRealTime/index.vue";
+
 interface State {
   /** 数据状态 */
   loading: boolean;
@@ -74,7 +76,7 @@ interface State {
 }
 
 @Component({
-  components: { HtMenu },
+  components: { HtMenu, HtRealTime },
 })
 export default class App extends Vue {
   /** 数据 */
@@ -82,7 +84,7 @@ export default class App extends Vue {
     loading: false,
     isLogin: false,
     menusList: [],
-    defaultIndex: '/',
+    defaultIndex: "/",
     collapsed: true,
   };
   leftMenu(e: CustomEvent) {
@@ -91,9 +93,9 @@ export default class App extends Vue {
   /** 生命周期 */
   created() {
     // 动态加载引用文件
-    const files = this.$store.getters.getBaseData('files');
+    const files = this.$store.getters.getBaseData("files");
     const filesKeys: string[] = Object.keys(files);
-    let heatStr = document.getElementsByTagName('head')[0].innerHTML;
+    let heatStr = document.getElementsByTagName("head")[0].innerHTML;
     filesKeys.forEach((cur) => {
       const src = files[cur];
       if (src && /\.css$/.test(src.toString())) {
@@ -103,12 +105,15 @@ export default class App extends Vue {
         heatStr += `<link rel="icon" href="${src}">`;
       }
     });
-    document.getElementsByTagName('head')[0].innerHTML = heatStr;
+    document.getElementsByTagName("head")[0].innerHTML = heatStr;
     this.state.isLogin = baseConfig.getLoginState() || false;
   }
   mounted() {
     this.state.defaultIndex = this.$route.path;
   }
+  changeData(e: string) {
+    console.log("eee", e);
+  }
   /** 方法 */
   /** 接收基础数据 */
   commonDatas(msg: any) {
@@ -120,36 +125,36 @@ export default class App extends Vue {
       res.SessionState.auth &&
       res.SessionState.auth.grantedPolicies
     ) {
-      this.$store.commit('setBaseDataApi', {
-        key: 'grantedPolicies',
+      this.$store.commit("setBaseDataApi", {
+        key: "grantedPolicies",
         value: res.SessionState.auth.grantedPolicies,
       });
     }
     /** 部门人员数据 */
     if (res.organizationUsers) {
-      this.$store.commit('setBaseDataApi', {
-        key: 'organizationUsers',
+      this.$store.commit("setBaseDataApi", {
+        key: "organizationUsers",
         value: res.organizationUsers.items,
       });
     }
     /** 部门数据 */
     if (res.organizationUnit) {
-      this.$store.commit('setBaseDataApi', {
-        key: 'organizationUnit',
+      this.$store.commit("setBaseDataApi", {
+        key: "organizationUnit",
         value: res.organizationUnit,
       });
     }
     /** 人员数据 */
     if (res.users) {
-      this.$store.commit('setBaseDataApi', {
-        key: 'users',
+      this.$store.commit("setBaseDataApi", {
+        key: "users",
         value: res.users.items,
       });
     }
     /** 严重等级 */
     if (res.severityLevel) {
-      this.$store.commit('setBaseDataApi', {
-        key: 'severityLevel',
+      this.$store.commit("setBaseDataApi", {
+        key: "severityLevel",
         value: res.severityLevel,
       });
     }
@@ -158,9 +163,9 @@ export default class App extends Vue {
     this.state.loading = true;
   }
   /** 监听 */
-  @Watch('$route.path', { deep: true })
+  @Watch("$route.path", { deep: true })
   ondata(val: string) {
-    this.state.defaultIndex = val || '/';
+    this.state.defaultIndex = val || "/";
   }
 }
 </script>
@@ -187,9 +192,9 @@ a {
   }
 }
 .index {
-  background: url('/publicData/images/bg.png ') center no-repeat;
+  background: url("/publicData/images/bg.png ") center no-repeat;
   background-size: 100% 100%;
-  font-family: 'SourceHanSansCN-Normal', 'Avenir', Helvetica, Arial, sans-serif;
+  font-family: "SourceHanSansCN-Normal", "Avenir", Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   color: #333333;