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

src/api/dataFilling/fillingManage.ts

@@ -28,10 +28,18 @@ export const fillingList = (reportId) => {
 };
 
 // 填报修改
-export function fillingChange(data) {
+export const fillingChange = (reportId, payload) => {
   return request({
-    url: '/api/dataFilling/report/',
-    method: 'post',
-    data: data
+    url: `/api/dataFilling/report/${reportId}`,
+    method: 'put',
+    data: payload
   });
-}
+};
+
+// 下发发布
+export const fillingRelease = (reportId) => {
+  return request({
+    url: `/api/dataFilling/report/${reportId}/update_status`,
+    method: 'put'
+  });
+};

src/api/emergencyCommandMap/JointDuty.ts

@@ -103,11 +103,11 @@ export function getUser(params) {
   });
 }
 
-// 任务删除
-export function deleteTask(data) {
+//  获取用户列表
+export function getUserList(params) {
   return request({
-    url: '/api/taskRegistration/delete',
-    method: 'post',
-    data: data
+    url: '/system/user/list',
+    method: 'get',
+    params: params
   });
 }

src/types/components.d.ts

@@ -22,14 +22,10 @@ declare module 'vue' {
     DistributionMap: typeof import('./../components/Map/YztMap/DistributionMap.vue')['default']
     DrawMap: typeof import('./../components/Map/YztMap/DrawMap.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
-    ElAnchor: typeof import('element-plus/es')['ElAnchor']
-    ElAnchorLink: typeof import('element-plus/es')['ElAnchorLink']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@@ -48,7 +44,6 @@ declare module 'vue' {
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
@@ -66,8 +61,6 @@ declare module 'vue' {
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
@@ -86,8 +79,6 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']

src/views/dataFilling/fillingManage.vue

@@ -97,7 +97,7 @@ import { onMounted, reactive, ref, toRefs } from 'vue';
 import FillingAdd from './fillingAdd.vue';
 import TableDetails from './tableDetails.vue';
 import { ElButton, ElCol } from 'element-plus';
-import { fillingSelect } from '@/api/dataFilling/fillingManage';
+import { fillingSelect, fillingRelease } from '@/api/dataFilling/fillingManage';
 import * as XLSX from 'xlsx';
 
 const loading = ref(true);
@@ -214,17 +214,20 @@ const handlePagination = ({ page, limit }) => {
 };
 
 const handleIssue = (row) => {
-  const index = tableData.value.findIndex((item) => item.id === row.id);
-  if (index !== -1) {
-    // 更新前端表格状态
-    tableData.value[index].issued_status = 2;
-    someApiToUpdateStatus(row.id)
-      .then(() => {
-        console.log('状态更新成功');
-      })
-      .catch((error) => {
-        console.error('状态更新失败', error);
-      });
+  // 检查是否有report_id
+  if (!row.report_id) {
+    console.error('报告ID不存在，无法下发');
+    return;
   }
+  // 构造下发请求的URL
+  const releaseUrl = `${row.report_id}`;
+  // 发起下发请求
+  fillingRelease(releaseUrl)
+    .then(() => {
+      fetchFillList();
+    })
+    .catch((error) => {
+      console.error('下发操作失败:', error);
+    });
 };
 </script>

src/views/emergencyCommandMap/RightSection/RenWuDengJi.vue

@@ -29,12 +29,25 @@
               popper-class="custom-select-popper"
               :teleported="false"
               clearable
-              filterable>
-              <el-option v-for="unit in filteredUnits" :key="unit.id" :label="unit.unit_name" :value="unit.unit_name" />
+              filterable
+              @change="handleUnitChange"
+            >
+              <el-option v-for="unit in filteredUnits" :key="unit.unitId" :label="unit.unit_name" :value="unit.unit_name" />
             </el-select>
           </el-form-item>
           <el-form-item label="执行人：" label-width="80px" prop="executor">
-            <el-input v-model="form.executor" class="custom-input2" type="text" placeholder="请输入执行人"  />
+            <el-select
+              v-model="form.executor"
+              placeholder="请选择执行人"
+              class="custom-select"
+              size="large"
+              popper-class="custom-select-popper"
+              :teleported="false"
+              clearable
+              filterable
+            >
+              <el-option v-for="user in executorList" :key="user.userId" :label="user.nickName" :value="user.nickName" />
+            </el-select>
           </el-form-item>
           <el-form-item label="登记人：" label-width="80px" prop="registrar">
             <el-input v-model="form.registrar" class="custom-input2" type="text" readonly />
@@ -67,14 +80,14 @@
 
 <script lang="ts" setup>
 import { ref, reactive, onMounted } from 'vue';
-import { addTask, getUnits, getUser } from '@/api/emergencyCommandMap/JointDuty';
+import { addTask, getUnits, getUser, getUserList } from '@/api/emergencyCommandMap/JointDuty';
 const proxy = getCurrentInstance()?.proxy;
 
 const opt_task_type = [
-  { text: "事件处置", value: "0" },
-  { text: "防范措施", value: "1" },
-  { text: "险情处理", value: "2" },
-  { text: "督办任务", value: "3" }
+  { text: '事件处置', value: '0' },
+  { text: '防范措施', value: '1' },
+  { text: '险情处理', value: '2' },
+  { text: '督办任务', value: '3' }
 ];
 // 表单初始数据
 const initFormData = {
@@ -99,11 +112,12 @@ const data = reactive({
     registrar: [{ required: true, message: '登记人不能为空', trigger: 'blur' }],
     executor: [{ required: true, message: '执行人不能为空', trigger: 'blur' }],
     contact_phone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
-    expire_time: [{ required: true, message: '完成时限不能为空', trigger: 'blur' }],
+    expire_time: [{ required: true, message: '完成时限不能为空', trigger: 'blur' }]
   }
 });
 const taskFormRef = ref();
 const filteredUnits = ref([]);
+const executorList = ref([]);
 const { form, rules } = toRefs(data);
 const props = defineProps<{
   eventId?: string;
@@ -115,7 +129,6 @@ const fetchUser = async () => {
     const response = await getUser({});
     if (response.code === 200) {
       form.value.registrar = response.data.user.nickName;
-      form.value.executor = response.data.user.nickName;
       form.value.contact_phone = response.data.user.phonenumber;
     } else {
       console.error('获取用户信息失败:', response.msg);
@@ -127,9 +140,18 @@ const fetchUser = async () => {
 
 const fetchUnits = async () => {
   try {
-    const response = await getUnits({});
+    const response = await getUserList({});
     if (response.code === 200) {
-      filteredUnits.value = response.data;
+      const units = new Map();
+      response.rows.forEach((unit) => {
+        if (!units.has(unit.deptName)) {
+          units.set(unit.deptName, {
+            unitId: unit.deptId,
+            unit_name: unit.deptName
+          });
+        }
+      });
+      filteredUnits.value = Array.from(units.values());
     } else {
       console.error('获取单位数据失败:', response.msg);
     }
@@ -138,6 +160,29 @@ const fetchUnits = async () => {
   }
 };
 
+const fetchUsers = async (deptId) => {
+  try {
+    const response = await getUserList({ deptId });
+    if (response.code === 200 && response.rows && Array.isArray(response.rows)) {
+      executorList.value = response.rows.map((user) => ({
+        userId: user.userId,
+        nickName: user.nickName
+      }));
+    } else {
+      console.error('获取用户列表失败:', response);
+    }
+  } catch (error) {
+    console.error('请求用户列表失败:', error);
+  }
+};
+
+const handleUnitChange = async (newUnitName) => {
+  const selectedUnit = filteredUnits.value.find((unit) => unit.unit_name === newUnitName);
+  if (selectedUnit) {
+    await fetchUsers(selectedUnit.unitId);
+  }
+};
+
 const emit = defineEmits(['update:show']);
 
 const closeDialog = () => {
@@ -148,13 +193,13 @@ const confirmRegister = () => {
   taskFormRef.value?.validate((valid) => {
     if (valid) {
       form.value.event_code = props.eventId;
-        addTask(form.value).then((response)=>{
-          if (response.code === 200) {
-            proxy?.$modal.msgSuccess('任务登记成功');
-            closeDialog();
-          } else {
-            console.error('任务登记失败:', response.msg);
-          }
+      addTask(form.value).then((response) => {
+        if (response.code === 200) {
+          proxy?.$modal.msgSuccess('任务登记成功');
+          closeDialog();
+        } else {
+          console.error('任务登记失败:', response.msg);
+        }
       });
     }
   });
@@ -163,6 +208,7 @@ const confirmRegister = () => {
 onMounted(() => {
   fetchUser();
   fetchUnits();
+  fetchUsers();
 });
 </script>
 

src/views/knowledge/HiddenStandards/index.vue

@@ -0,0 +1,269 @@
+<template>
+  <div class="app-container">
+    <div v-show="!dialog.visible">
+      <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+        <div v-show="showSearch">
+          <el-form ref="queryFormRef" :model="queryParams">
+            <el-row :gutter="20">
+              <!-- 第一行 -->
+              <el-col :span="6">
+                <el-form-item label="标准类型：" prop="dictName">
+                  <el-select v-model="queryParams.dictName" placeholder="全部" clearable @change="handleQuery">
+                    <el-option v-for="item in dictOptions" :key="item.value" :label="item.label" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="字典类型：" prop="dictType">
+                  <el-input v-model="queryParams.dictType" placeholder="请输入文件名称" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <!--              <el-col :span="6">-->
+              <!--                <el-form-item label="创建时间：">-->
+              <!--                  <el-date-picker-->
+              <!--                    v-model="dateRange"-->
+              <!--                    value-format="YYYY-MM-DD HH:mm:ss"-->
+              <!--                    type="daterange"-->
+              <!--                    range-separator="-"-->
+              <!--                    start-placeholder="开始日期"-->
+              <!--                    end-placeholder="结束日期"-->
+              <!--                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"-->
+              <!--                  ></el-date-picker>-->
+              <!--                </el-form-item>-->
+              <!--              </el-col>-->
+              <el-col :span="6">
+                <el-form-item>
+                  <el-button type="primary" @click="handleQuery">搜索</el-button>
+                  <el-button @click="resetQuery">重置</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </transition>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button v-hasPermi="['system:dict:add']" type="primary" icon="Plus" @click="handleAdd">新建</el-button>
+        </el-col>
+        <!--        <el-col :span="1.5">-->
+        <!--          <el-button v-hasPermi="['system:dict:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button>-->
+        <!--        </el-col>-->
+        <el-col :span="1.5">
+          <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+            删除
+          </el-button>
+        </el-col>
+        <!--        <el-col :span="1.5">-->
+        <!--          <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>-->
+        <!--        </el-col>-->
+        <!--        <el-col :span="1.5">-->
+        <!--          <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>-->
+        <!--        </el-col>-->
+        <!--      <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>-->
+      </el-row>
+
+      <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="文件编号" align="center" prop="dictId" />
+        <el-table-column label="文件名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table-column label="标准类型" align="center" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
+              <span>{{ scope.row.dictType }}</span>
+            </router-link>
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />-->
+        <el-table-column label="录入时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-text v-hasPermi="['system:menu:edit']" class="common-btn-text-primary" @click="handleUpdate(scope.row)">查看</el-text>
+            <el-text v-hasPermi="['system:menu:remove']" class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
+      <!-- 添加或修改参数配置对话框 -->
+    </div>
+    <div v-show="dialog.visible" class="common-dialog">
+      <div class="common-dialog-content">
+        <div class="common-dialog-title-box">
+          <i class="common-dialog-title-icon" />
+          <div>{{ dialog.title }}</div>
+        </div>
+        <div class="common-dialog-box">
+          <el-form ref="dictFormRef" :model="form" :rules="rules" label-width="80px">
+            <el-form-item label="报告名称：" prop="dictName">
+              <el-input v-model="form.dictName" placeholder="请输入标准文件名称" clearable style="width: 468px !important" />
+            </el-form-item>
+            <el-form-item label="标准类型：" prop="dictType">
+              <el-select v-model="form.dictType" placeholder="请选择标准类型" clearable style="width: 468px !important">
+                <el-option v-for="item in dictOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+<!--            <el-form-item label="备注：" prop="remark">-->
+<!--              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" clearable style="width: 468px !important"></el-input>-->
+<!--            </el-form-item>-->
+            <el-form-item label="报告附件：" prop="report">
+              <FileUpload v-model="form.fileNames" />
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="common-dialog-footer" style="display: flex; justify-content: center">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup name="Dict" lang="ts">
+import useDictStore from '@/store/modules/dict';
+import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type';
+import { DictTypeForm, DictTypeQuery, DictTypeVO } from '@/api/system/dict/type/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const typeList = ref<DictTypeVO[]>([]);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<number | string>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+
+const dictFormRef = ref<ElFormInstance>();
+const queryFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DictTypeForm = {
+  dictId: undefined,
+  dictName: '',
+  dictType: '',
+  remark: ''
+};
+const data = reactive<PageData<DictTypeForm, DictTypeQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    dictName: '',
+    dictType: ''
+  },
+  rules: {
+    dictName: [{ required: true, message: '字典名称不能为空', trigger: 'blur' }],
+    dictType: [{ required: true, message: '字典类型不能为空', trigger: 'blur' }],
+    report: [{ required: true, message: '请上传报告附件', trigger: 'blur' }]
+  }
+});
+
+// 定义 dictOptions 数组
+const dictOptions = ref([
+  { value: 'option1', label: '国家版' },
+  { value: 'option2', label: '广东省版' }
+]);
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询字典类型列表 */
+const getList = () => {
+  loading.value = true;
+  listType(proxy?.addDateRange(queryParams.value, dateRange.value)).then((res) => {
+    typeList.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
+  });
+};
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  dictFormRef.value?.resetFields();
+};
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+/** 重置按钮操作 */
+const resetQuery = () => {
+  dateRange.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '新建隐患标准';
+};
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DictTypeVO[]) => {
+  ids.value = selection.map((item) => item.dictId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DictTypeVO) => {
+  reset();
+  const dictId = row?.dictId || ids.value[0];
+  const res = await getType(dictId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改字典类型';
+};
+/** 提交按钮 */
+const submitForm = () => {
+  dictFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      form.value.dictId ? await updateType(form.value) : await addType(form.value);
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      getList();
+    }
+  });
+};
+/** 删除按钮操作 */
+const handleDelete = async (row?: DictTypeVO) => {
+  const dictIds = row?.dictId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？');
+  await delType(dictIds);
+  getList();
+  proxy?.$modal.msgSuccess('删除成功');
+};
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/dict/type/export',
+    {
+      ...queryParams.value
+    },
+    `dict_${new Date().getTime()}.xlsx`
+  );
+};
+/** 刷新缓存按钮操作 */
+const handleRefreshCache = async () => {
+  await refreshCache();
+  proxy?.$modal.msgSuccess('刷新成功');
+  useDictStore().cleanDict();
+};
+
+onMounted(() => {
+  getList();
+});
+</script>