Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue

@@ -83,6 +83,15 @@
                   clickSwitch({ type: 3, enableRules: record.enableRules, record: record })
                 " />
             </template>
+            <template v-if="column.dataIndex === 'monitorFrequencys'">
+              {{ record.monitorFrequency.label }}
+            </template>
+            <template v-if="column.dataIndex === 'rep'">
+              {{ record.repetitions.label }}
+            </template>
+            <template v-if="column.dataIndex === 'prioritys'">
+              {{ record.priority.label }}
+            </template>
           </template>
         </ns-view-list-table>
         <a-button

hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue

@@ -1,15 +1,58 @@
 <template>
   <a-modal
     v-model:visible="show"
-    width="1000px"
+    width="1100px"
     style="top: 50%; transform: translateY(-50%)"
     title="添加联系人"
     @ok="handleOk"
     @cancel="handleCancel">
-    <div style="width: 100%; height: 100%">
-      <p>Some contents...</p>
-      <p>Some contents...</p>
-      <p>Some contents...</p>
+    <div style="width: 100%; height: 480px; display: flex">
+      <div style="width: 300px; height: 100%; overflow-y: auto; padding: 0px, 12px">
+        <div style="width: 100%; display: flex; position: relative">
+          <div
+            style="
+              border-width: 0px;
+              position: absolute;
+              left: 0px;
+              top: 5px;
+              width: 5px;
+              height: 15px;
+              background: inherit;
+              background-color: rgba(251, 156, 67, 1);
+              border: none;
+              border-radius: 5px;
+              -moz-box-shadow: none;
+              -webkit-box-shadow: none;
+              box-shadow: none;
+            "></div>
+          <span style="margin-left: 24px; color: #333333">联系人名单</span>
+        </div>
+        <img
+          style="width: 100%; margin-top: -10px"
+          src="https://files.axshare.com/gsc/4T0UQR/7e/5d/a2/7e5da2a277344db8af30521cefeb70cc/images/告警设置/u150.svg?pageId=1f58c1ba-b461-4fe8-a2b3-295f1e7b0aa0" />
+        <a-input-search
+          v-model:value="searchValue"
+          style="margin-bottom: 8px"
+          placeholder="请输入关键字" />
+        <img
+          style="width: 100%; margin-top: -10px"
+          src="https://files.axshare.com/gsc/4T0UQR/7e/5d/a2/7e5da2a277344db8af30521cefeb70cc/images/告警设置/u150.svg?pageId=1f58c1ba-b461-4fe8-a2b3-295f1e7b0aa0" />
+        <a-tree
+          :expanded-keys="expandedKeys"
+          :auto-expand-parent="autoExpandParent"
+          :tree-data="gData"
+          @expand="onExpand">
+          <template #title="{ title }">
+            <span v-if="title.indexOf(searchValue) > -1">
+              {{ title.substr(0, title.indexOf(searchValue)) }}
+              <span style="color: #f50">{{ searchValue }}</span>
+              {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
+            </span>
+            <span v-else>{{ title }}</span>
+          </template>
+        </a-tree>
+      </div>
+      <div style="width: calc(100% - 200px); height: 100%; padding: 12px"> 2</div>
     </div>
   </a-modal>
 </template>
@@ -24,6 +67,7 @@
         // 处理确定按钮的逻辑
         console.log('点击了确定按钮');
       };
+      const searchValue = ref<string>('');
       const getData = () => {
         show.value = true;
       };
@@ -38,6 +82,7 @@
         handleOk,
         show,
         getData,
+        searchValue,
         handleCancel,
       };
     },

hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts

@@ -12,7 +12,7 @@ const tableKeyMap = [
   },
   {
     title: '优先级',
-    dataIndex: 'priority',
+    dataIndex: 'prioritys',
   },
   {
     title: '告警标题',
@@ -24,12 +24,11 @@ const tableKeyMap = [
   },
   {
     title: '重复次数',
-    dataIndex: 'repetitions',
-    textEllipsis: true,
+    dataIndex: 'rep',
   },
   {
     title: '监测时长',
-    dataIndex: 'monitorFrequency',
+    dataIndex: 'monitorFrequencys',
   },
   {
     title: '是否启用',
@@ -99,6 +98,9 @@ export const energyAlarmConfigs = (
           name: 'FeedBackDetail',
           dynamicParams: ['uuid', 'appealType'],
           handle: (data: any) => {
+            data.monitorFrequency = data.monitorFrequency.value;
+            data.priority = data.priority.value;
+            data.repetitions = data.repetitions.value;
             editeEnergyAlarm.value.toggle(data);
           },
         },