From ddf054e34e02574edc14ee5b62694915e36dbaf9 Mon Sep 17 00:00:00 2001
From: wwp <782568523@qq.com>
Date: Mon, 12 Aug 2024 14:59:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=85=8D=E7=BD=AE=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/modules/sysconfig/ability.ts      |  8 +++
 .../src/components/TreeFilter/index.vue       |  2 +-
 .../components/Header/ToolBarRight.vue        |  2 +-
 .../src/views/sysconfig/push/index.vue        | 50 ++++++++++++-------
 .../src/views/userManage/dormitory/index.vue  |  1 +
 5 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/SafeCampus.WEB/src/api/modules/sysconfig/ability.ts b/SafeCampus.WEB/src/api/modules/sysconfig/ability.ts
index 6cd3629..1dc8437 100644
--- a/SafeCampus.WEB/src/api/modules/sysconfig/ability.ts
+++ b/SafeCampus.WEB/src/api/modules/sysconfig/ability.ts
@@ -18,6 +18,14 @@ const http = moduleRequest("/business/warn/");
 const http1 = moduleRequest("/violation/analysis/");
 
 const abilityApi = {
+  /* 推送配置保存 */
+  pushConfig(params: any) {
+    return http.post("setWarnPushSetting", params);
+  },
+  // 获取推送信息
+  getPushInfo(params: any) {
+    return http.get("getWarnPushSetting", params);
+  },
   /** 获取告警分组 */
   warnGroup(params: ReqId) {
     return http.get("getWarnGroup", params);
diff --git a/SafeCampus.WEB/src/components/TreeFilter/index.vue b/SafeCampus.WEB/src/components/TreeFilter/index.vue
index 149726a..21290dd 100644
--- a/SafeCampus.WEB/src/components/TreeFilter/index.vue
+++ b/SafeCampus.WEB/src/components/TreeFilter/index.vue
@@ -86,8 +86,8 @@ const setSelected = () => {
 };
 
 onBeforeMount(async () => {
-  await getRequestData();
   setSelected();
+  await getRequestData();
 });
 
 // 使用 nextTick 防止打包后赋值不生效，开发环境是正常的
diff --git a/SafeCampus.WEB/src/layouts/components/Header/ToolBarRight.vue b/SafeCampus.WEB/src/layouts/components/Header/ToolBarRight.vue
index 7799242..5079dac 100644
--- a/SafeCampus.WEB/src/layouts/components/Header/ToolBarRight.vue
+++ b/SafeCampus.WEB/src/layouts/components/Header/ToolBarRight.vue
@@ -33,7 +33,7 @@ import SearchMenu from "./components/SearchMenu.vue";
 const userStore = useUserStore();
 const username = computed(() => userStore.userInfo?.name);
 function open() {
-  window.open("http://8.141.155.183:91/view/1808743138258845697");
+  window.open("/#/screen");
 }
 function opens() {
   window.open("http://192.168.10.101:1234/");
diff --git a/SafeCampus.WEB/src/views/sysconfig/push/index.vue b/SafeCampus.WEB/src/views/sysconfig/push/index.vue
index 1092593..70de8fb 100644
--- a/SafeCampus.WEB/src/views/sysconfig/push/index.vue
+++ b/SafeCampus.WEB/src/views/sysconfig/push/index.vue
@@ -15,14 +15,14 @@
       :size="formSize"
       status-icon
     >
-      <s-form-item label="推送设置：" prop="resource">
-        <s-radio-group v-model="ruleForm.resource" :options="pushOptions" />
+      <s-form-item label="推送设置：" prop="pushState">
+        <s-radio-group v-model="ruleForm.pushState" :options="pushOptions" />
       </s-form-item>
 
       <div class="ruleTitle">推送规则</div>
       <div class="ruleContent">
         <span>当日预警每达到</span>
-        <el-input-number v-model="ruleForm.num" class="mx-4" :min="1" controls-position="right" @change="handleChange" />
+        <el-input-number v-model="ruleForm.daySum" class="mx-4" :min="1" controls-position="right" @change="handleChange" />
         <span>条时进行推送</span>
         <div class="tips">当日预警数据每达到设置的条数后，会进行消息推送。</div>
       </div>
@@ -35,32 +35,33 @@
 </template>
     
   <script setup lang="tsx" name="sysconfigPush">
-import { reactive, ref } from 'vue'
+import { reactive, ref,onMounted } from 'vue'
 import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { abilityApi, getPushInfo,userManageClassManageApi, monitorLIVEApi,SysOrg } from "@/api";
 interface RuleForm {
 
-  resource: string,
-  num: number
+  pushState: string | boolean,
+  daySum: number
 }
 
 const formSize = ref<ComponentSize>('default')
 const ruleFormRef = ref<FormInstance>()
 const ruleForm = reactive<RuleForm>({
-  resource: '0',
-  num: 1
+  pushState: false,
+  daySum: 1
 })
 const pushOptions = [{
     label: '开启',
-     value: '1',
+     value: true,
 },{
     label: '关闭',
-     value: '0',
+     value: false,
 }]
 
 const rules = reactive<FormRules<RuleForm>>({
 
-  resource: [
+  pushState: [
     {
       required: true,
       message: '请选择推送设置',
@@ -74,11 +75,20 @@ const handleChange = (value: number) => {
 function isPositiveInteger(value:any) {
     return /^[1-9]\d*$/.test(value);
 }
+onMounted(() => {
+  getPushData()
+});
+async function getPushData() {
+  let {data} = await abilityApi.getPushInfo({})
+  ruleForm.daySum = data.daySum;
+  ruleForm.pushState = data.pushState;
+  console.log(data);
+}
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
   await formEl.validate((valid, fields) => {
     if (valid) {
-        if(!isPositiveInteger(ruleForm.num)) {
+        if(!isPositiveInteger(ruleForm.daySum)) {
             
             ElMessage({
                 message: '推送规则条数必须是大于零的整数',
@@ -86,10 +96,15 @@ const submitForm = async (formEl: FormInstance | undefined) => {
             })
             return
         }
-        ElMessage({
+
+        abilityApi.pushConfig(ruleForm).then(() => {
+          ElMessage({
             message: '操作成功',
             type: 'success',
-        })
+          })
+    
+        });
+        
       console.log('submit!')
     } else {
       console.log('error submit!', fields)
@@ -106,20 +121,19 @@ const resetForm = (formEl: FormInstance | undefined) => {
   <style lang="scss" scoped>
 .content-main {
   height: 100%;
-
   .ruleTitle {
+    margin: 30px 0 20px;
     font-size: 14px;
     font-weight: 600;
-    margin: 30px 0 20px 0;
   }
   .ruleContent {
+    margin: 20px 0;
     font-size: 14px;
     color: #666666;
-    margin: 20px 0;
     .tips {
+      margin-top: 10px;
       font-size: 14px;
       color: red;
-      margin-top: 10px;
     }
   }
 }
diff --git a/SafeCampus.WEB/src/views/userManage/dormitory/index.vue b/SafeCampus.WEB/src/views/userManage/dormitory/index.vue
index 8edda77..5240026 100644
--- a/SafeCampus.WEB/src/views/userManage/dormitory/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/dormitory/index.vue
@@ -141,6 +141,7 @@ const proTable = ref<ProTableInstance>();
 const treeFilter = ref<InstanceType<typeof TreeFilter> | null>(null);
 const userStore = useUserStore();
 const { accessToken } = userStore;
+const defaultValue = ref("");
 // 表格配置项
 const columns: ColumnProps<SysDormitory.ChamberInfo>[] = [
   { type: "selection", fixed: "left", width: 50 },