Merge pull request 'fix:集中告警' (#84) from dev-xjf into master

Reviewed-on: http://120.26.116.243:3000/root/alert-front/pulls/84

src/enums/appEnum.ts

@@ -74,5 +74,6 @@ export enum IconEnum {
   CHANGE = 'ant-design:one-to-one-outlined',
   WARN = 'ant-design:warning-outlined',
   BACK_CALC = 'ant-design:backward-outlined',
-
+  DETAIL = 'ant-design:eye-outlined',
+  TREND = 'ant-design:line-chart-outlined',
 }

src/locales/lang/en/action.json

@@ -15,6 +15,7 @@
   "createInstant": "CreateInstant",
   "pointConfig": "PointConfig",
   "warnConfig": "WarnConfig",
-  "backCalc": "backCalc",
+  "backCalc": "BackCalc",
-  "calcIng": "calcIng"
+  "calcIng": "CalcIng",
+  "trend": "Trend"
 }

src/locales/lang/zh-CN/action.json

@@ -17,5 +17,6 @@
   "pointConfig": "测点配置",
   "warnConfig": "预警配置",
   "backCalc": "回算",
-  "calcIng": "回算中"
+  "calcIng": "回算中",
+  "trend": "趋势"
 }

src/views/warn/alarm/alarm.data.ts

@@ -159,7 +159,15 @@ export const columns: BasicColumn[] = [
   {
     title: '预警时间',
     dataIndex: 'createTime',
-    width: 150
+    width: 200,
+    // 将 JSX 改为 h 函数调用
+    customRender: ({ record }) => {
+      return h('div', [
+        h('div',  record.createTime),
+        h('div', '--'),
+      ]);
+    },
+
   },
   {
     title: '持续时长',

src/views/warn/alarm/index.vue

@@ -21,7 +21,7 @@ const { createMessage } = useMessage()
 const { t } = useI18n()
 const [registerUpdateModal, { openModal: openUpdateModal }] = useModal()
 const [registerTable, { getForm, reload, getDataSource, updateTableDataRecord }] = useTable({
-  title: '预警测点列表',
+  title: '集中告警列表',
   api: getWarnPageReal,
   rowKey: 'warnId',
   immediate: true,
@@ -42,7 +42,7 @@ const [registerTable, { getForm, reload, getDataSource, updateTableDataRecord }]
   showTableSetting: true,
   showIndexColumn: false,
   actionColumn: {
-    width: 120,
+    width: 200,
     title: t('common.action'),
     dataIndex: 'action',
     fixed: 'right',
@@ -73,40 +73,14 @@ onMounted(async () => {
           <TableAction
             :actions="[
 
-              { icon: IconEnum.WARN, label: t('action.warnConfig'), auth: 'run:instant:warnConfig', onClick: handleWarnConfig.bind(null, record) },
+              { icon: IconEnum.EDIT,  label: t('action.edit'), auth: 'run:instant:warnConfig', onClick: handleWarnConfig.bind(null, record) },
+              { icon: IconEnum.TREND, label: t('action.trend'), auth: 'run:instant:warnConfig', onClick: handleWarnConfig.bind(null, record) },
+              { icon: IconEnum.DETAIL, label: t('action.detail'), auth: 'run:instant:warnConfig', onClick: handleWarnConfig.bind(null, record) },
 
             ]"
           />
         </template>
       </template>
-      <template #warnStatus="{ record }">
-        <Switch
-          v-model:checked="record.warnStatus" :checked-value="1" :un-checked-value="0" checked-children="是"
-          un-checked-children="否" @change="updateStatus(record)"
-        />
-      </template>
-      <template #shortMessageOnOff="{ record }">
-        <Switch
-          v-model:checked="record.shortMessageOnOff" :checked-value="1" :un-checked-value="0" checked-children="是"
-          un-checked-children="否" @change="updateStatus(record)"
-        />
-      </template>
-      <template #gzpOnOff="{ record }">
-        <Switch
-          v-model:checked="record.gzpOnOff" :checked-value="1" :un-checked-value="0" checked-children="是"
-          un-checked-children="否" @change="updateStatus(record)"
-        />
-      </template>
-      <template #copyToDiagOnOff="{ record }">
-        <Switch
-          v-model:checked="record.copyToDiagOnOff" :checked-value="1" :un-checked-value="0" checked-children="是"
-          un-checked-children="否" @change="updateStatus(record)"
-        />
-      </template>
-
-      <template #timeDurationThreshold="{ record }">
-        {{ `${record.timeDurationThreshold}秒` }}
-      </template>
     </BasicTable>
 <!--    <UpdateModal @register="registerUpdateModal" @success="reload" />-->
   </div>