htui-yllkbz 1.3.96 → 1.3.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.3.96",
+  "version": "1.3.98",
   "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-08 10:50:00
+ * @LastEditTime: 2023-02-13 15:15:28
 -->
 <template>
   <div id="app">
@@ -17,7 +17,7 @@
     <HtSelectPosition :readonly="true" v-model="state.value"></HtSelectPosition> -->
     <!-- <HtSelectCategory :multiple="true" v-model="state.value"></HtSelectCategory>
     <HtSelectCategory :readonly="true" v-model="state.value"></HtSelectCategory> -->
-    <HtSelectBaseData
+    <!-- <HtSelectBaseData
       :onlyParent="true"
       v-model="state.value"
       dataTypeId="MeasureUnit"
@@ -26,7 +26,29 @@
       :parentId="state.value"
       v-model="state.timeValue"
       dataTypeId="MeasureUnit"
-    ></HtSelectBaseData>
+    ></HtSelectBaseData> -->
+    <!-- <ht-select-category
+      :type="'device'"
+      v-model="state.value"
+    ></ht-select-category>
+    <ht-select-category
+      :type="'device'"
+      :readonly="true"
+      v-model="state.value"
+    ></ht-select-category> -->
+    <ht-select-base-data
+      style="width: 100%"
+      :by-code="true"
+      v-model="state.value"
+      :readonly="true"
+      data-type-id="SeverityLevel"
+    ></ht-select-base-data>
+    <ht-select-base-data
+      style="width: 100%"
+      :by-code="true"
+      v-model="state.value"
+      data-type-id="SeverityLevel"
+    ></ht-select-base-data>
     <router-view></router-view>
   </div>
 </template>

package/src/packages/HtSelectBaseData/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 15:47:47
  * @LastEditors: hutao
- * @LastEditTime: 2023-02-08 09:46:57
+ * @LastEditTime: 2023-02-12 11:03:28
 -->
 
 <template>
@@ -41,6 +41,7 @@
     <div v-else>
       <HtShowBaseData
         :hide-code="hideCode"
+        :dataTypeId="dataTypeId"
         :show-all-level="showAllLevels"
         :base-data-id="!byCode ? value : undefined"
         :base-data-value="byCode ? value : undefined"

package/src/packages/HtSelectCategory/index.vue

@@ -4,11 +4,11 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2023-02-10 14:36:51
+ * @LastEditTime: 2023-02-13 15:16:31
 -->
 <template>
   <span v-if="readonly">
-    {{ state.positionName.toString() }}
+    {{ state.positionName }}
   </span>
   <el-cascader
     v-else
