Merge remote-tracking branch 'origin/dev' into dev

src/api/kenowledge/index.ts

@@ -15,7 +15,9 @@ export const fetchReports = (params: QueryParams): AxiosPromise<FetchReportsResp
       publishDate: params.publishDate,  // 发布日期范围（可选）
       subject: params.subject,  // 关键字（可选）
       sortBy: params.sortBy, // 排序字段
-      sortOrder: params.sortOrder  // 排序方式
+      sortOrder: params.sortOrder, // 排序方式
+      query: params.query,
+      publishDateRange: params.publishDateRange,
     }
   });
 };

src/api/kenowledge/types.ts

@@ -10,6 +10,8 @@ export interface QueryParams {
   subject?: string;
   sortBy: string;
   sortOrder: string;
+  query: string;
+  publishDateRange?: string;
 }
 
 // 定义报告项的类型

src/api/riskPrevention/planManage.ts

@@ -21,3 +21,10 @@ export function getPlanDetail(planId) {
     method: 'get'
   });
 }
+
+export function getResponseDetail(responseId) {
+  return request({
+    url: '/api/emergency_plan/plan/' + responseId,
+    method: 'get'
+  });
+}

src/api/system/user/index.ts

@@ -18,7 +18,8 @@ import {
   ResponseForm,
   ResponseVO,
   ResponseQuery,
-  ResponseInfoVO
+  ResponseInfoVO,
+  AddUserParams
 } from './types';
 import { parseStrEmpty } from '@/utils/ruoyi';
 
