From 74ae5eca02e2e61e0f8ca314bdc5bbb5ced159ae Mon Sep 17 00:00:00 2001
From: du <1176658673@qq.com>
Date: Thu, 14 Mar 2024 17:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=B7=A5=E4=BD=9C=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Work.ts                          |  9 +++
 src/views/statistic/components/gz.vue    | 33 +++++---
 src/views/statistic/components/hj.vue    |  5 +-
 src/views/statistic/components/rylx.vue  | 38 +++++-----
 src/views/system/log/auth/index.vue      |  5 +-
 src/views/system/log/option/index.vue    |  6 +-
 src/views/work-manage/components/Add.vue |  6 +-
 src/views/work-manage/index.vue          | 51 +++++++------
 src/views/work-trends/components/Add.vue |  6 +-
 src/views/work-trends/index.vue          | 97 ++++++++++++++++--------
 10 files changed, 162 insertions(+), 94 deletions(-)

diff --git a/src/api/Work.ts b/src/api/Work.ts
index 2dc3ead..c80575b 100644
--- a/src/api/Work.ts
+++ b/src/api/Work.ts
@@ -62,6 +62,15 @@ export function wkTypes(params) {
     data:params
   });
 }
+/**
+ *新增工作动态
+ */
+ export function deleteWork(params) {
+  return request({
+    url: `/admin/work/deleteWork/${params.workId}/${params.classify}`,
+    method: "DELETE",
+  });
+}
 
 
 
diff --git a/src/views/statistic/components/gz.vue b/src/views/statistic/components/gz.vue
index 7fde5e7..3aa63ae 100644
--- a/src/views/statistic/components/gz.vue
+++ b/src/views/statistic/components/gz.vue
@@ -27,35 +27,36 @@
       >
       </el-table-column>
       <el-table-column
-        prop="cz"
+        prop="aa"
         align="center"
         :resizable="true"
         label="常规工作"
       >
         <el-table-column
-          prop="cz"
+          prop="a"
           align="center"
           label="进行中"
-        ></el-table-column>
+        >
+        </el-table-column>
         <el-table-column
-          prop="cz"
+          prop="b"
           align="center"
           label="已完成"
         ></el-table-column>
       </el-table-column>
       <el-table-column
-        prop="db"
+        prop="bb"
         :resizable="true"
         align="center"
         label="督办工作"
       >
         <el-table-column
-          prop="cz"
+          prop="a"
           align="center"
           label="进行中"
         ></el-table-column>
         <el-table-column
-          prop="cz"
+          prop="b"
           align="center"
           label="已完成"
         ></el-table-column>
@@ -95,12 +96,24 @@
         ></el-table-column>
       </el-table-column>
     </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
       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]"
-      v-model:page-size.sync="pageSize"
+      v-model:page-size="pageSize"
       layout="total, sizes, prev, pager, next, jumper"
       :total="total"
       background
@@ -117,7 +130,7 @@ const search = ref([]);
 const currentPage = ref(1);
 const pageSize = ref(10);
 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>
 
 <style lang="scss" scoped>
diff --git a/src/views/statistic/components/hj.vue b/src/views/statistic/components/hj.vue
index 65d9c92..0544418 100644
--- a/src/views/statistic/components/hj.vue
+++ b/src/views/statistic/components/hj.vue
@@ -40,8 +40,6 @@
     <!-- 分页 -->
      <el-pagination
         class="pagination"
-        @size-change="getList"
-        @current-change="getList"
         v-model:current-page="currentPage"
         :page-sizes="[10, 15, 20, 30]"
         v-model:page-size="pageSize"
@@ -75,6 +73,9 @@ const getDomicileStatistic = () => {
     tableDataloading.value = false;
   });
 };
+const getList = () => {
+getDomicileStatistic()
+}
 onMounted(() => {
   getDomicileStatistic();
 });
diff --git a/src/views/statistic/components/rylx.vue b/src/views/statistic/components/rylx.vue
index 5090ad8..78e8e79 100644
--- a/src/views/statistic/components/rylx.vue
+++ b/src/views/statistic/components/rylx.vue
@@ -30,28 +30,19 @@
         label="村名"
       >
       </el-table-column>
-      <el-table-column prop="poverty" :resizable="true" align="center" label="贫困户">
-      </el-table-column>
-      <el-table-column prop="student" :resizable="true" align="center" label="在校生">
-      </el-table-column>
-      <el-table-column prop="disabled" :resizable="true" align="center" label="残疾人">
-      </el-table-column>
-      <el-table-column prop="lowGuarantees" :resizable="true" align="center" label="低保户">
-      </el-table-column>
-      <el-table-column prop="fiveGuarantees" :resizable="true" align="center" label="五保户">
-      </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-column
+          v-for="(item, index) in months"
+          :key="item"
+          :label="item"
+        >
+          <template #default="scope">
+            <span>{{ scope.row.typeList[index].typeNum }}</span>
+          </template>
+        </el-table-column>
     </el-table>
     <!-- 分页 -->
     <el-pagination
         class="pagination"
