htui-yllkbz 1.5.7 → 1.5.11

package/src/packages/HtShowBaseData/index.vue

@@ -8,25 +8,32 @@
     </template>
     <!-- 部门 -->
     <template v-if="departmentId">
-      <span class="item" v-for="item in departmentData" :key="item">
+      <span class="item"
+            v-for="item in departmentData"
+            :key="item">
         {{ getorgById(item).displayName || empty }}
       </span>
     </template>
     <!-- 用户 -->
     <template v-if="userId">
-      <span class="item" v-for="item in userData" :key="item.id">
+      <span class="item"
+            v-for="item in userData"
+            :key="item.id">
         {{ item.value || empty }}
       </span>
     </template>
     <!-- 角色 -->
     <template v-if="roleId">
-      <span class="item" v-for="item in roleData" :key="item.id">
+      <span class="item"
+            v-for="item in roleData"
+            :key="item.id">
         {{ item.name || empty }}
       </span>
     </template>
     <!-- 基础数据,以id查找 -->
     <template v-if="baseDataId !== undefined && baseDataId !== null">
-      <span class="item" v-if="baseDataItem[baseDataId]">
+      <span class="item"
+            v-if="baseDataItem[baseDataId]">
         <!-- {{ baseDataItem[baseDataId].name || empty }}
         <span v-if="baseDataInfo&&!hideCode">
           ({{ baseDataItem[baseDataId].value || empty }})
@@ -37,16 +44,15 @@
     </template>
     <!-- 基础数据,以value查找 -->
     <template v-if="baseDataValue">
-      <span
-        class="item"
-        v-if="dataTypeId && baseDataItem[`${dataTypeId}_${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]">
+      <span class="item"
+            v-else-if="baseDataItem[baseDataValue]">
         {{ baseDataItem[baseDataValue].name || empty }}
         <span v-if="baseDataInfo && !hideCode">
           ({{ baseDataItem[baseDataValue].value || empty }})
@@ -56,7 +62,8 @@
     </template>
     <!-- 基础数据,以namg查找 -->
     <template v-if="baseDataName">
-      <span class="item" v-if="baseDataItem[baseDataName]">
+      <span class="item"
+            v-if="baseDataItem[baseDataName]">
         {{ baseDataItem[baseDataName].name || empty }}
         <span v-if="baseDataInfo && !hideCode">
           ({{ baseDataItem[baseDataName].value || empty }})
@@ -68,8 +75,8 @@
 </template>
 
 <script lang="ts">
