Merge branch 'master' of http://94.191.59.107:3000/wukai/jy2024-ui

src/views/alarm/record/bizAccess.vue

@@ -37,7 +37,11 @@
             </template>
           </el-table-column>
           <el-table-column label="组件名称" align="left" prop="modelName"/>
-          <el-table-column label="应用编码" align="left" prop="code" width="300"/>
+          <el-table-column label="应用编码" align="left" prop="code" width="300">
+            <template #default="scope">
+              <el-button link type="primary" @click="jumpPP(scope.row)">{{ scope.row.code }}</el-button>
+            </template>
+          </el-table-column>
           <el-table-column label="系统压力值TPS/QPS" align="center" prop="access" width="150"/>
           <el-table-column label="访问错误次数" align="center" prop="num" width="120"/>
         </el-table>
@@ -50,9 +54,9 @@
           </el-table-column>
           <el-table-column label="组件名称" align="left" prop="objName"/>
           <el-table-column label="告警数量" align="center" prop="num" width="120">
-          <template #default="scope">
-            <el-button link type="primary" @click="msDetail(scope.row)">{{ scope.row.num }}</el-button>
-          </template>
+            <template #default="scope">
+              <el-button link type="primary" @click="msDetail(scope.row)">{{ scope.row.num }}</el-button>
+            </template>
           </el-table-column>
         </el-table>
         <div ref="asLine" v-show="axx" style="height: 400px;padding-top: 20px;"></div>
@@ -93,7 +97,7 @@
 </template>
 
 <script setup name="Record">
-import {calcMs,getBizAccess} from "@/api/alarm/record";
+import {calcMs, getBizAccess} from "@/api/alarm/record";
 import {useRoute, useRouter} from "vue-router";
 import * as echarts from "echarts";
 import moment from "moment";
@@ -133,9 +137,33 @@ const data = reactive({
   },
 });
 
+function jumpPP(row) {
+  const today = new Date();
+  today.setHours(0, 0, 0, 0);
+  const now = new Date();
+  now.setHours(now.getHours(), now.getMinutes(), 0, 0);
+  let num = (now - today) / (1000 * 60);
+  num = num.toFixed(0);
+  const last = formatDate(now);
+  const suffix = '/main/' + row.code + '@SPRING_BOOT/' + num + '分钟/' + last;
+  router.push({path: '/link/pp-link/', query: {suffix: suffix}})
+}
+
+function formatDate(date) {
+  const day = date.getDate().toString().padStart(2, '0');
+  const month = (date.getMonth() + 1).toString().padStart(2, '0'); // 月份是从0开始的
+  const year = date.getFullYear();
+  const hours = date.getHours().toString().padStart(2, '0');
+  const minutes = date.getMinutes().toString().padStart(2, '0');
+  const seconds = date.getSeconds().toString().padStart(2, '0');
+
+  return `${year}-${month}-${day}-${hours}-${minutes}-${seconds}`;
+}
+
 function handleDetails(row) {
   console.log(row, router)
 }
+
 function msDetail(row) {
   open.value = true;
   title.value = "[" + row.objName + "]详情";
@@ -154,6 +182,7 @@ function msDetail(row) {
     msList.value = response.data.detail;
   });
 }
+
 const {queryParams, form} = toRefs(data);
 
 function initChart(res) {
@@ -577,6 +606,7 @@ function initMs(res) {
   };
   myChart.setOption(option)
 }
+
 function dl(modelId, name) {
   title.value = "[" + name + "] 组件压力排行";
   sl.value = true;

src/views/obj/pp/link.vue

@@ -12,12 +12,22 @@
 </template>
 
 <script setup>
+import {useRoute} from "vue-router"
+
+const firstLoad = ref(true)
 const {proxy} = getCurrentInstance();
+const route = useRoute();
 const src = ref("");
 
 function init() {
   proxy.getConfigKey("pp.web.url").then(response => {
-    src.value = response.msg
+    const query = route.query;
+    if (query.suffix) {
+      src.value = response.msg + query.suffix;
+    } else {
+      src.value = response.msg
+    }
+    console.error(query)
   })
 }
 

src/views/push/pushRecord/mail.vue

@@ -38,12 +38,14 @@
         />
       </el-form-item>
       <el-form-item label="成功状态" prop="sendSuccess">
-        <el-input
-            v-model="queryParams.sendSuccess"
-            placeholder="请输入成功状态"
-            clearable
-            @keyup.enter="handleQuery"
-        />
+        <el-select v-model="queryParams.sendSuccess" placeholder="请选择成功状态" clearable>
+          <el-option
+              v-for="dict in sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="发送时间" style="width: 308px">
         <el-date-picker
@@ -119,7 +121,11 @@
       <el-table-column label="发送对象" align="center" prop="sendObj" />
       <el-table-column label="发送标题" align="center" prop="sendTitle" />
       <el-table-column label="发送内容" align="center" prop="sendContent" />
-      <el-table-column label="成功状态" align="center" prop="sendSuccess" />
+      <el-table-column label="成功状态" align="center" prop="sendSuccess">
+        <template #default="scope">
+          <dict-tag :options="sys_yes_no" :value="scope.row.sendSuccess"/>
+        </template>
+      </el-table-column>
       <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.sendTime, '{y}-{m}-{d} {h}:{mi}:{s}') }}</span>
@@ -203,7 +209,7 @@
 import { listPushRecord, getPushRecord, delPushRecord, addPushRecord, updatePushRecord } from "@/api/push/pushRecord";
 
 const { proxy } = getCurrentInstance();
-const { alarm_level, push_type } = proxy.useDict('alarm_level', 'push_type');
+const { alarm_level, push_type,sys_yes_no} = proxy.useDict('alarm_level', 'push_type','sys_yes_no');
 
 const pushRecordList = ref([]);
 const open = ref(false);

src/views/push/pushRecord/sms.vue

@@ -38,12 +38,14 @@
         />
       </el-form-item>
       <el-form-item label="成功状态" prop="sendSuccess">
-        <el-input
-            v-model="queryParams.sendSuccess"
-            placeholder="请输入成功状态"
-            clearable
-            @keyup.enter="handleQuery"
-        />
+        <el-select v-model="queryParams.sendSuccess" placeholder="请选择成功状态" clearable>
+          <el-option
+              v-for="dict in sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="发送时间" style="width: 308px">
         <el-date-picker
@@ -117,9 +119,13 @@
         </template>
       </el-table-column>
       <el-table-column label="发送对象" align="center" prop="sendObj" />
-      <el-table-column label="发送标题" align="center" prop="sendTitle" />
+<!--      <el-table-column label="发送内容" align="center" prop="sendTitle" />-->
       <el-table-column label="发送内容" align="center" prop="sendContent" />
-      <el-table-column label="成功状态" align="center" prop="sendSuccess" />
+      <el-table-column label="成功状态" align="center" prop="sendSuccess">
+        <template #default="scope">
+          <dict-tag :options="sys_yes_no" :value="scope.row.sendSuccess"/>
+        </template>
+      </el-table-column>
       <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.sendTime, '{y}-{m}-{d} {h}:{mi}:{s}') }}</span>
@@ -203,7 +209,7 @@
 import { listPushRecord, getPushRecord, delPushRecord, addPushRecord, updatePushRecord } from "@/api/push/pushRecord";
 
 const { proxy } = getCurrentInstance();
-const { alarm_level, push_type } = proxy.useDict('alarm_level', 'push_type');
+const { alarm_level, push_type,sys_yes_no} = proxy.useDict('alarm_level', 'push_type','sys_yes_no');
 
 const pushRecordList = ref([]);
 const open = ref(false);