-        @size-change="getList"
-        @current-change="getList"
         v-model:current-page="currentPage"
         :page-sizes="[10, 15, 20, 30]"
         v-model:page-size="pageSize"
@@ -74,18 +65,27 @@ const pageSize = ref(10);
 const total = ref(0);
 const tableData = ref([]);
 const tableDataloading = ref(false);
-const getList = () => {
+// 标题
+const months= ref([])
+const getpersonnelTypeStatistic = () => {
   tableDataloading.value = true;
   // let params = {
   //   limit: pageSize.value,
   //   page: currentPage.value,
   // };
   personnelTypeStatistic().then((res: any) => {
+    months.value = [];
+    res.data[0].typeList.forEach(item => {
+      months.value.push(item.typeName);
+    });
     tableData.value = res.data;
     total.value = res.data.total;
     tableDataloading.value = false;
   });
 };
+const getList = () => {
+getpersonnelTypeStatistic()
+}
 onMounted(() => {
   getList();
 });
diff --git a/src/views/system/log/auth/index.vue b/src/views/system/log/auth/index.vue
index 9a6f0d5..1b185e8 100644
--- a/src/views/system/log/auth/index.vue
+++ b/src/views/system/log/auth/index.vue
@@ -59,16 +59,15 @@
             {{ scope.$index + 1 + (currentPage - 1) * pageSize }}
           </template>
         </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 prop="authOptTime" :resizable="true" label="登录时间">
+        <el-table-column prop="authOptTime" :resizable="true" align="center" label="登录时间">
         </el-table-column>
         <el-table-column
           prop="authOptIp"
           :resizable="true"
           align="center"
           label="IP地址"
-          width="200"
         >
         </el-table-column>
       </el-table>
diff --git a/src/views/system/log/option/index.vue b/src/views/system/log/option/index.vue
index 0c3ece2..58d67cf 100644
--- a/src/views/system/log/option/index.vue
+++ b/src/views/system/log/option/index.vue
@@ -59,7 +59,7 @@
             {{ scope.$index + 1 + (currentPage - 1) * pageSize }}
           </template>
         </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
           prop="ipAddress"
@@ -68,11 +68,11 @@
           label="IP地址"
         >
         </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 prop="params" :resizable="true" label="请求参数">
         </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>
       <!-- 分页 -->
diff --git a/src/views/work-manage/components/Add.vue b/src/views/work-manage/components/Add.vue
index 016802c..da7076e 100644
--- a/src/views/work-manage/components/Add.vue
+++ b/src/views/work-manage/components/Add.vue
@@ -61,7 +61,7 @@
             :file-list="afterList"
             :http-request="handleUploadAfter"
           >
-            <el-icon class="avatar-uploader-icon">
+            <el-icon class="avatar-uploader-icon" :size="40">
               <Plus />
             </el-icon>
             <template #file="{ file }">
@@ -421,4 +421,8 @@ watch(
         margin-left: 10px;
     }
 }
