-
+
-
+
@@ -116,31 +71,12 @@
- 签收
- 反馈
+ 签收
+ 反馈
详情
指派
- 报错
- {{ row.sfgz == 0 ? "关注" : "取消关注" }}
-
+ 报错
+ {{ row.sfgz == 0 ? "关注" : "取消关注" }}
@@ -189,7 +125,6 @@ const {
D_GS_ZDR_GJLB,
D_BZ_YJJB,
D_GS_CSZT,
- D_GS_QLZDRYXX,
D_BZ_XB,
D_GSXT_YJXX_CZZT,
D_GS_ZDR_RYJB,
@@ -198,7 +133,6 @@ const {
"D_BZ_YJLY",
"D_GS_QLZDRLX",
"D_BZ_YJJB",
- "D_GS_QLZDRYXX",
"D_BZ_XB",
"D_GSXT_YJXX_CZZT",
"D_GS_ZDR_RYJB",
@@ -211,7 +145,7 @@ const warningShow = ref(false);
const dataList = ref([]);
const searchConfiger = ref([
{
- key: "startTime",
+ key: "dateTime",
label: "预警时间",
type: "datetimerange",
placeholder: "请选择预警时间"
@@ -307,7 +241,7 @@ const searchConfiger = ref([
placeholder: "请输入人员细类"
}
]);
-
+const btnLoading = ref(false)
const queryFrom = ref({});
const pageData = reactive({
tableData: [], //表格数据
@@ -352,9 +286,9 @@ onMounted(() => {
// 搜索
const onSearch = (val) => {
- queryFrom.value = { ...val, yjJb: val.yjJb?.join(",") || "" };
- queryFrom.value.startTime = val.startTime ? val.startTime[0] : "";
- queryFrom.value.endTime = val.startTime ? val.startTime[1] : "";
+ queryFrom.value = { ...val};
+ queryFrom.value.startTime = val.dateTime ? val.dateTime[0] : "";
+ queryFrom.value.endTime = val.dateTime ? val.dateTime[1] : "";
// queryFrom.value.sfglyj = val.sfglyj?.join(',') || ''
// queryFrom.value.sfgz = val.sfgz?.join(',') || ''
// queryFrom.value.sfzp = val.sfzp?.join(',') || ''
@@ -377,6 +311,9 @@ const getList = () => {
pageSize: pageData.pageConfiger.pageSize,
yjlb: "03"
};
+ promes.yjJb = queryFrom.value.yjJb?.join(",") || ""
+
+ delete promes.dateTime;
delete promes.times;
qcckPost(promes, "/mosty-gsxt/tbYjxx/getPageList")
.then((res) => {
@@ -412,6 +349,28 @@ const handleChooseData = (val) => {
selectRows.value = val;
};
const exportExl = () => {
+
+ /** 导出【选中】的数据 （没有就全部）*/
+ const needArr = selectRows.value?.length > 0 ? selectRows.value : pageData.tableData;
+ handleExportData(needArr)
+};
+
+const exportExcelAll = () =>{
+ btnLoading.value = true;
+ let params = { ...queryFrom.value,yjlb:'03' }
+ params.startTime = queryFrom.value.dateTime ? queryFrom.value.dateTime[0] : "";
+ params.endTime = queryFrom.value.dateTime ? queryFrom.value.dateTime[1] : "";
+ params.yjJb = queryFrom.value.yjJb ? queryFrom.value.yjJb.join(',') : "";
+ delete params.yjCs;
+ delete params.dateTime;
+ qcckGet(params,'/mosty-gsxt/tbYjxx/getList').then(res=>{
+ btnLoading.value = false;
+ handleExportData(res || []);
+ })
+}
+
+// 导出处理数据
+const handleExportData = (arr) =>{
const titleObj = {
index: "序号",
czzt_name: "预警状态",
@@ -429,10 +388,7 @@ const exportExl = () => {
yjCs: "次数",
cszt_name: "超时状态"
};
- /** 导出【选中】的数据 （没有就全部）*/
- const needArr =
- selectRows.value?.length > 0 ? selectRows.value : pageData.tableData;
- const data = needArr.map((item, index) => {
+ const data = arr.map((item, index) => {
return {
index: index + 1,
czzt_name: getMultiDictVal(item.czzt, D_GSXT_YJXX_CZZT),
@@ -444,8 +400,10 @@ const exportExl = () => {
...item
};
});
- exportExlByObj(titleObj, data, "七类重点");
-};
+ exportExlByObj(titleObj, data, "政保预警");
+
+}
+
// 批量签收
const handleQs = () => {
if (selectRows.value?.length === 0)
@@ -542,11 +500,11 @@ const countPeople = () => {
const promes = {
...searchDom.value.formState,
yjJb: searchDom.value.formState.yjJb?.join(",") || "",
- startTime: searchDom.value.formState.startTime
- ? searchDom.value.formState.startTime[0]
+ startTime: searchDom.value.formState.dateTime
+ ? searchDom.value.formState.dateTime[0]
: "",
- endTime: searchDom.value.formState.endTime
- ? searchDom.value.formState.endTime[1]
+ endTime: searchDom.value.formState.dateTime
+ ? searchDom.value.formState.dateTime[1]
: ""
};
qcckPost(promes, "/mosty-gsxt/tbYjxx/bkyjQctj")
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/sevenWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/sevenWarning/index.vue
index d7509e9..aaf00e4 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/sevenWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/sevenWarning/index.vue
@@ -54,6 +54,9 @@
批量导出
+
筛选导出
批量签收
@@ -189,7 +192,6 @@ import Particulars from "./particulars.vue";
import WarnDataTable from "@/views/backOfficeSystem/ces/components/WarnDataTable.vue";
import QueryFormPanel from "@/views/backOfficeSystem/ces/components/QueryFormPanel.vue";
import FkDialog from "@/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/fkDialog.vue";
-// import MyTable from "@/components/aboutTable/MyTable.vue";
import Pages from "@/components/aboutTable/Pages.vue";
import { qcckGet, qcckPost } from "@/api/qcckApi.js";
import { reactive, ref, onMounted, getCurrentInstance } from "vue";
@@ -224,12 +226,13 @@ const {
"D_BZ_QBLY",
"D_BZ_QBLYJB"
); //获取字典数据
+
const searchBox = ref(); //搜索框
const warningShow = ref(false);
const dataList = ref([]);
const searchConfiger = ref([
{
- key: "startTime",
+ key: "dateTime",
label: "预警时间",
type: "datetimerange",
placeholder: "请选择预警时间"
@@ -339,7 +342,6 @@ const searchConfiger = ref([
placeholder: "请选择情报来源级别"
}
]);
-
const queryFrom = ref({});
const pageData = reactive({
tableData: [], //表格数据
@@ -387,8 +389,8 @@ onMounted(() => {
// 搜索
const onSearch = (val) => {
queryFrom.value = { ...val, yjJb: val.yjJb?.join(",") || "" };
- queryFrom.value.startTime = val.startTime ? val.startTime[0] : "";
- queryFrom.value.endTime = val.startTime ? val.startTime[1] : "";
+ queryFrom.value.startTime = val.dateTime ? val.dateTime[0] : "";
+ queryFrom.value.endTime = val.dateTime ? val.dateTime[1] : "";
// queryFrom.value.sfglyj = val.sfglyj?.join(',') || ''
// queryFrom.value.sfgz = val.sfgz?.join(',') || ''
// queryFrom.value.sfzp = val.sfzp?.join(',') || ''
@@ -410,7 +412,9 @@ const getList = () => {
pageCurrent: pageData.pageConfiger.pageCurrent,
pageSize: pageData.pageConfiger.pageSize
};
+ promes.yjJb = queryFrom.value.yjJb ? queryFrom.value.yjJb.join(',') : "";
delete promes.times;
+ delete promes.dateTime;
qcckPost(promes, "/mosty-gsxt/tbYjxx/getQlzdrPageList")
.then((res) => {
pageData.total = res.total || 0;
@@ -422,41 +426,23 @@ const getList = () => {
});
};
-const pushWarning = (val) => {
- warningShow.value = true;
- dataList.value = val;
-};
+const btnLoading = ref(false)
+const exportExcelAll = () =>{
+ btnLoading.value = true;
+ let params = { ...queryFrom.value,yjlb:'02' }
+ params.startTime = queryFrom.value.dateTime ? queryFrom.value.dateTime[0] : "";
+ params.endTime = queryFrom.value.dateTime ? queryFrom.value.dateTime[1] : "";
+ params.yjJb = queryFrom.value.yjJb ? queryFrom.value.yjJb.join(',') : "";
+ delete params.yjCs;
+ delete params.dateTime;
+ qcckGet(params,'/mosty-gsxt/tbYjxx/getList').then(res=>{
+ btnLoading.value = false;
+ handleExportData(res || []);
+ })
+}
-const failWarning = (val) => {
- let ids = [val.id];
- qcckPost({ ids }, "/mosty-gsxt/tbYjxx/yjbc")
- .then((res) => {
- proxy.$message({ type: "success", message: "成功" });
- getList();
- })
- .catch(() => {
- proxy.$message({ type: "error", message: "失败" });
- });
-};
-
-// 处理签收
-const handleQsFk = (val, type) => {
- console.log(val.id, "xxxxxxxxxxxxxxxxxxxxxxxx");
-
- switch (type) {
- case "反馈":
- case "查看反馈":
- emitter.emit("openFkDialog", { id: val.id, type });
- break;
- }
-};
-
-/** 选中项 */
-const selectRows = ref([]);
-const handleChooseData = (val) => {
- selectRows.value = val;
-};
-const exportExl = () => {
+// 导出处理数据
+const handleExportData = (arr) =>{
const titleObj = {
index: "序号",
czzt_name: "预警状态",
@@ -476,10 +462,7 @@ const exportExl = () => {
yjCs: "次数",
cszt_name: "超时状态"
};
- /** 导出【选中】的数据 （没有就全部）*/
- const needArr =
- selectRows.value?.length > 0 ? selectRows.value : pageData.tableData;
- const data = needArr.map((item, index) => {
+ const data = arr.map((item, index) => {
return {
index: index + 1,
czzt_name: getMultiDictVal(item.czzt, D_GSXT_YJXX_CZZT),
@@ -494,6 +477,44 @@ const exportExl = () => {
};
});
exportExlByObj(titleObj, data, "七类重点");
+
+}
+
+
+const pushWarning = (val) => {
+ warningShow.value = true;
+ dataList.value = val;
+};
+
+const failWarning = (val) => {
+ let ids = [val.id];
+ qcckPost({ ids }, "/mosty-gsxt/tbYjxx/yjbc").then((res) => {
+ proxy.$message({ type: "success", message: "成功" });
+ getList();
+ }).catch(() => {
+ proxy.$message({ type: "error", message: "失败" });
+ });
+};
+
+// 处理签收
+const handleQsFk = (val, type) => {
+ switch (type) {
+ case "反馈":
+ case "查看反馈":
+ emitter.emit("openFkDialog", { id: val.id, type });
+ break;
+ }
+};
+
+/** 选中项 */
+const selectRows = ref([]);
+const handleChooseData = (val) => {
+ selectRows.value = val;
+};
+const exportExl = () => {
+ /** 导出【选中】的数据 （没有就全部）*/
+ const needArr = selectRows.value?.length > 0 ? selectRows.value : pageData.tableData;
+ handleExportData(needArr);
};
// 批量签收
const handleQs = () => {
@@ -602,6 +623,7 @@ const handleRelatedWarning = () => {
selectDataVisible.value = true;
};
+
// 确认关联预警
const handleSelectConfirm = (selectedData) => {
console.log("关联预警数据:", selectedData);
@@ -611,11 +633,11 @@ const countPeople = () => {
const promes = {
...searchDom.value.formState,
yjJb: searchDom.value.formState.yjJb?.join(",") || "",
- startTime: searchDom.value.formState.startTime
- ? searchDom.value.formState.startTime[0]
+ startTime: searchDom.value.formState.dateTime
+ ? searchDom.value.formState.dateTime[0]
: "",
- endTime: searchDom.value.formState.endTime
- ? searchDom.value.formState.endTime[1]
+ endTime: searchDom.value.formState.dateTime
+ ? searchDom.value.formState.dateTime[1]
: ""
};
qcckPost(promes, "/mosty-gsxt/tbYjxx/bkyjQctj")
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index ac50645..9f2e03c 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -354,9 +354,7 @@ const closeLayBack = () => {
// 初始化音频播放器
const initAudioPlayer = () => {
// 使用工具类初始化音频播放器
- audioPlayer
- .init(require("@/assets/images/yjsy.mp3"))
- .then(() => {
+ audioPlayer.init(require("@/assets/images/yjsy.mp3")).then(() => {
console.log("音频播放器初始化成功");
// 只有当ispLayBack为true时才播放
if (ispLayBack.value) {
@@ -373,11 +371,7 @@ const startPopupLoop = () => {
popupTimer.value = setInterval(() => {
if (!showNotification.value && allDep.value.length > 0) {
emitter.emit("deletePointArea", "hm_pop");
- emitter.emit("makerPopup", {
- data: allDep.value[indexNum.value],
- flag: "hm_pop",
- type: "Custom"
- });
+ emitter.emit("makerPopup", { data: allDep.value[indexNum.value], flag: "hm_pop", type: "Custom" });
indexNum.value = (indexNum.value + 1) % allDep.value.length;
}
}, 10000);
@@ -386,10 +380,7 @@ const startPopupLoop = () => {
// 搜索
const handleSearch = () => {
if (!searchText.value) return proxy.$message.warning("请输入身份证号");
- qcckPost(
- { rysfzh: searchText.value },
- "/mosty-gsxt/tbYjxx/getPageAllList"
- ).then((res) => {
+ qcckPost({ rysfzh: searchText.value },"/mosty-gsxt/tbYjxx/getPageAllList").then((res) => {
peoDialogRef.value.init(res.records || []);
});
};
@@ -398,22 +389,8 @@ const handleSearch = () => {
const getTbYjxxGetList = () => {
// 设置为当天时间范围：00:00:00 到 23:59:59
const today = new Date();
- const startTime = new Date(
- today.getFullYear(),
- today.getMonth(),
- today.getDate(),
- 0,
- 0,
- 0
- ).getTime();
- const endTime = new Date(
- today.getFullYear(),
- today.getMonth(),
- today.getDate(),
- 23,
- 59,
- 59
- ).getTime();
+ const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate(),0,0,0).getTime();
+ const endTime = new Date( today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59).getTime();
const promes = {
startTime: timeValidate(startTime),
endTime: timeValidate(endTime)
@@ -434,12 +411,7 @@ const getTbYjxxGetList = () => {
};
});
const icon = require("@/assets/point/yj.png");
- emitter.emit("addPoint", {
- coords: coords,
- icon: icon,
- flag: "yj",
- fontColor: "#FF0000"
- });
+ emitter.emit("addPoint", { coords: coords, icon: icon, flag: "yj", fontColor: "#FF0000"});
});
};
@@ -490,14 +462,11 @@ onMounted(() => {
emitter.on("openYp", (newsDate) => {
// 使用工具类播放音频，自动处理静音切换
if (ispLayBack.value) {
- audioPlayer
- .play()
- .then(() => {
- console.log("WebSocket触发音频播放成功");
- })
- .catch((error) => {
- console.error("WebSocket触发音频播放失败:", error);
- });
+ audioPlayer.play().then(() => {
+ console.log("WebSocket触发音频播放成功");
+ }).catch((error) => {
+ console.error("WebSocket触发音频播放失败:", error);
+ });
const coords = {
id: newsDate.id,
jd: newsDate.jd,
diff --git a/src/views/home/model/tacticalYp.vue b/src/views/home/model/tacticalYp.vue
index b00cd80..38d4004 100644
--- a/src/views/home/model/tacticalYp.vue
+++ b/src/views/home/model/tacticalYp.vue
@@ -66,6 +66,9 @@ const getList = (type) => {
let arr = Array.isArray(res?.records) ? res.records : [];
personList.value = pageNum.value == 1 ? arr : personList.value.concat(arr);
total.value = res?.total || 0;
+ if(pageNum.value == 1 && total.value > 3 ){
+ startAutoScroll();
+ }
}).catch(() => {
loading.value = false;
loadingMore.value = false;
@@ -94,12 +97,11 @@ const autoScroll = () => {
// 开始自动滚动
const startAutoScroll = () => {
+ if(total.value < 3) return;
if (isAutoScrolling.value || !carouselList.value) return;
isAutoScrolling.value = true;
// 清除可能存在的定时器
- if (scrollTimer) {
- clearInterval(scrollTimer);
- }
+ if (scrollTimer) clearInterval(scrollTimer);
// 设置新的定时器，控制滚动速度
scrollTimer = setInterval(autoScroll, 30);
};
@@ -118,29 +120,14 @@ const chooseItem = (item) => {
stopAutoScroll(); // 点击时停止自动滚动
const path = props.bglx === '01' ? '/tacticalResearch' : '/strategicResearch'
router.push({
- // path: '/forumPost',
path: path,
query: { id: item.id }
})
};
-// 添加跳转
-const chooseForumPost = () => {
- stopAutoScroll(); // 点击时停止自动滚动
- const path = props.bglx === '01' ? '/tacticalResearch' : '/strategicResearch'
-
- router.push({ path: path })
-};
-
// 生命周期
onMounted(() => {
getList();
- // 数据加载完成后启动自动滚动
- setTimeout(() => {
- if (personList.value.length > 0) {
- startAutoScroll();
- }
- }, 1000);
});
// 组件卸载前清除定时器