xianshui/daofu-gov-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对接工作模块接口

Browse Source
This commit is contained in:
du 2024-03-14 17:31:52 +08:00
parent c371a9f169
commit 74ae5eca02
10 changed files with 162 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/Work.ts
View File

@ -62,6 +62,15 @@ export function wkTypes(params) {
data:params data:params
}); });
} }
/**
*新增工作动态
*/
export function deleteWork(params) {
return request({
url: `/admin/work/deleteWork/${params.workId}/${params.classify}`,
method: "DELETE",
});
}

33
src/views/statistic/components/gz.vue
View File

@ -27,35 +27,36 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="cz" prop="aa"
align="center" align="center"
:resizable="true" :resizable="true"
label="常规工作" label="常规工作"
> >
<el-table-column <el-table-column
prop="cz" prop="a"
align="center" align="center"
label="进行中" label="进行中"
></el-table-column> >
</el-table-column>
<el-table-column <el-table-column
prop="cz" prop="b"
align="center" align="center"
label="已完成" label="已完成"
></el-table-column> ></el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="db" prop="bb"
:resizable="true" :resizable="true"
align="center" align="center"
label="督办工作" label="督办工作"
> >
<el-table-column <el-table-column
prop="cz" prop="a"
align="center" align="center"
label="进行中" label="进行中"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="cz" prop="b"
align="center" align="center"
label="已完成" label="已完成"
></el-table-column> ></el-table-column>
@ -95,12 +96,24 @@
></el-table-column> ></el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <el-table-column key="年" label="每月达标率（%）">
<el-table-column
v-for="(item, index) in months"
:key="item"
:label="item"
>
<template #default="scope">
<span>{{ scope.row.monthData[index].complianceRate }}</span>
</template>
</el-table-column> -->
<!-- 分页 --> <!-- 分页 -->
<el-pagination <el-pagination
class="pagination" class="pagination"
v-model:current-page.sync="currentPage" @size-change="getList"
@current-change="getList"
v-model:current-page="currentPage"
:page-sizes="[10, 15, 20, 30]" :page-sizes="[10, 15, 20, 30]"
v-model:page-size.sync="pageSize" v-model:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
background background
@ -117,7 +130,7 @@ const search = ref([]);
const currentPage = ref(1); const currentPage = ref(1);
const pageSize = ref(10); const pageSize = ref(10);
const total = ref(0); const total = ref(0);
const tableData = ref([{ cName: "xxx村名" }, { cName: "xxx村名" }]); const tableData = ref([{ cName: "xxx村名",aa:{a:1,b:2},bb:[{a:'1',b:'2'}] }, { cName: "xxx村名" }]);
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

5
src/views/statistic/components/hj.vue
View File

@ -40,8 +40,6 @@
<!-- 分页 --> <!-- 分页 -->
<el-pagination <el-pagination
class="pagination" class="pagination"
@size-change="getList"
@current-change="getList"
v-model:current-page="currentPage" v-model:current-page="currentPage"
:page-sizes="[10, 15, 20, 30]" :page-sizes="[10, 15, 20, 30]"
v-model:page-size="pageSize" v-model:page-size="pageSize"
@ -75,6 +73,9 @@ const getDomicileStatistic = () => {
tableDataloading.value = false; tableDataloading.value = false;
}); });
}; };
const getList = () => {
getDomicileStatistic()
}
onMounted(() => { onMounted(() => {
getDomicileStatistic(); getDomicileStatistic();
}); });

38
src/views/statistic/components/rylx.vue
View File

