From 88ea26163df07a8a90af7062f6b9c0844cb344d4 Mon Sep 17 00:00:00 2001
From: HH <2454517719@qq.com>
Date: Thu, 11 Jul 2024 17:24:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=B3=BB=E7=BB=9F=E8=BF=AD?=
 =?UTF-8?q?=E4=BB=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/dialog/detailWork.vue          |  3 +-
 src/views/home/index.vue                      |  2 +-
 .../system/base/service-rating/index.vue      | 18 +++-
 src/views/system/log/domicile-log/details.vue | 93 +++++++++++++++++++
 src/views/system/log/domicile-log/index.vue   | 34 ++++++-
 5 files changed, 140 insertions(+), 10 deletions(-)
 create mode 100644 src/views/system/log/domicile-log/details.vue

diff --git a/src/views/home/dialog/detailWork.vue b/src/views/home/dialog/detailWork.vue
index e1a2972..aa59950 100644
--- a/src/views/home/dialog/detailWork.vue
+++ b/src/views/home/dialog/detailWork.vue
@@ -376,6 +376,7 @@ watch(
       form.value = props.form;
       form.value.time = [form.value.startTime, form.value.endTime];
       getCheckDangers(form.value.workId || uuid.value)
+      getCompanyList(form.value.workId);
     }
   }
 );
@@ -383,7 +384,7 @@ watch(
   () => props.readonly,
   (val) => {
     if (val) {
-      getCompanyList(props.form.workId);
+      // getCompanyList(props.form.workId);
     }
     
   }
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index decfc9e..9c3f874 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -691,7 +691,7 @@ const clickRadio = () => {
 const getList = () => {
   workcurrentPage.value = 1;
   getWkInfoReceive();
-  getWkInfoFinishStatistic();
+  // getWkInfoFinishStatistic();
 };
 //工作完成统计
 const worktenementRef = ref();
diff --git a/src/views/system/base/service-rating/index.vue b/src/views/system/base/service-rating/index.vue
index bac1004..64a6df4 100644
--- a/src/views/system/base/service-rating/index.vue
+++ b/src/views/system/base/service-rating/index.vue
@@ -70,17 +70,17 @@
             <div class="label-select filter-tab">
               <label>开始时间</label>
               <el-date-picker v-model="search.startTime" type="date" placeholder="选择开始时间" format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD" @change="getList" />
+                value-format="YYYY-MM-DD" @change="refresh" />
             </div>
             <div class="label-select filter-tab">
               <label>结束时间</label>
               <el-date-picker v-model="search.endTime" type="date" placeholder="选择结束时间" format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD" @change="getList" />
+                value-format="YYYY-MM-DD" @change="refresh" />
             </div>
             <div class="label-select filter-tab">
                 <label>地区</label>
                 <el-cascader
-                  @change="getList"
+                  @change="refresh"
                   ref="cascader"
                   v-model="search.areaCode"
                   placeholder="请选择地区"
@@ -237,6 +237,10 @@ const onclone = () => {
   form.value = {};
   getList();
 };
+const refresh = () => {
+  getWkAllFinishStats();
+  getList();
+}
 //获取列表
 const tableDataloading = ref(false);
 const getList = () => {
@@ -266,9 +270,13 @@ const workOptions = ref([]);
 const getWkAllFinishStats = () => {
   let params = {
     userId: userId.value,
-    endTime: "",
-    startTime: "",
+    startTime: search.value.startTime,
+    endTime: search.value.endTime,
+    areaCode:'',
   };
+  if (search.value.areaCode) {
+    params.areaCode = search.value.areaCode[search.value.areaCode.length - 1];
+  }
   wkAllFinishStats(params).then((res: any) => {
     workOptions.value = res.data;
   });
diff --git a/src/views/system/log/domicile-log/details.vue b/src/views/system/log/domicile-log/details.vue
new file mode 100644
index 0000000..5a70270
--- /dev/null
+++ b/src/views/system/log/domicile-log/details.vue
@@ -0,0 +1,93 @@
+
+<template>
+  <BaseDialog
+    :dialogVisible="props.visible"
+    @close="onclone"
+    :titleName="'请求参数对比'"
+    width="50%"
+    :footerclosed="true"
+    :diafooter="true"
+    :footerkeepnaem="false"
+  >
+    <div>
+      <table>
+        <tr>
+          <th>属性/名称</th>
+          <th>修改前</th>
+          <th>修改后</th>
+        </tr>
+        <tr v-for="(value, key) in sortedEntries" :key="key">  
+          <td>{{ value[0] }}</td>  
+          <td>{{ value[1] || '-' }}</td> 
+          <td>{{ value[2] || '-' }}</td> 
+        </tr>  
+      </table>
+    </div>
+  </BaseDialog>
+</template>
+<script setup lang="ts" >
+import { reactive, ref, onMounted, watch } from "vue";
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  form: Object,
+});
+const sortedEntries = ref([])
+const sortedfunctions = (paramsAfter,paramsBefore) => {
+      // 这里简单按key排序，你可以根据需要调整排序逻辑  
+      if(paramsBefore){
+        let arr = Object.entries(paramsBefore).sort(([a], [b]) => a.localeCompare(b));
+        let brr = Object.entries(paramsAfter).sort(([a], [b]) => a.localeCompare(b));
+        for (let i = 0; i < brr.length; i++) {
+          arr[i].push(brr[i][1])
+        }
+        sortedEntries.value =  arr;
+      }else {
+        let brr = Object.entries(paramsAfter).sort(([a], [b]) => a.localeCompare(b));
+        for (let i = 0; i < brr.length; i++) {
+          console.log(brr[i],123)
+          brr[i].splice(1, 0, ''); 
+        }
+        sortedEntries.value =  brr;
+      }
+      
+}
+
+const emits = defineEmits(["close", "onSubmit"]);
+
+//关闭弹窗
+const onclone = () => {
+  emits("close");
+};
+onMounted(() => {
+});
+watch(
+  () => props.form,
+  (val:any) => {
+    if (val.paramsBefore || val.paramsAfter) {
+      let After = val.paramsAfter?JSON.parse(val.paramsAfter):null; 
+      let Before = val.paramsBefore?JSON.parse(val.paramsBefore):null; 
+      sortedfunctions(After,Before)
+    }
+  }
+);
+</script>
+
+<style lang="scss" scoped>
+table {
+    border-collapse: collapse; /* 合并边框 */
+    width: 100%; /* 设置表格宽度 */
+    background-color: #f2f2f2; /* 设置背景颜色 */
+    th, td {
+    border: 1px solid #ddd; /* 设置边框 */
+    padding: 8px; /* 设置内边距 */
+    text-align: center; /* 设置文本对齐方式 */
+    }
+    td {
+      text-align: center; /* 设置文本对齐方式 */
+    }
+  }
+  
+</style>
\ No newline at end of file
diff --git a/src/views/system/log/domicile-log/index.vue b/src/views/system/log/domicile-log/index.vue
index 88a9db8..e46e5bc 100644
--- a/src/views/system/log/domicile-log/index.vue
+++ b/src/views/system/log/domicile-log/index.vue
@@ -72,13 +72,30 @@
               3 ? '删除' : scope.row.operationType == 4 ? '注销' : '恢复' }}
           </template>
         </el-table-column>