-import { Vue, Prop, Component, Watch } from 'vue-property-decorator';
-import { baseConfig } from 'vue-kst-auth';
+import { Vue, Prop, Component, Watch } from "vue-property-decorator";
+import { baseConfig } from "vue-kst-auth";
 interface Inuser {
   concurrencyStamp: string;
   email: string;
@@ -125,11 +132,11 @@ interface State {
 }
 
 @Component({
-  name: 'HtShowBaseData',
+  name: "HtShowBaseData",
 })
 export default class CommonDatas extends Vue {
   /** 查找不到为空时显示 */
-  @Prop({ default: '' }) empty?: string;
+  @Prop({ default: "" }) empty?: string;
   /** 显示用户信息 */
   @Prop() userId?: string;
   /** 是否展示所有关联节点 */
@@ -157,7 +164,7 @@ export default class CommonDatas extends Vue {
   /** 人员 */
   /** 数据 */
   state: State = {
-    text: '',
+    text: "",
     resData: {
       baseData: {
         items: [],
@@ -172,7 +179,7 @@ export default class CommonDatas extends Vue {
       users: {
         items: [],
       },
-      SessionState: '',
+      SessionState: "",
       userInOrganiza: [],
       organizationUsers: {},
       roleList: [],
@@ -184,7 +191,7 @@ export default class CommonDatas extends Vue {
     if (!baseConfig.getLoginState()) {
       return;
     }
-    const data = window.localStorage.getItem('commonDatas');
+    const data = window.localStorage.getItem("commonDatas");
     if (data) {
       this.state.resData = Object.assign(this.state.resData, JSON.parse(data));
     }
@@ -202,23 +209,22 @@ export default class CommonDatas extends Vue {
   /** 递归处理基础数据 */
   getBaseDataItem(list: any[]) {
     // const list = this.state.resData.baseData.items || []
-    if (this.dataTypeId === 'SeverityLevel') {
+    if (this.dataTypeId === "SeverityLevel") {
       this.SeverityLevel.forEach((item) => {
         this.state.baseDataItem[`${this.dataTypeId}_${item.value}`] = item;
       });
     }
 
     list.forEach((item) => {
-      this.state.baseDataItem[item.id || ''] = item;
-
+      this.state.baseDataItem[item.id || ""] = item;
       if (this.dataTypeId && this.dataTypeId === item.category) {
-        this.state.baseDataItem[`${item.category}_${item.item.value}`] = item;
+        this.state.baseDataItem[`${item.category}_${item.value}`] = item;
       }
       if (!this.dataTypeId) {
-        this.state.baseDataItem[item.value || ''] = item;
+        this.state.baseDataItem[item.value || ""] = item;
       }
 
-      this.state.baseDataItem[item.name || ''] = item;
+      this.state.baseDataItem[item.name || ""] = item;
       if (item.children) {
         this.getBaseDataItem(item.children);
       }
@@ -228,38 +234,38 @@ export default class CommonDatas extends Vue {
   setAllLevel(id: any) {
     const { baseDataItem } = this.state;
     const hideCode = this.hideCode;
-    let text = '';
+    let text = "";
 
     if (baseDataItem[id]) {
       if (hideCode) {
-        text = `${baseDataItem[id].name || ''}`;
+        text = `${baseDataItem[id].name || ""}`;
       } else {
-        text = `${baseDataItem[id].name || ''}(${baseDataItem[id].value})`;
+        text = `${baseDataItem[id].name || ""}(${baseDataItem[id].value})`;
       }
       if (baseDataItem[id].parentId && this.showAllLevel) {
-        const tempText = this.setAllLevel(baseDataItem[id]['parentId']);
+        const tempText = this.setAllLevel(baseDataItem[id]["parentId"]);
         text = `${tempText}/${text}`;
       }
     }
 
     return text;
   }
-  @Watch('baseDataItem')
+  @Watch("baseDataItem")
   setText() {
     if (this.baseDataId !== undefined && this.baseDataId !== null) {
       const tempText = this.setAllLevel(this.baseDataId);
       this.state.text = tempText;
     } else {
-      this.state.text = '';
+      this.state.text = "";
     }
   }
-  @Watch('baseDataId')
+  @Watch("baseDataId")
   getText(val: string) {
     if (val !== undefined && val !== null && this.baseDataItem) {
       const tempText = this.setAllLevel(val);
       this.state.text = tempText;
     } else {
-      this.state.text = '';
+      this.state.text = "";
     }
   }
 
@@ -303,7 +309,7 @@ export default class CommonDatas extends Vue {
       const ids: string[] = JSON.parse(this.roleId);
 
       const data = this.state.resData.roleList.filter((val) =>
-        ids.includes(val.id || '')
+        ids.includes(val.id || "")
       );
       return data;
     } else {
@@ -321,10 +327,10 @@ export default class CommonDatas extends Vue {
   }
   /** 时间格式 */
   get timeFormat() {
-    if (this.timeStr && this.timeStr.startsWith('0')) {
+    if (this.timeStr && this.timeStr.startsWith("0")) {
       return this.empty;
     } else {
-      return this.timeStr?.replace(/T/, ' ').slice(0, 19) || this.empty;
+      return this.timeStr?.replace(/T/, " ").slice(0, 19) || this.empty;
     }
   }
 }

package/src/packages/HtTimeLine/index.ts

@@ -0,0 +1,14 @@
+/*
+ * @Descripttion:选择资产单位
+ * @version:
+ * @Author: hutao
+ * @Date: 2021-11-15 15:00:57
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-06-01 17:24:53
+ */
+import HtTimeLine from "./index.vue";
+(HtTimeLine as any).install = function (Vue: any) {
+
+  Vue.component("HtTimeLine", HtTimeLine);
+};
+export default HtTimeLine;

package/src/packages/HtTimeLine/index.vue

@@ -0,0 +1,123 @@
+<!--
+ * @Descripttion:部门选择 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2021-12-30 14:29:14
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-06-02 11:01:40
+-->
+<template>
+  <div class="ht-time-line">
+    <ul class="ht-time-line-ul">
+      <slot></slot>
+    </ul>
+  </div>
+</template>
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import { _axios } from 'vue-kst-auth';
+interface State {
+  /** 数据状态 */
+  loading: boolean;
+}
+@Component({
+  name: 'HtTimeLine',
+})
+export default class HtTimeLine extends Vue {
+  @Prop() value!: string;
+
+  /** 数据 */
+  state: State = {
+    loading: false,
+  };
+  /** 生命周期 */
+  created() {
+    //
+  }
+}
+</script>
+<style lang="scss">
+$color: #cacecb;
+.ht-time-line-ul {
+  list-style: none;
+  .ht-time-line-li {
+    list-style: none;
+    display: flex;
+    .ht-time-line-li-left {
+      padding: 0 20px;
+      margin-top: -4px;
+      width: 120px;
+      text-align: right;
+    }
+    .ht-time-line-li-right {
+      border-left: 2px solid $color;
+      padding: 0 8px;
+      position: relative;
+      flex: 1;
+      .ht-timeline-item-icon {
+        position: absolute;
+        background: #fff;
+        display: flex;
+      }
+      .ht-timeline-item-icon_normal {
+        left: -5px;
+        background-color: $color;
+        border-radius: 50%;
+        justify-content: center;
+        align-items: center;
+        .normal-icon {
+          width: 8px;
+          height: 8px;
+          border-radius: 50%;
+        }
+      }
+      .ht-timeline-item-icon_large {
+        left: -8px;
+        .large-icon {
+          width: 10px;
+          height: 10px;
+          background: #ffffff;
+          border-radius: 50%;
+          opacity: 1;
+          border: 2px solid $color;
+          text-align: center;
+          div {
+            width: 6px;
+            height: 6px;
+            border-radius: 50%;
+            background: $color;
+            margin: 2px;
+          }
+        }
+
+        .ht-icon {
+          font-size: 20px;
+
+          color: $color;
+        }
+      }
+
+      .time-line-right-title {
+        height: 20px;
+        margin-top: -4px;
+        .time-line-time {
+          color: #969c98;
+          float: left;
+          padding-left: 8px;
+        }
+        .time-line-content {
+          float: left;
+          margin-left: 16px;
+        }
+      }
+      .time-line-right-content {
+        background: #f7f9f8;
+        border-radius: 4px 4px 4px 4px;
+        opacity: 1;
+        text-align: left;
+        margin: 8px 0 20px 8px;
+      }
+    }
+  }
+}
+</style>

package/src/packages/HtTimeLineItem/index.ts

@@ -0,0 +1,14 @@
+/*
+ * @Descripttion:选择资产单位
+ * @version:
+ * @Author: hutao
+ * @Date: 2021-11-15 15:00:57
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-06-02 09:26:55
+ */
+import HtTimeLineItem from "./index.vue";
+(HtTimeLineItem as any).install = function (Vue: any) {
+
+  Vue.component("HtTimeLineItem", HtTimeLineItem);
+};
+export default HtTimeLineItem;

package/src/packages/HtTimeLineItem/index.vue

@@ -0,0 +1,112 @@
+<!--
+ * @Descripttion:部门选择 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2021-12-30 14:29:14
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-06-02 10:54:56
+-->
+<template>
+  <div>
+    <li class="ht-time-line-li">
+      <div class="ht-time-line-li-left" :style="{ width: leftWidth }">
+        <slot name="title">
+          <span
+            :style="{
+              'font-size':
+                type === 'large'
+                  ? 'var(--font-size-title)'
+                  : 'var(--font-size-content)',
+              'font-weight': type === 'large' ? 'bold' : undefined,
+            }"
+            >{{ title }}</span
+          ></slot
+        >
+      </div>
+      <div
+        class="ht-time-line-li-right"
+        :style="{
+          'border-color': borderNone ? 'transparent' : color,
+        }"
+      >
+        <div
+          class="ht-timeline-item-icon"
+          :style="iconStyle"
+          :class="`ht-timeline-item-icon_${type || 'normal'} ${iconClass}`"
+        >
+          <slot name="icon">
+            <div
+              v-if="type === 'large'"
+              class="large-icon"
+              :style="{ 'border-color': color }"
+            >
+              <div :style="{ background: color }"></div>
+            </div>
+            <div
+              class="normal-icon"
+              :style="{ background: color }"
+              v-else
+            ></div>
+          </slot>
+        </div>
+        <div class="ht-timeline-item__tail"></div>
+        <div class="time-line-right-title">
+          <div class="time-line-time">
+            <slot name="time">{{ time }}</slot>
+          </div>
+          <div class="time-line-content">
+            <slot name="titleContent">{{ titleContent }}</slot>
+          </div>
+        </div>
+        <div class="time-line-right-content">
+          <slot>{{ content }}</slot>
+        </div>
+        <div>
+          <slot name="other">{{ other }}</slot>
+        </div>
+      </div>
+    </li>
+  </div>
+</template>
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import { _axios } from 'vue-kst-auth';
+interface State {
+  /** 数据状态 */
+  loading: boolean;
+}
+@Component({
+  name: 'HtTimeLineItem',
+})
+export default class HtTimeLineItem extends Vue {
+  /** 文字类型大小  default large*/
+  @Prop({ default: 'normal' }) type?: string;
+  /** 左侧标题的宽度 */
+  @Prop({ default: '100px' }) leftWidth?: string;
+  /** 自定义图标时候的class */
+  @Prop({ default: '' }) iconClass?: string;
+  /** 自定义图标时候的样式 */
+  @Prop() iconStyle?: string;
+  /** 时间显示 */
+  @Prop() time?: string;
+  /** 线条和icon的样色状态 */
+  @Prop({ default: '#cacecb' }) color?: string;
+  /** 左侧标题 */
+  @Prop() title?: string;
+  /** 右侧标题内容 */
+  @Prop() titleContent?: string;
+  /** 背景色里面的内容 */
+  @Prop() content?: string;
+  /** 额外显示的内容 */
+  @Prop() other?: string;
+  @Prop() borderNone?: string;
+  /** 数据 */
+  state: State = {
+    loading: false,
+  };
+  /** 生命周期 */
+  created() {
+    //
+  }
+}
+</script>

package/src/packages/index.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-21 10:08:41
  * @LastEditors: hutao
- * @LastEditTime: 2023-04-24 16:30:18
+ * @LastEditTime: 2023-11-28 15:08:11
  */
 
 // 导入组件
@@ -39,6 +39,9 @@ import HtCol from './HtCol'
 import HtModel from "./HtModel"
 import HtBread from './HtBread'
 import HtPopover from './HtPopover'
+import HtTimeLine from './HtTimeLine'
+import HtTimeLineItem from './HtTimeLineItem'
+import HtRealTime from './HtRealTime'
 
 
 
@@ -46,7 +49,7 @@ import HtPopover from './HtPopover'
 
 
 // 存储组件列表
-const components = [HtRow, HtCol, HtBread, HtPopover, HtModel, HtMenu, HtSelectCategory, HtSelectUnit, HtSelectPosition, HtMore, HtSelectTimeSlot, HtSelectCron, HtBaseData, HtDrawer, HtShowBaseType, HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo]
+const components = [HtRealTime, HtRow, HtTimeLineItem, HtCol, HtTimeLine, HtBread, HtPopover, HtModel, HtMenu, HtSelectCategory, HtSelectUnit, HtSelectPosition, HtMore, HtSelectTimeSlot, HtSelectCron, HtBaseData, HtDrawer, HtShowBaseType, HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo]
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
 const install = function (Vue: any) {
   // 判断是否安装
@@ -62,9 +65,9 @@ export default {
   // 导出的对象必须具有 install，才能被 Vue.use() 方法安装
   install,
   // 以下是具体的组件列表
-  HtRow, HtCol, HtModel, HtBread, HtPopover,
+  HtRow, HtCol, HtRealTime, HtModel, HtBread, HtPopover,
   HtSelectTable, HtSelectPosition, HtPagination, HtShowBaseType, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtMore,
   HtSelectUnit, HtSelectCategory, HtMenu,
-  HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo, HtBaseData, HtDrawer, HtSelectCron, HtSelectTimeSlot
+  HtSelectBaseData, HtSelectOrg, HtTimeLine, HtTimeLineItem, HtSelectUser, HtShowBaseData, HtOrgInfo, HtBaseData, HtDrawer, HtSelectCron, HtSelectTimeSlot
 }
 

package/src/plugins/oidc-client.ts

@@ -1,37 +1,45 @@
-/* eslint-disable @typescript-eslint/camelcase */
 /*
- * @Descripttion: 
- * @version: 
+ * @Descripttion:
+ * @version:
  * @Author: hutao
  * @Date: 2022-05-06 17:56:08
  * @LastEditors: hutao
- * @LastEditTime: 2023-04-09 16:02:30
+ * @LastEditTime: 2023-06-07 17:10:52
  */
-import Oidc from "oidc-client";
-function getCurrentUrl() {
-  let href = window.location.pathname;
-  if (href.charAt(href.length - 1) === '/') {
-    href = href.substring(0, href.length - 1)
-  }
-  //console.log('href', href, window.location);
-  ///console.log('window.location.host + href', window.location.origin + href);
-  return window.location.origin + href
-}
-export const mgr = new Oidc.UserManager({
-  // authority: "oauth2/api",//认证服务器
-  authority: "http://192.168.3.237:44318",//认证服务器
-  client_id: "AuthServer_App", //表示客户端的ID，必选项
-  //redirect_uri: "http://192.168.3.113:8082/product_architecture", //表示重定向URI，认证服务器回调的客户端页面。可选项
-  redirect_uri: getCurrentUrl(), //表示重定向URI，认证服务器回调的客户端页面。可选项
-  // redirect_uri: "http://192.168.3.252:4200", //表示重定向URI，认证服务器回调的客户端页面。可选项
-  response_type: "code", // response_type：表示授权类型，必选项
-  userStore: new Oidc.WebStorageStateStore({ store: window.localStorage }),
-  scope: "offline_access AuthServer", //scope：表示申请的权限范围，可选项
-  post_logout_redirect_uri: getCurrentUrl(),
-  automaticSilentRenew: false,
+// /* eslint-disable @typescript-eslint/camelcase */
+// /*
+//  * @Descripttion:
+//  * @version:
+//  * @Author: hutao
+//  * @Date: 2022-05-06 17:56:08
+//  * @LastEditors: hutao
+//  * @LastEditTime: 2023-04-09 16:02:30
+//  */
+// import Oidc from "oidc-client";
+// function getCurrentUrl() {
+//   let href = window.location.pathname;
+//   if (href.charAt(href.length - 1) === '/') {
+//     href = href.substring(0, href.length - 1)
+//   }
+//   //console.log('href', href, window.location);
+//   ///console.log('window.location.host + href', window.location.origin + href);
+//   return window.location.origin + href
+// }
+// export const mgr = new Oidc.UserManager({
+//   // authority: "oauth2/api",//认证服务器
+//   authority: "http://192.168.3.237:44318",//认证服务器
+//   client_id: "AuthServer_App", //表示客户端的ID，必选项
+//   //redirect_uri: "http://192.168.3.113:8082/product_architecture", //表示重定向URI，认证服务器回调的客户端页面。可选项
+//   redirect_uri: getCurrentUrl(), //表示重定向URI，认证服务器回调的客户端页面。可选项
+//   // redirect_uri: "http://192.168.3.252:4200", //表示重定向URI，认证服务器回调的客户端页面。可选项
+//   response_type: "code", // response_type：表示授权类型，必选项
+//   userStore: new Oidc.WebStorageStateStore({ store: window.localStorage }),
+//   scope: "offline_access AuthServer", //scope：表示申请的权限范围，可选项
+//   post_logout_redirect_uri: getCurrentUrl(),
+//   automaticSilentRenew: false,
 
-  extraQueryParams: {
-    _tenant: 'default'
-  }
+//   extraQueryParams: {
+//     _tenant: 'default'
+//   }
 
-});
+// });