@ -30,28 +30,19 @@
label="村名" label="村名"
> >
</el-table-column> </el-table-column>
<el-table-column prop="poverty" :resizable="true" align="center" label="贫困户"> <el-table-column
</el-table-column> v-for="(item, index) in months"
<el-table-column prop="student" :resizable="true" align="center" label="在校生"> :key="item"
</el-table-column> :label="item"
<el-table-column prop="disabled" :resizable="true" align="center" label="残疾人"> >
</el-table-column> <template #default="scope">
<el-table-column prop="lowGuarantees" :resizable="true" align="center" label="低保户"> <span>{{ scope.row.typeList[index].typeNum }}</span>
</el-table-column> </template>
<el-table-column prop="fiveGuarantees" :resizable="true" align="center" label="五保户"> </el-table-column>
</el-table-column>
<el-table-column prop="partyMember" :resizable="true" align="center" label="党员">
</el-table-column>
<el-table-column prop="villageCadre" :resizable="true" align="center" label="村组干部">
</el-table-column>
<el-table-column prop="other" :resizable="true" align="center" label="其他">
</el-table-column>
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<el-pagination <el-pagination
class="pagination" class="pagination"
@size-change="getList"
@current-change="getList"
v-model:current-page="currentPage" v-model:current-page="currentPage"
:page-sizes="[10, 15, 20, 30]" :page-sizes="[10, 15, 20, 30]"
v-model:page-size="pageSize" v-model:page-size="pageSize"
@ -74,18 +65,27 @@ const pageSize = ref(10);
const total = ref(0); const total = ref(0);
const tableData = ref([]); const tableData = ref([]);
const tableDataloading = ref(false); const tableDataloading = ref(false);
const getList = () => { // 标题
const months= ref([])
const getpersonnelTypeStatistic = () => {
tableDataloading.value = true; tableDataloading.value = true;
// let params = { // let params = {
// limit: pageSize.value, // limit: pageSize.value,
// page: currentPage.value, // page: currentPage.value,
// }; // };
personnelTypeStatistic().then((res: any) => { personnelTypeStatistic().then((res: any) => {
months.value = [];
res.data[0].typeList.forEach(item => {
months.value.push(item.typeName);
});
tableData.value = res.data; tableData.value = res.data;
total.value = res.data.total; total.value = res.data.total;
tableDataloading.value = false; tableDataloading.value = false;
}); });
}; };
const getList = () => {
getpersonnelTypeStatistic()
}
onMounted(() => { onMounted(() => {
getList(); getList();
}); });

5
src/views/system/log/auth/index.vue
View File

@ -59,16 +59,15 @@
{{ scope.$index + 1 + (currentPage - 1) * pageSize }} {{ scope.$index + 1 + (currentPage - 1) * pageSize }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="authUserName" :resizable="true" label="登录用户"> <el-table-column prop="authUserName" :resizable="true" align="center" label="登录用户">
</el-table-column> </el-table-column>
<el-table-column prop="authOptTime" :resizable="true" label="登录时间"> <el-table-column prop="authOptTime" :resizable="true" align="center" label="登录时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="authOptIp" prop="authOptIp"
:resizable="true" :resizable="true"
align="center" align="center"
label="IP地址" label="IP地址"
width="200"
> >
</el-table-column> </el-table-column>
</el-table> </el-table>

6
src/views/system/log/option/index.vue
View File

@ -59,7 +59,7 @@
{{ scope.$index + 1 + (currentPage - 1) * pageSize }} {{ scope.$index + 1 + (currentPage - 1) * pageSize }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="nickname" :resizable="true" label="操作用户"> <el-table-column prop="nickname" :resizable="true" align="center" label="操作用户">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ipAddress" prop="ipAddress"
@ -68,11 +68,11 @@
label="IP地址" label="IP地址"
> >
</el-table-column> </el-table-column>
<el-table-column prop="url" :resizable="true" label="请求地址"> <el-table-column prop="url" :resizable="true" align="center" label="请求地址">
</el-table-column> </el-table-column>
<el-table-column prop="params" :resizable="true" label="请求参数"> <el-table-column prop="params" :resizable="true" label="请求参数">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" :resizable="true" label="操作时间"> <el-table-column prop="createTime" :resizable="true" align="center" label="操作时间">
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->

6
src/views/work-manage/components/Add.vue
View File

@ -61,7 +61,7 @@
:file-list="afterList" :file-list="afterList"
:http-request="handleUploadAfter" :http-request="handleUploadAfter"
> >
<el-icon class="avatar-uploader-icon"> <el-icon class="avatar-uploader-icon" :size="40">
<Plus /> <Plus />
</el-icon> </el-icon>
<template #file="{ file }"> <template #file="{ file }">
@ -421,4 +421,8 @@ watch(
margin-left: 10px; margin-left: 10px;
} }
} }
::v-deep(.avatar-uploader-icon) {
width: 100px;
height: 100px;
}
</style> </style>

51
src/views/work-manage/index.vue
View File