-        <el-table-column prop="url" :resizable="true" align="center" label="请求地址" width="200">
-        </el-table-column>
-        <el-table-column prop="params" :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" align="center" label="操作时间" width="150">
         </el-table-column>
+        <el-table-column :resizable="true" align="center" width="100" label="请求参数">
+            <template #default="scope">
+                    <span class="operate" @click="
+                        (dialogVisible = true), (form = scope.row)"
+                    >
+                      <svg-icon name="detail" class="icon"></svg-icon>
+                      <span class="detail">详情</span>
+                    </span>
+            </template>
+          </el-table-column>
       </el-table>
+      <!-- 详情 -->
+      <getdetails 
+        :visible="dialogVisible"
+        :form="form"
+        @close="onclone"
+        >
+      </getdetails>
       <!-- 分页 -->
       <el-pagination class="pagination" @size-change="getList" @current-change="getList"
         v-model:current-page.sync="currentPage" :page-sizes="[10, 15, 20, 30]" v-model:page-size.sync="pageSize"
@@ -93,6 +110,7 @@ import { onMounted, reactive, ref } from "vue";
 import { crLogPageList } from "@/api/Sys";
 import { areaTree } from "@/api/account";
 import useUserStore from "@/store/modules/user";
+import getdetails from "./details.vue";
 const userStore = useUserStore();
 const user = ref(JSON.parse(userStore.userInfo));
 const userId = ref(user.value.userId);
@@ -103,6 +121,15 @@ const search = ref({
   endTime: '',
   areaCode:'',
 });
+
+const dialogVisible = ref(false);
+const form = ref({})
+const onclone = () => {
+  dialogVisible.value = false;
+  form.value = {};
+  getList();
+}
+
 const tableData = ref<any>([]);
 const currentPage = ref(1);
 const pageSize = ref(10);
@@ -122,6 +149,7 @@ const getList = () => {
   };
   crLogPageList(params).then((res: any) => {
     tableData.value = res.data.list;
+    // tableData.value = [{},{}];
     total.value = res.data.total;
     tableDataloading.value = false;
   });