+::v-deep(.avatar-uploader-icon) {
+    width: 100px;
+    height: 100px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/work-manage/index.vue b/src/views/work-manage/index.vue
index 082a8f2..87b24f8 100644
--- a/src/views/work-manage/index.vue
+++ b/src/views/work-manage/index.vue
@@ -99,11 +99,9 @@
 
 <script lang='ts' setup>
 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 { sendWorkPage } from "@/api/Work";
+import { wkTypes, sendWorkPage, deleteWork } from "@/api/Work";
+import { ElMessageBox, ElMessage  } from "element-plus";
 import useUserStore from "@/store/modules/user";
 const userStore = useUserStore();
 const user = ref(JSON.parse(userStore.userInfo));
@@ -178,27 +176,30 @@ const onclone = () => {
 };
 //删除
 const deletelist = (data)=>{
-  console.log(data,'===>');
-  // ElMessageBox.confirm("是否确认删除?", "提示", {
-  //   confirmButtonText: "是",
-  //   cancelButtonText: "否",
-  //   type: "warning",
-  // }).then(() => {
-  //   delOthequipment(id, userId.value).then((res: any) => {
-  //     if (res.code == 1) {
-  //       ElMessage.success({
-  //         message: "删除成功",
-  //         type: "success",
-  //       });
-  //     } else {
-  //       ElMessage.error({
-  //         message: res.message,
-  //         type: "error",
-  //       });
-  //     }
-  //     getSendWorkPage();
-  //   });
-  // });
+  ElMessageBox.confirm("是否确认删除?", "提示", {
+    confirmButtonText: "是",
+    cancelButtonText: "否",
+    type: "warning",
+  }).then(() => {
+    let params = {
+      workId: data.workId,
+      classify: 1,
+    };
+    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 = ()=>{
diff --git a/src/views/work-trends/components/Add.vue b/src/views/work-trends/components/Add.vue
index 6fca235..c06fa02 100644
--- a/src/views/work-trends/components/Add.vue
+++ b/src/views/work-trends/components/Add.vue
@@ -58,7 +58,7 @@
             :file-list="afterList"
             :http-request="handleUploadAfter"
           >
-            <el-icon class="avatar-uploader-icon">
+            <el-icon class="avatar-uploader-icon" :size="40">
               <Plus />
             </el-icon>
             <template #file="{ file }">
@@ -350,4 +350,8 @@ watch(
         margin-left: 10px;
     }
 }
+::v-deep(.avatar-uploader-icon) {
+    width: 100px;
+    height: 100px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/work-trends/index.vue b/src/views/work-trends/index.vue
index a233433..abaeb65 100644
--- a/src/views/work-trends/index.vue
+++ b/src/views/work-trends/index.vue
@@ -2,7 +2,9 @@
   <div class="percentage-content">
     <el-radio-group class="rg" v-model="tabIndex" @change="clickRadio">
       <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>
     </el-radio-group>
     <div class="content">
@@ -13,7 +15,10 @@
               <svg-icon name="refurbish" class="icon" />
               <span>刷新</span>
             </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" />
               <span>新增</span>
             </div>
@@ -70,8 +75,18 @@
           label="动态内容"
         >
         </el-table-column>
-        <el-table-column prop="startTime" align="center" label="开始时间"  width="190"/>
-      <el-table-column prop="endTime" align="center" label="结束时间" width="190"/>
+        <el-table-column
+          prop="startTime"
+          align="center"
+          label="开始时间"
+          width="190"
+        />
+        <el-table-column
+          prop="endTime"
+          align="center"
+          label="结束时间"
+          width="190"
+        />
         <el-table-column
           prop="chinaName"
           :resizable="true"
@@ -104,7 +119,9 @@
             </span> -->
             <span
               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>
               <span class="detail">详情</span>
@@ -129,7 +146,7 @@
       >
       </el-pagination>
       <!-- 新增 -->
-    <Add
+      <Add
         :visible="dialogVisible"
         :form="form"
         :readonly="readonly"
@@ -144,17 +161,15 @@
 <script lang='ts' setup>
 import { onMounted, reactive, ref } from "vue";
 import Add from "./components/add.vue";
-import { ElMessageBox } from "element-plus";
-import { wkTypes,wkDynamicsPage } from "@/api/Work";
+import { ElMessageBox, ElMessage } from "element-plus";
+import { wkTypes, wkDynamicsPage, deleteWork } from "@/api/Work";
 import useUserStore from "@/store/modules/user";
 const userStore = useUserStore();
 const user = ref(JSON.parse(userStore.userInfo));
 const userId = ref(user.value.userId);
 
 const tabIndex = ref(0);
-const tabs = ref([
-{ typeName: "常规工作", sortId: 1, },
-]);
+const tabs = ref([{ typeName: "常规工作", sortId: 1 }]);
 
 const search = ref([]);
 const currentPage = ref(1);
@@ -165,7 +180,6 @@ const readonly = ref(false);
 const dialogVisible = ref(false);
 const form = ref({});
 
-
 //获取列表
 const tableDataloading = ref(false);
 const tableData = ref([
@@ -174,29 +188,29 @@ const tableData = ref([
 const getWkDynamicsPage = () => {
   tableDataloading.value = true;
   let params = {
-    userId:userId.value,
+    userId: userId.value,
     limit: pageSize.value,
     page: currentPage.value,
-    typeId:typeId.value,
+    typeId: typeId.value,
   };
   wkDynamicsPage(params).then((res: any) => {
-    console.log(res,'res==>');
+    console.log(res, "res==>");
     tableData.value = res.data.list;
     total.value = res.data.total;
     tableDataloading.value = false;
   });
 };
 //弹窗标题
-const tabsTitle = ref('');
+const tabsTitle = ref("");
 //头部点击取id
-const clickRadio = ()=>{
-  tabs.value.forEach(item => {
+const clickRadio = () => {
+  tabs.value.forEach((item) => {
     if (item.sortId == tabIndex.value) {
       typeId.value = item.typeId;
       tabsTitle.value = item.typeName;
     }
   });
-  getList()
+  getList();
 };
 //关闭新增弹窗
 const onclone = () => {
@@ -205,11 +219,11 @@ const onclone = () => {
   getList();
 };
 //工作类型
-const typeId = ref('')
-const getWkTypes = ()=>{
+const typeId = ref("");
+const getWkTypes = () => {
   let params = {
-    classify:2
-  }
+    classify: 2,
+  };
   wkTypes(params).then((res: any) => {
     tabs.value = res.data;
     typeId.value = res.data[0].typeId;
@@ -217,16 +231,39 @@ const getWkTypes = ()=>{
     tabIndex.value = 1;
     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;
   getWkDynamicsPage();
-}
-//删除
-const deletelist = (data)=>{
-  console.log(data);
-}
+};
 onMounted(() => {
   getWkTypes();
 });