@ -99,11 +99,9 @@
<script lang='ts' setup> <script lang='ts' setup>
import { onMounted, ref } from "vue"; import { onMounted, ref } from "vue";
// import { ElMessageBox } from "element-plus";
import { wkTypes } from "@/api/Work";
// import CG from "./components/cg.vue";
import Add from "./components/add.vue"; import Add from "./components/add.vue";
import { sendWorkPage } from "@/api/Work"; import { wkTypes, sendWorkPage, deleteWork } from "@/api/Work";
import { ElMessageBox, ElMessage } from "element-plus";
import useUserStore from "@/store/modules/user"; import useUserStore from "@/store/modules/user";
const userStore = useUserStore(); const userStore = useUserStore();
const user = ref(JSON.parse(userStore.userInfo)); const user = ref(JSON.parse(userStore.userInfo));
@ -178,27 +176,30 @@ const onclone = () => {
}; };
//删除 //删除
const deletelist = (data)=>{ const deletelist = (data)=>{
console.log(data,'===>'); ElMessageBox.confirm("是否确认删除?", "提示", {
// ElMessageBox.confirm("是否确认删除?", "提示", { confirmButtonText: "是",
// confirmButtonText: "是", cancelButtonText: "否",
// cancelButtonText: "否", type: "warning",
// type: "warning", }).then(() => {
// }).then(() => { let params = {
// delOthequipment(id, userId.value).then((res: any) => { workId: data.workId,
// if (res.code == 1) { classify: 1,
// ElMessage.success({ };
// message: "删除成功", deleteWork(params).then((res: any) => {
// type: "success", if (res.code == 1) {
// }); ElMessage.success({
// } else { message: "删除成功",
// ElMessage.error({ type: "success",
// message: res.message, });
// type: "error", } else {
// }); ElMessage.error({
// } message: res.message,
// getSendWorkPage(); type: "error",
// }); });
// }); }
getList();
});
});
} }
const getList = ()=>{ const getList = ()=>{

6
src/views/work-trends/components/Add.vue
View File

@ -58,7 +58,7 @@
:file-list="afterList" :file-list="afterList"
:http-request="handleUploadAfter" :http-request="handleUploadAfter"
> >
<el-icon class="avatar-uploader-icon"> <el-icon class="avatar-uploader-icon" :size="40">
<Plus /> <Plus />
</el-icon> </el-icon>
<template #file="{ file }"> <template #file="{ file }">
@ -350,4 +350,8 @@ watch(
margin-left: 10px; margin-left: 10px;
} }
} }
::v-deep(.avatar-uploader-icon) {
width: 100px;
height: 100px;
}
</style> </style>

97
src/views/work-trends/index.vue
View File

