From ea8a6c4793e8b49304f32ede7fa62318bd343f3e Mon Sep 17 00:00:00 2001
From: dengjia <dengjia@zcloudchina.com>
Date: Mon, 25 Aug 2025 08:38:59 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/area_cascader/index.vue        |  2 +-
 src/layout/header/index.vue                   | 24 ++++++++---
 src/views/data_directory/basic/index.vue      |  5 ++-
 src/views/data_directory/basic/records.vue    | 12 +++++-
 .../components/editDialog.vue                 | 41 +++++++++++--------
 .../components/dataItemsDialog.vue            |  3 ++
 .../superior_platform_management/index.vue    |  1 +
 7 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/src/components/area_cascader/index.vue b/src/components/area_cascader/index.vue
index a934c65..b88cdba 100644
--- a/src/components/area_cascader/index.vue
+++ b/src/components/area_cascader/index.vue
@@ -9,7 +9,7 @@
     :level="level"
     :disabled="disabled"
     :join-separator="joinSeparator"
-    value="bianma"
+    value="code"
   />
 </template>
 
diff --git a/src/layout/header/index.vue b/src/layout/header/index.vue
index 4e9d351..6d0805c 100644
--- a/src/layout/header/index.vue
+++ b/src/layout/header/index.vue
@@ -14,9 +14,21 @@
     </div>
     <div class="right">
       <div class="user">
-<!--        <span class="pl-20">姓名：{{ userInfo.name }}</span>-->
+        <!--        <span class="pl-20">姓名：{{ userInfo.name }}</span>-->
       </div>
-      <div class="menu ml-20 mr-20">
+      <div
+        v-for="item in menuList"
+        :key="item.model"
+        :style="{
+          color:
+            item.model !== model ? 'var(--el-text-color-regular)' : '#79bbff',
+        }"
+        class="right-menu-item hover-effect menu mr-20"
+        @click="fnMenuDropdownCommand(item.model)"
+      >
+        <span>{{ item.title }}</span>
+      </div>
+      <!-- <div class="menu ml-20 mr-20">
         <el-dropdown
           trigger="click"
           placement="bottom-end"
@@ -50,7 +62,7 @@
             </el-dropdown-menu>
           </template>
         </el-dropdown>
-      </div>
+      </div> -->
       <div class="user_dropdown">
         <el-dropdown
           trigger="click"
@@ -143,9 +155,9 @@ const fnSignOut = async () => {
   userStore.$reset();
   await router.replace("/login");
 };
