fix: BUG修改
This commit is contained in:
parent
a7b3444dd4
commit
3dac96c588
@ -60,7 +60,6 @@ const partyMemberList = ref({} as any);
|
|||||||
//获取党员信息
|
//获取党员信息
|
||||||
const getMemberList = async () => {
|
const getMemberList = async () => {
|
||||||
const res: any = await getPartyMemberList({ projectSn: store.sn });
|
const res: any = await getPartyMemberList({ projectSn: store.sn });
|
||||||
console.log("获取党员信息", res);
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
partyMemberList.value = res.result;
|
partyMemberList.value = res.result;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -56,7 +56,6 @@ const memberCareList = ref({} as any);
|
|||||||
//获取员工关怀
|
//获取员工关怀
|
||||||
const getMemberCareList = async () => {
|
const getMemberCareList = async () => {
|
||||||
const res: any = await getPartyArticleList({ projectSn: store.sn, type: 3 });
|
const res: any = await getPartyArticleList({ projectSn: store.sn, type: 3 });
|
||||||
console.log("获取员工关怀", res, res.result.length);
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
memberCareList.value = res.result;
|
memberCareList.value = res.result;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -60,7 +60,6 @@ const memberCareList = ref({} as any);
|
|||||||
//获取学习讲话
|
//获取学习讲话
|
||||||
const getMemberCareList = async () => {
|
const getMemberCareList = async () => {
|
||||||
const res: any = await getPartyArticleList({ projectSn: store.sn, type: 2 });
|
const res: any = await getPartyArticleList({ projectSn: store.sn, type: 2 });
|
||||||
console.log("获取学习讲话", res);
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
memberCareList.value = res.result;
|
memberCareList.value = res.result;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -44,7 +44,6 @@ import { getPartyNewsList, getPartyNewsById, getPartyArticleByID, getPartyArticl
|
|||||||
|
|
||||||
let selectTitle = ref("" as any);
|
let selectTitle = ref("" as any);
|
||||||
function searchChange(e: any) {
|
function searchChange(e: any) {
|
||||||
console.log("搜索", e);
|
|
||||||
// 不是党建新闻
|
// 不是党建新闻
|
||||||
if (props.currentListIndex !== 6) {
|
if (props.currentListIndex !== 6) {
|
||||||
getArticleList();
|
getArticleList();
|
||||||
@ -153,21 +152,18 @@ watch(
|
|||||||
if (newVal) {
|
if (newVal) {
|
||||||
// props.xData = newVal;
|
// props.xData = newVal;
|
||||||
// updateScrollBar();
|
// updateScrollBar();
|
||||||
console.log("详情数据变化", newVal);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
const getArticleDetail = async () => {
|
const getArticleDetail = async () => {
|
||||||
const res: any = await getPartyArticleByID({ id: detailId.value });
|
const res: any = await getPartyArticleByID({ id: detailId.value });
|
||||||
console.log("获取详情数据", res);
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
detailData.value = res.result;
|
detailData.value = res.result;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const getNewsDetail = async () => {
|
const getNewsDetail = async () => {
|
||||||
const res: any = await getPartyNewsById({ id: detailId.value });
|
const res: any = await getPartyNewsById({ id: detailId.value });
|
||||||
console.log("获取党建新闻详情数据", res);
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
detailData.value = res.result;
|
detailData.value = res.result;
|
||||||
}
|
}
|
||||||
@ -187,7 +183,6 @@ const articleNewList = ref([] as any);
|
|||||||
const getArticleList = async () => {
|
const getArticleList = async () => {
|
||||||
// 当前类型
|
// 当前类型
|
||||||
const res: any = await getPartyArticleList({ projectSn: store.sn, type: props.currentListIndex, title: selectTitle.value });
|
const res: any = await getPartyArticleList({ projectSn: store.sn, type: props.currentListIndex, title: selectTitle.value });
|
||||||
console.log("获取党员活动、学习讲话、党员关怀", res);
|
|
||||||
if (res.success && res.result.length !== 0) {
|
if (res.success && res.result.length !== 0) {
|
||||||
let newArray = res.result.map((item: any) => {
|
let newArray = res.result.map((item: any) => {
|
||||||
return {
|
return {
|
||||||
@ -211,7 +206,6 @@ const getArticleList = async () => {
|
|||||||
const getNewsList = async () => {
|
const getNewsList = async () => {
|
||||||
// 当前类型
|
// 当前类型
|
||||||
const res: any = await getPartyNewsList({ projectSn: store.sn, articleTitle: selectTitle.value });
|
const res: any = await getPartyNewsList({ projectSn: store.sn, articleTitle: selectTitle.value });
|
||||||
console.log("获取党建新闻", res);
|
|
||||||
if (res.success && res.result.length !== 0) {
|
if (res.success && res.result.length !== 0) {
|
||||||
let newArray = res.result.map((item: any) => {
|
let newArray = res.result.map((item: any) => {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@ -25,7 +25,6 @@ let rangeTime = ref("" as any);
|
|||||||
const partyBuildRef = ref();
|
const partyBuildRef = ref();
|
||||||
const openPeopleCountDialog = (type: any) => {
|
const openPeopleCountDialog = (type: any) => {
|
||||||
partyBuildRef.value.openDialog(type);
|
partyBuildRef.value.openDialog(type);
|
||||||
console.log(partyBuildRef.value);
|
|
||||||
};
|
};
|
||||||
let dataList = ref([
|
let dataList = ref([
|
||||||
{
|
{
|
||||||
@ -335,7 +334,6 @@ function drawEchart() {
|
|||||||
const politicalData = ref([] as any);
|
const politicalData = ref([] as any);
|
||||||
const getPoliticalList = async () => {
|
const getPoliticalList = async () => {
|
||||||
const res: any = await getPoliticalOutlook({ projectSn: store.sn });
|
const res: any = await getPoliticalOutlook({ projectSn: store.sn });
|
||||||
console.log("获取政治面貌数据", res);
|
|
||||||
politicalData.value = res.result.data;
|
politicalData.value = res.result.data;
|
||||||
if (res.result.count === "0") {
|
if (res.result.count === "0") {
|
||||||
max.value = 1;
|
max.value = 1;
|
||||||
|
|||||||
@ -40,7 +40,6 @@ function handleClick(event: any) {
|
|||||||
let dialogIndex = ref(null as any);
|
let dialogIndex = ref(null as any);
|
||||||
let dialogTitle = ref("" as any);
|
let dialogTitle = ref("" as any);
|
||||||
function openDialog(type: any) {
|
function openDialog(type: any) {
|
||||||
console.log("type", type);
|
|
||||||
dialogIndex.value = type;
|
dialogIndex.value = type;
|
||||||
showDialog.value = true;
|
showDialog.value = true;
|
||||||
if (type === 1) {
|
if (type === 1) {
|
||||||
|
|||||||
@ -235,7 +235,6 @@ const list = reactive([
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
function handleClick(event: any) {
|
function handleClick(event: any) {
|
||||||
console.log("点击", event.target.className);
|
|
||||||
if (event.target.className == "list-detail") {
|
if (event.target.className == "list-detail") {
|
||||||
showDialog.value = false;
|
showDialog.value = false;
|
||||||
}
|
}
|
||||||
@ -245,7 +244,6 @@ const partyMemberList = ref({} as any);
|
|||||||
//获取党员信息
|
//获取党员信息
|
||||||
const getMemberList = async () => {
|
const getMemberList = async () => {
|
||||||
const res: any = await getPartyMemberList({ projectSn: store.sn });
|
const res: any = await getPartyMemberList({ projectSn: store.sn });
|
||||||
console.log("获取党员信息", res);
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
partyMemberList.value = res.result;
|
partyMemberList.value = res.result;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -234,7 +234,6 @@ const list = reactive([
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
function handleClick(event: any) {
|
function handleClick(event: any) {
|
||||||
console.log("点击", event.target.className);
|
|
||||||
if (event.target.className == "list-detail") {
|
if (event.target.className == "list-detail") {
|
||||||
showDialog.value = false;
|
showDialog.value = false;
|
||||||
}
|
}
|
||||||
@ -244,7 +243,6 @@ const partyMemberList = ref({} as any);
|
|||||||
//获取党员信息
|
//获取党员信息
|
||||||
const getMemberList = async () => {
|
const getMemberList = async () => {
|
||||||
const res: any = await getPartyMemberList({ projectSn: store.sn });
|
const res: any = await getPartyMemberList({ projectSn: store.sn });
|
||||||
console.log("获取党员信息", res);
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
partyMemberList.value = res.result;
|
partyMemberList.value = res.result;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -59,7 +59,6 @@ const memberCareList = ref({} as any);
|
|||||||
//获取党员行动
|
//获取党员行动
|
||||||
const getMemberCareList = async () => {
|
const getMemberCareList = async () => {
|
||||||
const res: any = await getPartyArticleList({ projectSn: store.sn, type: 1 });
|
const res: any = await getPartyArticleList({ projectSn: store.sn, type: 1 });
|
||||||
console.log("获取党员行动", res);
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
memberCareList.value = res.result;
|
memberCareList.value = res.result;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -90,11 +90,9 @@ const getMemberCountList = async () => {
|
|||||||
projectSn: store.sn
|
projectSn: store.sn
|
||||||
};
|
};
|
||||||
const res: any = await getMemberInfoList(requestData);
|
const res: any = await getMemberInfoList(requestData);
|
||||||
console.log("获取人员信息列表", res);
|
|
||||||
memberList.value = res.result.records;
|
memberList.value = res.result.records;
|
||||||
};
|
};
|
||||||
const openDialog = async (obj: any) => {
|
const openDialog = async (obj: any) => {
|
||||||
console.log("type", obj);
|
|
||||||
if (obj.type == 1) {
|
if (obj.type == 1) {
|
||||||
dialogTitle.value = "处置详情";
|
dialogTitle.value = "处置详情";
|
||||||
}
|
}
|
||||||
@ -114,7 +112,6 @@ const openDialog = async (obj: any) => {
|
|||||||
if(!formData.value.handleResult){
|
if(!formData.value.handleResult){
|
||||||
formData.value.handleResult = 1;
|
formData.value.handleResult = 1;
|
||||||
}
|
}
|
||||||
console.log(formData.value)
|
|
||||||
showDialog.value = true;
|
showDialog.value = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -29,7 +29,6 @@ const closeDialog = () => {
|
|||||||
postData.value = {};
|
postData.value = {};
|
||||||
}
|
}
|
||||||
function openDialog(obj: any) {
|
function openDialog(obj: any) {
|
||||||
console.log("type", obj);
|
|
||||||
if(obj.type == 1 || obj.type == 3){
|
if(obj.type == 1 || obj.type == 3){
|
||||||
dialogTitle.value = obj.tip + '人数统计数据';
|
dialogTitle.value = obj.tip + '人数统计数据';
|
||||||
} else if(obj.type == 2) {
|
} else if(obj.type == 2) {
|
||||||
|
|||||||
@ -102,7 +102,6 @@ let workTicketCount = ref({
|
|||||||
} as any);
|
} as any);
|
||||||
// AI违章人员
|
// AI违章人员
|
||||||
const alarmCountDataOpen = (obj: any) => {
|
const alarmCountDataOpen = (obj: any) => {
|
||||||
console.log(obj);
|
|
||||||
partyBuildRefCount.value.openDialog(obj);
|
partyBuildRefCount.value.openDialog(obj);
|
||||||
};
|
};
|
||||||
// 工作票
|
// 工作票
|
||||||
|
|||||||
@ -91,7 +91,6 @@ const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
|
|||||||
//弹窗
|
//弹窗
|
||||||
let showDialog = ref(false as any);
|
let showDialog = ref(false as any);
|
||||||
const alarmCountDataOpen = (obj:any) => {
|
const alarmCountDataOpen = (obj:any) => {
|
||||||
console.log(obj)
|
|
||||||
partyBuildRefCount.value.openDialog(obj);
|
partyBuildRefCount.value.openDialog(obj);
|
||||||
}
|
}
|
||||||
// 弹窗
|
// 弹窗
|
||||||
@ -109,7 +108,6 @@ const realTimeTotal = ref({} as any);
|
|||||||
//获取实时监测
|
//获取实时监测
|
||||||
const getMemberCareList = async () => {
|
const getMemberCareList = async () => {
|
||||||
const res: any = await getRealTimeTotal({ projectSn: store.sn });
|
const res: any = await getRealTimeTotal({ projectSn: store.sn });
|
||||||
console.log("获取实时监测", res);
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
realTimeTotal.value = res.result;
|
realTimeTotal.value = res.result;
|
||||||
}
|
}
|
||||||
@ -120,7 +118,6 @@ let alarmList = ref([] as any);
|
|||||||
let detailData = ref({} as any);
|
let detailData = ref({} as any);
|
||||||
const getAlarmListInfo = async () => {
|
const getAlarmListInfo = async () => {
|
||||||
const res: any = await getAlarmList({ projectSn: store.sn });
|
const res: any = await getAlarmList({ projectSn: store.sn });
|
||||||
console.log("获取今日报警记录列表", res);
|
|
||||||
if (res.result.length > 0) {
|
if (res.result.length > 0) {
|
||||||
alarmList.value = res.result;
|
alarmList.value = res.result;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -73,7 +73,6 @@ const getAlarmListInfo = async (tip:any) => {
|
|||||||
pageSize: 20
|
pageSize: 20
|
||||||
};
|
};
|
||||||
const res: any = await getRiskList(data);
|
const res: any = await getRiskList(data);
|
||||||
console.log("获取风险清册", res);
|
|
||||||
if (tip == "more") {
|
if (tip == "more") {
|
||||||
alarmList.value = alarmList.value.concat(res.result.records);
|
alarmList.value = alarmList.value.concat(res.result.records);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user