htui-yllkbz 1.3.107 → 1.3.109

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.3.107",
+  "version": "1.3.109",
   "port": "8082",
   "typings": "types/index.d.ts",
   "main": "lib/htui.common.js",

package/src/App.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2023-02-15 16:58:15
+ * @LastEditTime: 2023-03-07 17:53:20
 -->
 <template>
   <div id="app">
@@ -49,6 +49,16 @@
       v-model="state.value"
       data-type-id="SeverityLevel"
     ></ht-select-base-data> -->
+    <ht-select-base-data
+      :onlyParent="true"
+      v-model="state.value"
+      :dataTypeId="'TextList'"
+    ></ht-select-base-data>
+    <ht-select-base-data
+      :parentId="state.value"
+      :dataTypeId="'TextList'"
+    ></ht-select-base-data>
+
     <router-view></router-view>
   </div>
 </template>

package/src/main.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2022-10-24 15:00:02
+ * @LastEditTime: 2023-03-07 17:47:41
  */
 import Vue from "vue";
 import App from "./App.vue";
@@ -61,7 +61,7 @@ _axios.get(`${process.env.BASE_URL}/baseConfig.json`).then((res: any) => {
       next();
     } else {
       next(false);
-      next("/login");
+      //next("/login");
     }
   });
 

package/src/packages/HtBaseData/index.vue

@@ -268,11 +268,19 @@
             :value="`${item.value}`"
             :title="`${item.name}(${item.value})`"
           >
-            <span>
+            <span
+              style="display: flex;
+    align-items: center;"
+            >
               <b
                 class="item-origin"
                 :style="{
-                  'border-color': `${item.color}`,
+                  'background-color': `${item.color}`,
+                  display: `inline-block`,
+                  width: `6px`,
+                  height: `6px`,
+                  overflow: `hidden`,
+                  'border-width': '0',
                 }"
               ></b>
               {{ item.name }}
@@ -866,9 +874,14 @@ export default class CommonDatas extends Vue {
           )
         );
         if (this.parentId) {
-          body[item.id || ''] = body[item.id || ''].filter(
+          const arr = body[item.id || ''].filter(
             (item) => item.id === this.parentId
           );
+          body[item.id || ''] =
+            Array.isArray(arr) && arr.length
+              ? (arr[0].children as BaseDataDto[])
+              : arr;
+          // console.log("body[item.id || '']", body[item.id || '']);
         }
       }
     });

package/src/packages/HtSelectCategory/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2023-02-15 17:09:18
+ * @LastEditTime: 2023-03-07 17:49:04
 -->
 <template>
   <span v-if="readonly">
@@ -140,18 +140,18 @@ export default class HtSelectUser extends Vue {
         return;
       }
 
-      _axios
-        .get(`/asset_manage/api/asset-management/asset-categories/list`, {
-          params: { Recursive: true, CurrentId: this.parentId },
-        })
-        .then((res) => {
-          const data = res.data.items || [];
-          this.state.dataSource = data;
-          window.sessionStorage.setItem('assetCategory', JSON.stringify(data));
-          if (this.readonly) {
-            this.getName(data, val);
-          }
-        });
+      // _axios
+      //   .get(`/asset_manage/api/asset-management/asset-categories/list`, {
+      //     params: { Recursive: true, CurrentId: this.parentId },
+      //   })
+      //   .then((res) => {
+      //     const data = res.data.items || [];
+      //     this.state.dataSource = data;
+      //     window.sessionStorage.setItem('assetCategory', JSON.stringify(data));
+      //     if (this.readonly) {
+      //       this.getName(data, val);
+      //     }
+      //   });
     } else {
       //设备分类
       const sessStr = window.sessionStorage.getItem('deviceCategory');
@@ -160,21 +160,21 @@ export default class HtSelectUser extends Vue {
         this.getName(JSON.parse(sessStr), val);
         return;
       }
-      _axios
-        .post(
-          `/device_models/api/device-model-management/device-category/get-list-all`,
-          {
-            isTree: true,
-          }
-        )
-        .then((res) => {
-          const data = res.data.items || [];
-          this.state.dataSource = data;
-          window.sessionStorage.setItem('deviceCategory', JSON.stringify(data));
-          if (this.readonly) {
-            this.getName(data, val);
-          }
-        });
+      // _axios
+      //   .post(
+      //     `/device_models/api/device-model-management/device-category/get-list-all`,
+      //     {
+      //       isTree: true,
+      //     }
+      //   )
+      //   .then((res) => {
+      //     const data = res.data.items || [];
+      //     this.state.dataSource = data;
+      //     window.sessionStorage.setItem('deviceCategory', JSON.stringify(data));
+      //     if (this.readonly) {
+      //       this.getName(data, val);
+      //     }
+      //   });
     }
   }
   /** 获取名字 */

package/src/views/Index.vue

@@ -1,21 +1,20 @@
 <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>
-          <router-link to="/login"
-                       slot="navEnd">注销</router-link>
+        <xhkj-layout02 :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">
+        <el-aside :width="state.collapsed ? '66px' : '230px'" class="left">
           <!--导航菜单-->
-          <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>
@@ -29,30 +28,33 @@
               <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">
           <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 { Component, Vue, Watch } from 'vue-property-decorator';
+import { baseConfig } from 'vue-kst-auth';
 interface State {
   /** 数据状态 */
   loading: boolean;
@@ -72,15 +74,15 @@ export default class App extends Vue {
   state: State = {
     loading: false,
     isLogin: false,
-    defaultIndex: "/",
+    defaultIndex: '/',
     collapsed: true,
   };
   /** 生命周期 */
   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())) {
@@ -90,7 +92,7 @@ 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() {
@@ -107,36 +109,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,
       });
     }
@@ -145,9 +147,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>
@@ -174,9 +176,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;