-const fnMenuDropdownMenu = (command) => {
-  logoValue.value.title = command.title;
-};
+// const fnMenuDropdownMenu = (command) => {
+//   logoValue.value.title = command.title;
+// };
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/data_directory/basic/index.vue b/src/views/data_directory/basic/index.vue
index d27f25b..d74d506 100644
--- a/src/views/data_directory/basic/index.vue
+++ b/src/views/data_directory/basic/index.vue
@@ -31,7 +31,7 @@
             link
             @click="
               router.push({
-                path: `/data_directory/records`,
+                path: `${route.path}/records`,
                 query: {
                   thirdPlatformId: row.thirdPlatformId,
                   companyId: row.companyId,
@@ -55,9 +55,10 @@ import useListData from "@/hooks/useListData.js";
 import AppSearch from "@/components/search/index.vue";
 import AppTable from "@/components/table/index.vue";
 import { translationStatus } from "@/assets/js/utils.js";
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 // import { reqMapArr } from "./reqMap.js";
 const router = useRouter();
+const route = useRoute();
 const dataType = defineModel("dataType", {
   type: Number,
   required: true,
diff --git a/src/views/data_directory/basic/records.vue b/src/views/data_directory/basic/records.vue
index 594662d..9977d23 100644
--- a/src/views/data_directory/basic/records.vue
+++ b/src/views/data_directory/basic/records.vue
@@ -34,7 +34,7 @@
             link
             @click="
               router.push({
-                path: `/data_directory/records_detail`,
+                path: `${route.path}/records_detail`,
                 query: {
                   id: row.id,
                   dataType: route.query.dataType,
@@ -76,8 +76,13 @@ const { list, pagination, searchForm, getData, resetPagination, tableRef } =
       Object.keys(reqMap).forEach((key) => {
         reqMap[key] = searchForm[key] || "";
       });
+      const { dates = [] } = searchForm;
+      const [receiveBeginTime = "", receiveEndTime = ""] = dates;
       return {
         reqMap: reqMap,
+        receiveBeginTime,
+        receiveEndTime,
+        pushTime: "",
       };
     },
     params: () => ({
@@ -112,6 +117,11 @@ const optionsBase = [
     type: "select",
     options: pushOptions,
   },
+  {
+    key: "dates",
+    label: "上传时间",
+    type: "datetimerange",
+  },
 ];
 const options = [...optionsBase, ...reqMapOptions];
 
diff --git a/src/views/database/connect_enterprises_management/components/editDialog.vue b/src/views/database/connect_enterprises_management/components/editDialog.vue
index 2a9b11e..aaf26c5 100644
--- a/src/views/database/connect_enterprises_management/components/editDialog.vue
+++ b/src/views/database/connect_enterprises_management/components/editDialog.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog v-model="visible" :title="title" :before-close="fnClose">
+    {{ form }}
     <el-form
       ref="formRef"
       :rules="rules"
@@ -11,15 +12,6 @@
       <el-row :gutter="24">
         <form-items-renderer v-model="form" :options="baseInfoOptions">
           <template #area>
-            <!-- <el-cascader
-              v-model="form.area"
-              :options="dictionariesList"
-              :props="{
-                value: 'name',
-                label: 'name',
-                children: 'list',
-              }"
-            ></el-cascader> -->
             <app-area-cascader v-model="form.area" check-strictly />
           </template>
           <template #sectorId>
@@ -32,13 +24,19 @@
             ></app-cascader>
           </template>
           <template #address>
-            <el-input v-model="form.address" disabled>
-              <template #append
-                ><el-button type="primary" @click="handleMap"
+            <div style="display: flex; width: 100%">
+              <el-input v-model="form.address" disabled>
+                <!-- <template #append
+                >
+                <el-button type="primary" @click="handleMap"
                   >定位</el-button
                 ></template
-              ></el-input
-            >
+              > -->
+              </el-input>
+              <el-button class="ml-10" type="primary" @click="handleMap"
+                >定位</el-button
+              >
+            </div>
           </template>
         </form-items-renderer>
       </el-row>
@@ -331,7 +329,6 @@ const baseInfoOptions = [
   { key: "code", label: "统一社会信用代码" },
   { key: "area", label: "属地" },
   { key: "sectorId", label: "所属行业" },
-  { key: "address", label: "经营地址" },
   {
     key: "companyStatus",
     label: "企业状态",
@@ -349,6 +346,7 @@ const baseInfoOptions = [
     labelKey: "serviceName",
     options: servicePlatformList,
   },
+  { key: "address", label: "经营地址", span: 24 },
 ];
 
 const companyPropsOptions = [
@@ -475,7 +473,13 @@ const fnGetData = async () => {
   const { data } = await getBusCompanyInfo({ id: props.corpInfoId });
   form.value = data;
   form.value.area = form.value.province
-    ? [form.value.province, form.value.city, form.value.county]
+    ? [
+        form.value.province,
+        form.value.city,
+        form.value.county,
+        form.value.village,
+        form.value.street,
+      ]
     : [];
   form.value.sectorId = data.sectorId.split(",");
   form.value.address = form.value.longitude
@@ -505,7 +509,8 @@ const fnSubmit = debounce(
     const check = await checkThirdListItem();
     if (check) {
       const sectorName = sectorIdRef.value.getCheckedNodes();
-      const [province = "", city = "", county = ""] = form.value.area;
+      const [province = "", city = "", county = "", village = "", street = ""] =
+        form.value.area;
 
       const sectorId = form.value.sectorId.join(",");
       thirdList.value.forEach((item) => {
@@ -524,6 +529,8 @@ const fnSubmit = debounce(
         province,
         city,
         county,
+        village,
+        street,
         sectorName,
         thirdList: thirdList.value,
       };
diff --git a/src/views/database/superior_platform_management/components/dataItemsDialog.vue b/src/views/database/superior_platform_management/components/dataItemsDialog.vue
index b768419..8486b6c 100644
--- a/src/views/database/superior_platform_management/components/dataItemsDialog.vue
+++ b/src/views/database/superior_platform_management/components/dataItemsDialog.vue
@@ -105,6 +105,7 @@ const props = defineProps({
   resourceId: { type: String, required: false },
   menuId: { type: String, required: false },
 });
+const emits = defineEmits(["getData"]);
 const form = ref({
   tableName: "",
   resourceId: props.resourceId || "",
@@ -142,6 +143,7 @@ const fnFindByMenuId = async () => {
     edit: props.edit,
   });
   list.value = data.list;
+  form.value.tableName = data.tableName;
 };
 const fnChangeRequired = (row) => {
   if (row.isRequired === 1) {
@@ -173,6 +175,7 @@ const fnSubmit = debounce(
     };
     await setDataSave(params);
     ElMessage.success("操作成功");
+    emits("getData");
     visible.value = false;
   },
   { atBegin: true }
diff --git a/src/views/database/superior_platform_management/index.vue b/src/views/database/superior_platform_management/index.vue
index 0e0d548..f4214e0 100644
--- a/src/views/database/superior_platform_management/index.vue
+++ b/src/views/database/superior_platform_management/index.vue
@@ -61,6 +61,7 @@
       :edit="dataItemVisible.edit"
       :resource-id="dataItemVisible.resourceId"
       :menu-id="dataItemVisible.menuId"
+      @get-data="resetPagination"
     ></data-items-dialog>
     <view-info-dialog
       v-if="infoDialog.visible"