@@ -44,7 +44,7 @@ interface State {
   /** 数据状态 */
   loading: boolean;
   value: any;
-  positionName: string[];
+  positionName: string;
   /** 所有位置 */
   dataSource: any[];
   /** 所有分类 */
@@ -57,6 +57,7 @@ export default class HtSelectUser extends Vue {
   @Prop() value!: string;
   @Prop() org!: string;
   @Prop() size!: string;
+  @Prop() type!: string;
   /** 是否禁用 */
   @Prop() disabled?: boolean;
   @Prop() heightAuto?: boolean;
@@ -80,7 +81,7 @@ export default class HtSelectUser extends Vue {
   state: State = {
     loading: false,
     value: undefined,
-    positionName: [],
+    positionName: '',
     dataSource: [],
     unitCategory: [],
   };
@@ -92,53 +93,112 @@ export default class HtSelectUser extends Vue {
     }
   }
   /** 根据id获取单个 */
-  getSingle(val?: string | string[]) {
-    this.state.positionName = [];
-    if (val) {
-      let arr: string[] = [];
-      if (Array.isArray(val)) {
-        arr = val;
-      } else {
-        arr = val.split(',');
+  // getSingle(val?: string | string[]) {
+  //   this.state.positionName = '';
+  //   if (val) {
+  //     let arr: string[] = [];
+  //     if (Array.isArray(val)) {
+  //       arr = val;
+  //     } else {
+  //       arr = val.split(',');
+  //     }
+  //     const sessionDataStr = window.localStorage.getItem('assetCategory');
+  //     let sessionData: any[] = [];
+  //     if (sessionDataStr) {
+  //       sessionData = JSON.parse(sessionDataStr);
+  //     }
+  //     arr.forEach((item) => {
+  //       if (sessionData.length) {
+  //         const data = sessionData.find((cat) => cat.id === item);
+  //         this.state.positionName.push(
+  //           `${data.displayName}${data.code ? `(${data.code})` : ''}`
+  //         );
+  //       } else {
+  //         _axios
+  //           .get(`/asset_manage/api/asset-management/asset-categories/${item}`)
+  //           .then((res) => {
+  //             const data = res.data;
+  //             this.state.positionName.push(
+  //               `${data.displayName}${data.code ? `(${data.code})` : ''}`
+  //             );
+  //           });
+  //       }
+  //     });
+  //   } else {
+  //     this.state.positionName = [];
+  //   }
+  // }
+
+  /** 获取单位列表 */
+  getAllList(val?: string) {
+    if (this.type !== 'device') {
+      //资产分类
+      const sessStr = window.sessionStorage.getItem('assetCategory');
+
+      if (this.readonly && sessStr) {
+        this.getName(JSON.parse(sessStr), val);
+        return;
       }
-      const sessionDataStr = window.localStorage.getItem('assetCategory');
-      let sessionData: any[] = [];
-      if (sessionDataStr) {
-        sessionData = JSON.parse(sessionDataStr);
+
+      _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');
+
+      if (this.readonly && sessStr) {
+        this.getName(JSON.parse(sessStr), val);
+        return;
       }
-      arr.forEach((item) => {
-        if (sessionData.length) {
-          const data = sessionData.find((cat) => cat.id === item);
-          this.state.positionName.push(
-            `${data.displayName}${data.code ? `(${data.code})` : ''}`
-          );
+      _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);
+          }
+        });
+    }
+  }
+  /** 获取名字 */
+  getName(list: any, id?: string) {
+    let nameStr = '--';
+    function formatData(data: any[]) {
+      console.log('data', data);
+      for (let i = 0; i < data.length; i++) {
+        if (data[i].id === id) {
+          nameStr = data[i].displayName;
+          break;
         } else {
-          _axios
-            .get(`/asset_manage/api/asset-management/asset-categories/${item}`)
-            .then((res) => {
-              const data = res.data;
-              this.state.positionName.push(
-                `${data.displayName}${data.code ? `(${data.code})` : ''}`
-              );
-            });
+          if (data[i].children) {
+            formatData(data[i].children);
+          }
         }
-      });
-    } else {
-      this.state.positionName = [];
+      }
+    }
+    if (list.length) {
+      console.log('list', list);
+      formatData(list);
     }
-  }
 
-  /** 获取单位列表 */
-  getAllList() {
-    _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.localStorage.setItem('assetCategory', JSON.stringify(data));
-      });
+    this.state.positionName = nameStr;
   }
   /** 方法 */
   /**选择回调 */
@@ -165,7 +225,7 @@ export default class HtSelectUser extends Vue {
   setValue(val: any) {
     this.state.value = val;
     if (this.readonly) {
-      this.getSingle(val);
+      this.getAllList(val);
     } else {
       // this.getAllList(this.org);
     }
@@ -174,7 +234,7 @@ export default class HtSelectUser extends Vue {
   formatData(data: any[]) {
     for (let i = 0; i < data.length; i++) {
       const item = data[i];
-      item.name = `${item.displayName}${item.code ? `(${item.code})` : ''}`;
+      item.name = `${item.displayName}`;
       if (item.children.length < 1) {
         item.children = undefined;
       } else {

package/src/packages/HtShowBaseData/index.vue

@@ -37,7 +37,16 @@
     </template>
     <!-- 基础数据,以value查找 -->
     <template v-if="baseDataValue">
-      <span class="item" v-if="baseDataItem[baseDataValue]">
+      <span
+        class="item"
+        v-if="dataTypeId && baseDataItem[`${dataTypeId}_${baseDataValue}`]"
+      >
+        {{ baseDataItem[`${dataTypeId}_${baseDataValue}`].name || empty }}
+        <!-- <span v-if="baseDataInfo && !hideCode">
+          ({{ baseDataItem[baseDataValue].value || empty }})
+        </span> -->
+      </span>
+      <span class="item" v-else-if="baseDataItem[baseDataValue]">
         {{ baseDataItem[baseDataValue].name || empty }}
         <span v-if="baseDataInfo && !hideCode">
           ({{ baseDataItem[baseDataValue].value || empty }})
@@ -141,6 +150,8 @@ export default class CommonDatas extends Vue {
   @Prop() baseDataValue?: string;
   /** 基础数据name */
   @Prop() baseDataName?: string;
+  /** 基础数据分组key */
+  @Prop() dataTypeId?: string;
   /** 基础数据详情,显示名称加编码 */
   @Prop({ default: false }) baseDataInfo?: boolean;
   /** 人员 */
@@ -191,9 +202,22 @@ export default class CommonDatas extends Vue {
   /** 递归处理基础数据 */
   getBaseDataItem(list: any[]) {
     // const list = this.state.resData.baseData.items || []
+    if (this.dataTypeId === 'SeverityLevel') {
+      this.SeverityLevel.forEach((item) => {
+        this.state.baseDataItem[`${this.dataTypeId}_${item.value}`] = item;
+      });
+    }
+    console.log('this.state.baseDataItem', this.state.baseDataItem);
     list.forEach((item) => {
       this.state.baseDataItem[item.id || ''] = item;
-      this.state.baseDataItem[item.value || ''] = item;
+
+      if (this.dataTypeId && this.dataTypeId === item.category) {
+        this.state.baseDataItem[`${item.category}_${item.item.value}`] = item;
+      }
+      if (!this.dataTypeId) {
+        this.state.baseDataItem[item.value || ''] = item;
+      }
+
       this.state.baseDataItem[item.name || ''] = item;
       if (item.children) {
         this.getBaseDataItem(item.children);