@@ -76,8 +77,18 @@ export const optionSelect = (userIds: (number | string)[]): AxiosPromise<UserVO[
  */
 export const getUser = (userId?: string | number): AxiosPromise<UserInfoVO> => {
   return request({
-    url: '/system/user/' + parseStrEmpty(userId),
-    method: 'get'
+    url: '/api/emergency_plan/training/create',
+    method: 'post',
+    params: {
+      theme: params.theme, // 培训主题
+      unitName: params.unitName, // 培训单位
+      address: params.address, // 培训地点
+      startTime: params.startTime, // 开始时间
+      endTime: params.endTime, // 结束时间
+      peopleNum: params.peopleNum, // 参与人数
+      Content: params.Content, // 培训内容
+      trainingWay: params.trainingWay // 培训方式
+    }
   });
 };
 /**
@@ -113,9 +124,9 @@ export const getResponse = (drillId?: string | number): AxiosPromise<ResponseInf
 /**
  * 新增培训
  */
-export const addUser = (data: UserForm) => {
+export const addUser = (data: AddUserParams) => {
   return request({
-    url: '/system/user',
+    url: '/api/emergency_plan/training/create',
     method: 'post',
     data: data
   });
@@ -144,10 +155,10 @@ export const addDrill = (data: DrillForm) => {
 /**
  * 修改培训
  */
-export const updateUser = (data: UserForm) => {
+export const updateUser = (data: AddUserParams) => {
   return request({
-    url: '/system/user',
-    method: 'put',
+    url: '/api/emergency_plan/training/create',
+    method: 'post',
     data: data
   });
 };

src/api/system/user/types.ts

@@ -24,7 +24,6 @@ export interface UserVO {
  * 培训记录表单类型
  */
 export interface UserForm {
-  id?: string;
   textId?: string;
   theme: string;
   unitName?: string;
@@ -35,7 +34,16 @@ export interface UserForm {
   peopleNum?: string;
   trainingWay?: string;
 }
-
+export interface AddUserParams {
+  theme: string;
+  unitName: string;
+  address: string;
+  startTime: string;
+  endTime: string;
+  Content: string;
+  peopleNum: string;
+  trainingWay: string;
+}
 export interface UserInfoVO {
   user: UserVO;
 }

src/views/knowledge/knowledge-management/index.vue

@@ -25,7 +25,7 @@
             ></el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-input v-model="queryParams.subject" placeholder="请输入报告的关键词/主题词" clearable
+            <el-input v-model="queryParams.query" placeholder="请输入报告的名称" clearable
                       @keyup.enter="handleQuery"/>
           </el-form-item>
           <el-form-item>
@@ -155,7 +155,9 @@ let proxy = getCurrentInstance()?.proxy;
 const { mm_event_type } = toRefs<any>(proxy?.useDict('mm_event_type'));
 const chunkUploadRef = ref(null);
 
+// 这是是查询条件
 const queryParams = reactive<QueryParams>({
+  query: "",
   pageNum: 1,
   pageSize: 10,
   eventType: '',
@@ -163,6 +165,7 @@ const queryParams = reactive<QueryParams>({
   subject: '',
   sortBy: 'publishDate',
   sortOrder: 'desc',
+  publishDateRange: ''
 });
  // 表单数据
 const form = reactive<AddReportParams>({
@@ -196,9 +199,27 @@ const dialog = reactive({
 const getList = async () => {
   loading.value = true;
   try {
-    const response = await fetchReports(queryParams);
+    // 这里格式化日期范围参数
+    // 将-分割转换为/分割
+
+    const [startDate, endDate] = queryParams.publishDate;
+    const formattedStartDate = startDate ? startDate.replace(/-/g, '/') : '';
+    const formattedEndDate = endDate ? endDate.replace(/-/g, '/') : '';
+    console.log('startDate:', startDate, 'endDate:', endDate);
+    const publishDateRange = formattedStartDate && formattedEndDate ? `${formattedStartDate}-${formattedEndDate}` : '';
+    console.log('publishDateRange:', publishDateRange);
+
+
+    // 构建新的请求参数对象
+    const requestParams = {
+      ...queryParams,
+      publishDateRange, // 添加新的日期范围参数
+      publishDate: undefined, // 移除原来的 publishDate 参数
+    };
+
+    const response = await fetchReports(requestParams);
+
     if (response && response.code === 200) {
-      // 去掉日期字符串中的 'T'
       demoList.value = response.data.map((item: ReportItem) => {
         return {
           ...item,
@@ -221,6 +242,8 @@ const getList = async () => {
 };
 
 
+
+
 const handleQuery = () => {
   queryParams.pageNum = 1;
   getList();

src/views/riskPrevention/planManage/planList.vue

@@ -7,12 +7,9 @@
           <el-button type="primary" icon="ArrowLeft" @click="goBack">返回上一级</el-button>
         </el-form-item>
         <el-row :span="24" :gutter="10">
-          <el-col :span="18" label="预案名称">
+          <el-col :span="20" label="预案名称">
             <h2 key="planName" style="font-weight: bolder">{{ detailData.planName }}</h2>
           </el-col>
-          <el-col :span="1.5">
-            <el-button v-has-permi="['system:plan:add']" type="primary" plain icon="Plus" @click="planAdd()">新增</el-button>
-          </el-col>
           <el-col :span="1.5">
             <el-button v-has-permi="['system:plan:add']" type="success" plain icon="Edit" @click="planUpdate()"> 编辑 </el-button>
           </el-col>
@@ -26,7 +23,9 @@
         <div style="white-space: nowrap">
           <el-text :lg="15" class="mx-1">附件</el-text>
           <el-text :lg="15" class="mx-2" type="primary">
-            <a v-if="detailData.file_list && detailData.file_list[0]" :href="detailData.file_list[0].file_url">{{ detailData.file_list[0].file_name_desc }}</a>
+            <a v-if="detailData.file_list && detailData.file_list[0]" :href="detailData.file_list[0].file_url">{{
+              detailData.file_list[0].file_name_desc
+            }}</a>
           </el-text>
         </div>
         <el-card style="margin-top: 10px" shadow="hover">
@@ -267,7 +266,7 @@
         <!-- 响应记录 -->
         <h3>响应记录</h3>
         <el-card shadow="hover">
-          <el-table v-loading="loading" @selection-change="handleSelectionChangeResponse">
+          <el-table v-loading="loading4" @selection-change="handleSelectionChangeResponse">
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column v-if="columns1[0].visible" key="eventId" label="事件编号" align="center" prop="eventId" />
             <el-table-column
@@ -510,7 +509,7 @@
 
 <script setup name="User" lang="ts">
 import api from '@/api/system/user';
-import { UserForm, UserQuery, UserVO, PlanVO, DrillVO, PlanForm } from "@/api/system/user/types";
+import { UserForm, UserQuery, UserVO, PlanVO, DrillVO, PlanForm } from '@/api/system/user/types';
 import { DeptVO } from '@/api/system/dept/types';
 import { RoleVO } from '@/api/system/role/types';
 import { PostQuery, PostVO } from '@/api/system/post/types';
@@ -521,9 +520,9 @@ import { optionselect } from '@/api/system/post';
 import type { TabsPaneContext } from 'element-plus';
 import { ArrowLeft } from '@element-plus/icons-vue';
 import { useRouter } from 'vue-router';
-import { reactive } from "vue";
-import { getDrillList, getPlanDetail, getTrainingList } from '@/api/riskPrevention/planManage';
-
+import { reactive } from 'vue';
+import { getDrillList, getPlanDetail, getResponseDetail, getTrainingList } from "@/api/riskPrevention/planManage";
+import drill from './drill.vue';
 const router = useRouter();
 
 const goBack = () => {
@@ -573,7 +572,9 @@ const route = useRoute();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
 const userList = ref<UserVO[]>();
+const loading4 = ref(false);
 const loading3 = ref(false);
+const total4 = ref(0);
 const total3 = ref(0);
 const planList = ref<PlanVO[]>();
 const drillList = ref<DrillVO[]>();
@@ -669,7 +670,7 @@ const initFormData: UserForm = {
 };
 
 const initData: PageData<UserForm, UserQuery> = {
-  form: { ...initFormData },
+  form2: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -738,6 +739,11 @@ const queryParams3 = reactive({
   pageSize: 10,
   planNum: ''
 });
+const responseParams = reactive({
+  page: 1,
+  pageSize: 10,
+  planNum: ''
+});
 
 const form = reactive<DrillVO>({
   drillId: '',
@@ -785,10 +791,10 @@ const getList2 = async () => {
   loading2.value = true;
   const res = await getDrillList(drillForm);
   loading2.value = false;
-  res.data.forEach(item => {
-    item.drillPicture = item.drillPicture[0].file_name_desc
-    item.drillVideo = item.drillVideo[0].file_name_desc
-  })
+  res.data.forEach((item) => {
+    item.drillPicture = item.drillPicture[0].file_name_desc;
+    item.drillVideo = item.drillVideo[0].file_name_desc;
+  });
   drillList.value = res.data;
   total2.value = res.total;
 };
@@ -805,12 +811,23 @@ const getList3 = async () => {
   total3.value = res.total;
 };
 /** 查询响应列表 */
-const getListResponse = async () => {
-  loading.value = true;
+/**const getListResponse = async () => {
+  loading4.value = true;
   const res = await api.listResponse(proxy?.addDateRange(queryParams.value, dateRange.value));
-  loading.value = false;
+  loading4.value = false;
   responseList.value = res.rows;
   total.value = res.total;
+};*/
+const getListResponse = async () => {
+  loading4.value = true;
+  const res = await getResponseDetail(responseParams);
+  loading4.value = false;
+  // res.data.forEach(item => {
+  //   item.drillPicture = item.drillPicture[0].file_name_desc
+  //   item.drillVideo = item.drillVideo[0].file_name_desc
+  // })
+  responseList.value = res.data;
+  total4.value = res.total;
 };
 /** 删除按钮操作 */
 const handleDelete = async (row?: UserVO) => {
@@ -902,8 +919,8 @@ const cancel = () => {
 /** 修改按钮操作 */
 const handleUpdate = async (row?: UserForm) => {
   reset();
-  const textId = row?.textId || ids.value[0];
-  const { data } = await api.getUser(textId);
+  //const textId = row?.textId || ids.value[0];
+  //const { data } = await api.getUser(textId);
   dialog.visible = true;
   dialog.title = '修改培训记录';
   await initTreeData();
@@ -941,20 +958,20 @@ const resetForm = () => {
 /** 新增按钮操作 */
 const handleAdd = async () => {
   reset();
-  const { data } = await api.getUser();
+  //const { data } = await api.getUser();
   dialog.visible = true;
   dialog.title = '新增培训记录';
 };
-let detailData =ref({
+let detailData = ref({
   file_list: []
-})
+});
 onMounted(() => {
-  const planId = route.query.planId
-  drillForm.planNum = planId
-  queryParams3.planNum = planId
-  getPlanDetail(planId).then(res => {
-    detailData.value = res.data
-  })
+  const planId = route.query.planId;
+  drillForm.planNum = planId;
+  queryParams3.planNum = planId;
+  getPlanDetail(planId).then((res) => {
+    detailData.value = res.data;
+  });
   getTreeSelect(); // 初始化培训内容数据
   getList(); // 初始化列表数据
   getList2(); // 初始化列表数据
@@ -969,11 +986,11 @@ async function handleDeptChange(value: number | string) {
   postOptions.value = response.data;
 }
 
-/** 新增预案按钮操作 */
+/** 新增预案按钮操作
 const planAdd = () => {
   dialog0.visible = true;
   dialog0.id = '';
-};
+};*/
 /** 修改预案按钮操作 */
 const planUpdate = (row) => {
   dialog1.visible = true;