Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

src/api/xxcj.js

@@ -246,3 +246,12 @@ export const xxcjXxcjSh = (data) => {
     data
   })
 }
+
+// 上报区厅
+export const xxcjReportGat = (data) => {
+  return request({
+    url: api + `/xxcj/reportGat`,
+    method: "post",
+    data
+  })
+}

src/views/backOfficeSystem/HumanIntelligence/infoCollection/infomation.vue

@@ -68,6 +68,7 @@
         <!-- "市情指挥人员": ["采纳", "回退", "分组", "转线索", "转合成", "转会商", "打标签", "修改", "详情", "关注部门", "送审"], -->
         <!-- "县情指人员": ["上报", "回退", "修改", "详情", "送审"], -->
         <template #controls="{ row }">
+          <el-link @click="handleSbqt(row)" size="small" type="primary">上报区厅</el-link>
           <el-link
             v-if="isShowBtn('送审', row) && qxkz.deptLevel == '01'"
             :disabled="!(row.lczt == '04')||row.sldshzt != '00'"
@@ -177,7 +178,7 @@ import Searchs from "@/components/aboutTable/Search.vue";
 import AddForm from "./components/addForm.vue";
 import { useRouter, useRoute } from 'vue-router'
 import { qbcjSelectQbsbPage, qbcjDeletes, qbcjCzzt, qbcjPlsb } from "@/api/Intelligence.js";
-import { xxcjSelectXxsbPage, xxcjDeletes, xxcjXxzsx, xxcjUpdateCzlc, xxcjXxqd, xxcjXxcjTjsh ,xxcjCare} from '@/api/xxcj.js'
+import { xxcjSelectXxsbPage, xxcjDeletes, xxcjXxzsx, xxcjUpdateCzlc, xxcjXxqd, xxcjXxcjTjsh ,xxcjCare, xxcjReportGat} from '@/api/xxcj.js'
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 import MakeTag from '../components/maketag.vue'
 import ExportFile from './components/exportFile.vue'
@@ -574,6 +575,16 @@ const postXxcjXxcjTjsh = (row) => {
   }).catch(() => { })
 }
 
+// 上报区厅
+const handleSbqt = (row) => {
+  proxy.$confirm("确定要上报区厅吗", "提示", { type: "warning" }).then(() => {
+    xxcjReportGat({ ids: [row.id] }).then(res => {
+      proxy.$message({ type: "success", message: "上报区厅成功" });
+      getList();
+    })
+  }).catch(() => { })
+}
+
 onMounted(() => {
   const { deptBizType, deptLevel } = getItem('deptId')[0]
   const Jb = deptLevel[0] == '2' ? '01' : deptLevel[0] == '3' ? '02' : '03'

src/views/backOfficeSystem/fourColorManage/warningControl/iabelWarning/index.vue

@@ -44,9 +44,19 @@
           </div>
         </template>
         <template #but>
+          
           <el-button type="primary" @click="exportExl" size="small"
             >导出</el-button
           >
+
+          <el-button
+            type="primary"
+            :loading="btnLoading"
+            size="small"
+            @click="exportExcelAll"
+            >筛选导出</el-button
+          >
+
           <el-button type="primary" size="small" @click="handleQs"
             >签收</el-button
           >
@@ -243,7 +253,7 @@ const searchConfiger = ref([
     placeholder: "请选择级别"
   },
   {
-    key: "startTime",
+    key: "dateTime",
     label: "预警时间",
     type: "datetimerange",
     placeholder: "请选择预警时间"
@@ -344,9 +354,9 @@ onMounted(() => {
 
 const onSearch = (val) => {
   queryFrom.value = { ...queryFrom.value, ...val };
-  if (val.startTime && Array.isArray(val.startTime)) {
+  if (val.dateTime && Array.isArray(val.dateTime)) {
-    queryFrom.value.startTime = val.startTime[0];
+    queryFrom.value.startTime = val.dateTime[0];
-    queryFrom.value.endTime = val.startTime[1];
+    queryFrom.value.endTime = val.dateTime[1];
   }
   pageData.pageConfiger.pageCurrent = 1;
   getList();
@@ -369,6 +379,7 @@ const getList = () => {
     pageCurrent: pageData.pageConfiger.pageCurrent,
     pageSize: pageData.pageConfiger.pageSize
   };
+  delete params.dateTime;
   qcckPost(params, "/mosty-gsxt/tbYjxx/getPageBqyjList")
     .then((res) => {
       pageData.tableData = Array.isArray(res?.records) ? res.records : [];
@@ -537,7 +548,22 @@ const selectRows = ref([]);
 const handleChooseData = (val) => {
   selectRows.value = val;
 };
-const exportExl = () => {
+
+const btnLoading = ref(false);
+const exportExcelAll = () => {
+  btnLoading.value = true;
+  let params = { ...queryFrom.value };
+  params.startTime = queryFrom.value.dateTime ? queryFrom.value.dateTime[0]: "";
+  params.endTime = queryFrom.value.dateTime ? queryFrom.value.dateTime[1] : "";
+  delete params.dateTime;
+  qcckPost(params, "/mosty-gsxt/tbYjxx/getBqyjList").then((res) => {
+    btnLoading.value = false;
+    handleExportData(res || []);
+  });
+};
+
+// 导出处理数据
+const handleExportData = (arr) => {
   const titleObj = {
     index: "序号",
     czzt_name: "处置状态",
@@ -554,9 +580,7 @@ const exportExl = () => {
     yjfz: "标签分值"
   };
   /** 导出【选中】的数据 （没有就全部）*/
-  const needArr =
+  const data = arr.map((item, index) => {
-    selectRows.value?.length > 0 ? selectRows.value : pageData.tableData;
-  const data = needArr.map((item, index) => {
     return {
       index: index + 1,
       czzt_name: getMultiDictVal(item.czzt, D_GSXT_YJXX_CZZT),
@@ -570,6 +594,12 @@ const exportExl = () => {
   exportExlByObj(titleObj, data, "身份预警");
 };
 
+const exportExl = () => {
+  /** 导出【选中】的数据 （没有就全部）*/
+  const needArr = selectRows.value?.length > 0 ? selectRows.value : pageData.tableData;
+  handleExportData(needArr);
+};
+
 const handleQs = () => {
   if (selectRows.value?.length === 0)
     return proxy.$message({ type: "warning", message: "请选择要签收的预警" });