@ -2,7 +2,9 @@
<div class="percentage-content"> <div class="percentage-content">
<el-radio-group class="rg" v-model="tabIndex" @change="clickRadio"> <el-radio-group class="rg" v-model="tabIndex" @change="clickRadio">
<template v-for="item in tabs" :key="item.sortId"> <template v-for="item in tabs" :key="item.sortId">
<el-radio-button :label="item.sortId">{{ item.typeName }}</el-radio-button> <el-radio-button :label="item.sortId">{{
item.typeName
}}</el-radio-button>
</template> </template>
</el-radio-group> </el-radio-group>
<div class="content"> <div class="content">
@ -13,7 +15,10 @@
<svg-icon name="refurbish" class="icon" /> <svg-icon name="refurbish" class="icon" />
<span>刷新</span> <span>刷新</span>
</div> </div>
<div class="tool-item" @click="(dialogVisible = true), (form = {}), (readonly = false)"> <div
class="tool-item"
@click="(dialogVisible = true), (form = {}), (readonly = false)"
>
<svg-icon name="add" class="icon" /> <svg-icon name="add" class="icon" />
<span>新增</span> <span>新增</span>
</div> </div>
@ -70,8 +75,18 @@
label="动态内容" label="动态内容"
> >
</el-table-column> </el-table-column>
<el-table-column prop="startTime" align="center" label="开始时间" width="190"/> <el-table-column
<el-table-column prop="endTime" align="center" label="结束时间" width="190"/> prop="startTime"
align="center"
label="开始时间"
width="190"
/>
<el-table-column
prop="endTime"
align="center"
label="结束时间"
width="190"
/>
<el-table-column <el-table-column
prop="chinaName" prop="chinaName"
:resizable="true" :resizable="true"
@ -104,7 +119,9 @@
</span> --> </span> -->
<span <span
class="operate" class="operate"
@click="(form = scope.row), (dialogVisible = true),(readonly = true)" @click="
(form = scope.row), (dialogVisible = true), (readonly = true)
"
> >
<svg-icon name="detail" class="icon"></svg-icon> <svg-icon name="detail" class="icon"></svg-icon>
<span class="detail">详情</span> <span class="detail">详情</span>
@ -129,7 +146,7 @@
> >
</el-pagination> </el-pagination>
<!-- 新增 --> <!-- 新增 -->
<Add <Add
:visible="dialogVisible" :visible="dialogVisible"
:form="form" :form="form"
:readonly="readonly" :readonly="readonly"
@ -144,17 +161,15 @@
<script lang='ts' setup> <script lang='ts' setup>
import { onMounted, reactive, ref } from "vue"; import { onMounted, reactive, ref } from "vue";
import Add from "./components/add.vue"; import Add from "./components/add.vue";
import { ElMessageBox } from "element-plus"; import { ElMessageBox, ElMessage } from "element-plus";
import { wkTypes,wkDynamicsPage } from "@/api/Work"; import { wkTypes, wkDynamicsPage, deleteWork } from "@/api/Work";
import useUserStore from "@/store/modules/user"; import useUserStore from "@/store/modules/user";
const userStore = useUserStore(); const userStore = useUserStore();
const user = ref(JSON.parse(userStore.userInfo)); const user = ref(JSON.parse(userStore.userInfo));
const userId = ref(user.value.userId); const userId = ref(user.value.userId);
const tabIndex = ref(0); const tabIndex = ref(0);
const tabs = ref([ const tabs = ref([{ typeName: "常规工作", sortId: 1 }]);
{ typeName: "常规工作", sortId: 1, },
]);
const search = ref([]); const search = ref([]);
const currentPage = ref(1); const currentPage = ref(1);
@ -165,7 +180,6 @@ const readonly = ref(false);
const dialogVisible = ref(false); const dialogVisible = ref(false);
const form = ref({}); const form = ref({});
//获取列表 //获取列表
const tableDataloading = ref(false); const tableDataloading = ref(false);
const tableData = ref([ const tableData = ref([
@ -174,29 +188,29 @@ const tableData = ref([
const getWkDynamicsPage = () => { const getWkDynamicsPage = () => {
tableDataloading.value = true; tableDataloading.value = true;
let params = { let params = {
userId:userId.value, userId: userId.value,
limit: pageSize.value, limit: pageSize.value,
page: currentPage.value, page: currentPage.value,
typeId:typeId.value, typeId: typeId.value,
}; };
wkDynamicsPage(params).then((res: any) => { wkDynamicsPage(params).then((res: any) => {
console.log(res,'res==>'); console.log(res, "res==>");
tableData.value = res.data.list; tableData.value = res.data.list;
total.value = res.data.total; total.value = res.data.total;
tableDataloading.value = false; tableDataloading.value = false;
}); });
}; };
//弹窗标题 //弹窗标题
const tabsTitle = ref(''); const tabsTitle = ref("");
//头部点击取id //头部点击取id
const clickRadio = ()=>{ const clickRadio = () => {
tabs.value.forEach(item => { tabs.value.forEach((item) => {
if (item.sortId == tabIndex.value) { if (item.sortId == tabIndex.value) {
typeId.value = item.typeId; typeId.value = item.typeId;
tabsTitle.value = item.typeName; tabsTitle.value = item.typeName;
} }
}); });
getList() getList();
}; };
//关闭新增弹窗 //关闭新增弹窗
const onclone = () => { const onclone = () => {
@ -205,11 +219,11 @@ const onclone = () => {
getList(); getList();
}; };
//工作类型 //工作类型
const typeId = ref('') const typeId = ref("");
const getWkTypes = ()=>{ const getWkTypes = () => {
let params = { let params = {
classify:2 classify: 2,
} };
wkTypes(params).then((res: any) => { wkTypes(params).then((res: any) => {
tabs.value = res.data; tabs.value = res.data;
typeId.value = res.data[0].typeId; typeId.value = res.data[0].typeId;
@ -217,16 +231,39 @@ const getWkTypes = ()=>{
tabIndex.value = 1; tabIndex.value = 1;
getWkDynamicsPage(); getWkDynamicsPage();
}); });
} };
//删除
const deletelist = (data) => {
ElMessageBox.confirm("是否确认删除?", "提示", {
confirmButtonText: "是",
cancelButtonText: "否",
type: "warning",
}).then(() => {
let params = {
workId: data.dynamicsId,
classify: 2,
};
deleteWork(params).then((res: any) => {
if (res.code == 1) {
ElMessage.success({
message: "删除成功",
type: "success",
});
} else {
ElMessage.error({
message: res.message,
type: "error",
});
}
getList();
});
});
};
//刷新 //刷新
const getList = ()=>{ const getList = () => {
currentPage.value = 1; currentPage.value = 1;
getWkDynamicsPage(); getWkDynamicsPage();
} };
//删除
const deletelist = (data)=>{
console.log(data);
}
onMounted(() => { onMounted(() => {
getWkTypes(); getWkTypes();
}); });