From dc35cb8354c60c02e0c37fc0d593fe5d49fb2cf7 Mon Sep 17 00:00:00 2001
From: dhr <2216804034@qq.com>
Date: Mon, 8 Sep 2025 15:44:35 +0800
Subject: [PATCH 1/3] 0908

---
 src/api/largeScreen/index.ts                  |  7 ++++
 src/views/equipment/equipmentGPS.vue          |  4 +--
 src/views/largeScreen/components/header.vue   | 32 ++++++++++++++++++-
 .../overallPlanMaterialSupply/index.vue       | 20 ++++++------
 .../landTransferLedger/index.vue              | 26 ++++++++++-----
 src/views/tender/supplierInput/index.vue      |  6 ++--
 6 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/src/api/largeScreen/index.ts b/src/api/largeScreen/index.ts
index 87acda0..6df57ff 100644
--- a/src/api/largeScreen/index.ts
+++ b/src/api/largeScreen/index.ts
@@ -98,3 +98,10 @@ export const cashTotal = () => {
     method: 'get'
   });
 };
+//安全天数
+export const getSafetyDay = (projectId) => {
+  return request({
+    url: '/money/big/screen/safetyDay/' + projectId,
+    method: 'get'
+  });
+};
diff --git a/src/views/equipment/equipmentGPS.vue b/src/views/equipment/equipmentGPS.vue
index 8a24dea..f5ad8ff 100644
--- a/src/views/equipment/equipmentGPS.vue
+++ b/src/views/equipment/equipmentGPS.vue
@@ -140,9 +140,9 @@ const createEarth = () => {
       // 加载底图
       loadBaseMap(earthInstance.viewer);
 
-      // 可以取消注释以下代码来设置初始视角
+      // // 可以取消注释以下代码来设置初始视角
       // YJ.Global.flyTo(earthInstance, view);
-      // YJ.Global.setDefaultView(earthInstance.viewer, view)
+      // YJ.Global.setDefaultView(earthInstance.viewer, view);
 
       // 地球创建完成后获取并渲染轨迹数据
       getTrajectoryData();
diff --git a/src/views/largeScreen/components/header.vue b/src/views/largeScreen/components/header.vue
index bd16c8e..3066b3e 100644
--- a/src/views/largeScreen/components/header.vue
+++ b/src/views/largeScreen/components/header.vue
@@ -6,7 +6,7 @@
       </div>
       <div style="font-size: 12px; padding-left: 10px">安全生产天数：</div>
       <div class="header_left_text">
-        1,235
+        {{ safetyDay }}
         <span style="font-size: 12px">天</span>
       </div>
     </div>
@@ -41,12 +41,42 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, onMounted } from 'vue';
+import { useUserStoreHook } from '@/store/modules/user';
+import { getSafetyDay } from '@/api/largeScreen/index';
+
 const week = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
 const date = ref({
   ymd: '',
   hms: '',
   week: 0
 });
+const safetyDay = ref('');
+const userStore = useUserStoreHook();
+const currentProject = computed(() => userStore.selectedProject);
+
+// 获取安全生产天数
+const getSafetyDays = async () => {
+  try {
+    console.log('currentProject', currentProject.value.id);
+
+    if (currentProject.value?.id) {
+      const res = await getSafetyDay(currentProject.value.id);
+      console.log('111111', res);
+
+      if (res.code === 200 && res.data) {
+        safetyDay.value = res.data.safetyDay.toString();
+      }
+    }
+  } catch (error) {
+    console.error('获取安全生产天数失败:', error);
+  }
+};
+
+// 组件挂载时获取数据
+onMounted(() => {
+  getSafetyDays();
+});
 const setTime = () => {
   let date1 = new Date();
   let year: any = date1.getFullYear();
diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue
index 4dc73a8..e15fd6f 100644
--- a/src/views/materials/overallPlanMaterialSupply/index.vue
+++ b/src/views/materials/overallPlanMaterialSupply/index.vue
@@ -38,7 +38,6 @@
       </template>
     </el-card>
 
-    <!-- 本地数据懒加载表格 -->
     <el-table
       :data="state.tableData"
       v-loading="state.loading.list"
@@ -52,15 +51,16 @@
       :load="loadLocalChildNodes"
       @expand-change="handleExpandChange"
     >
+      <!-- 1. 普通列：添加 align="center" 实现表头+单元格居中 -->
       <el-table-column align="center" prop="num" label="编号" />
-      <el-table-column prop="name" label="工程或费用名称" width="180" />
-      <el-table-column prop="unit" label="单位" />
-      <el-table-column prop="specification" label="规格型号" width="80" />
-      <el-table-column prop="quantity" label="数量" width="100" />
-      <el-table-column prop="batchNumber" label="批次号" width="200" />
+      <el-table-column align="center" prop="name" label="工程或费用名称" width="180" />
+      <el-table-column align="center" prop="unit" label="单位" />
+      <el-table-column align="center" prop="specification" label="规格型号" width="80" />
+      <el-table-column align="center" prop="quantity" label="数量" width="100" />
+      <el-table-column align="center" prop="batchNumber" label="批次号" width="200" />
 
-      <!-- 优化的输入框列 -->
-      <el-table-column prop="brand" label="品牌">
+      <!-- 2. 带输入框的列：添加 align="center" + 输入框内联样式 text-align: center -->
+      <el-table-column align="center" prop="brand" label="品牌">
         <template #default="{ row }">
           <el-input
             v-model.lazy="row.brand"
@@ -70,11 +70,12 @@
             clearable
             :key="`brand-${row.id}`"
             @change="handleInputChange(row, 'brand')"
+            style="text-align: center"
           />
         </template>
       </el-table-column>
 
-      <el-table-column prop="texture" label="材质">
+      <el-table-column align="center" prop="texture" label="材质">
         <template #default="{ row }">
           <el-input
             v-model.lazy="row.texture"
@@ -84,6 +85,7 @@
             clearable
             :key="`texture-${row.id}`"
             @change="handleInputChange(row, 'texture')"
+            style="text-align: center"
           />
         </template>
       </el-table-column>
diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
index 931ce16..a3a86c6 100644
--- a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
@@ -74,10 +74,10 @@
         <el-table-column label="设计面积(亩)" align="center" prop="designArea" width="180" />
         <el-table-column label="责任人" align="center" prop="responsiblePerson" />
         <el-table-column label="预计完成时间" align="center" prop="expectedFinishDate" width="180"> </el-table-column>
-        <el-table-column label="流转状态" align="center" prop="transferStatusName" />
+        <el-table-column label="流转状态" align="center" prop="type" />
         <el-table-column label="已流转面积(亩)" align="center" prop="transferArea" width="180" />
-        <el-table-column label="不流转数据" align="center" prop="noTrans" width="180" />
-        <el-table-column label="未流转数据" align="center" prop="noTransferAea" width="180" />
+        <el-table-column label="不流转面积(亩)" align="center" prop="noTrans" width="180" />
+        <el-table-column label="未流转面积(亩)" align="center" prop="noTransferAea" width="180" />
         <el-table-column label="流转比例(%)" align="center" width="180">
           <template #default="scope">
             {{ scope.row.transferArea && scope.row.designArea ? ((scope.row.transferArea / scope.row.designArea) * 100).toFixed(2) : '0.00' }}
@@ -120,7 +120,7 @@
           </div>
           <div class="summary-item transfer-area">
             <div class="summary-content">
-              <span class="summary-label">已流转面积</span>
+              <span class="summary-label">已流转面积(亩)</span>
               <span class="summary-value">{{ sonSummaryInfo.totalTransferArea }} 亩</span>
             </div>
             <el-icon class="summary-icon" :size="50" color="#3176ff">
@@ -129,7 +129,7 @@
           </div>
           <div class="summary-item non-transfer-area">
             <div class="summary-content">
-              <span class="summary-label">不流转面积</span>
+              <span class="summary-label">不流转面积(亩)</span>
               <span class="summary-value">{{ sonSummaryInfo.totalNonTransferArea }} 亩</span>
             </div>
             <el-icon class="summary-icon" :size="50" color="#3176ff">
@@ -138,7 +138,7 @@
           </div>
           <div class="summary-item remaining-area">
             <div class="summary-content">
-              <span class="summary-label">未流转面积</span>
+              <span class="summary-label">未流转面积(亩)</span>
               <span class="summary-value">{{ sonSummaryInfo.remainingArea }} 亩</span>
             </div>
             <el-icon class="summary-icon" :size="50" color="#3176ff">
@@ -292,7 +292,7 @@
             <el-form-item label="已流转面积(亩)" prop="areaValue">
               <el-input v-model="sonForm.areaValue" type="number" placeholder="请输入已流转面积" @input="calcSonTransferRatio" />
               <div style="color: #ff4d4f; font-size: 12px; margin-top: 4px">
-                {{ sonForm.areaValue && sonForm.transferStatus == '1' ? `提示：已流转面积不能超过设计面积 ${sonForm.designArea} 亩` : '' }}
+                {{ sonForm.areaValue && sonForm.transferStatus == '1' ? `提示：当前剩余${sonSummaryInfo.remainingArea} 亩未流转面积` : '' }}
               </div>
             </el-form-item>
           </el-col>
@@ -325,7 +325,7 @@
             <el-form-item label="不流转面积(亩)" prop="areaValue">
               <el-input v-model="sonForm.areaValue" type="number" placeholder="请输入不流转面积" />
               <div style="color: #ff4d4f; font-size: 12px; margin-top: 4px">
-                {{ sonForm.areaValue && sonForm.transferStatus == '2' ? `提示：不流转面积不能超过设计面积 ${sonForm.designArea} 亩` : '' }}
+                {{ sonForm.areaValue && sonForm.transferStatus == '2' ? `提示：当前剩余 ${sonSummaryInfo.remainingArea} 亩未流转面积` : '' }}
               </div>
             </el-form-item>
           </el-col>
@@ -751,6 +751,16 @@ const sonRules = {
   projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
   parentId: [{ required: true, message: '父级ID不能为空', trigger: 'blur' }],
   landType: [{ required: true, message: '土地类型不能为空', trigger: 'change' }],
+  landRent: [{ required: true, message: '土地租金不能为空', trigger: 'blur' }],
+  seedlingCompensation: [{ required: true, message: '青苗赔偿不能为空', trigger: 'blur' }],
+  totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }],
+  statusDescription: [{ required: true, message: '状态说明不能为空', trigger: 'blur' }],
+  issueSummary: [{ required: true, message: '问题总结不能为空', trigger: 'blur' }],
+  nextStrategy: [{ required: true, message: '下一步策略不能为空', trigger: 'blur' }],
+  noContractArea: [{ required: true, message: '不签约面积不能为空', trigger: 'blur' }],
+  noSurveyArea: [{ required: true, message: '不测量面积不能为空', trigger: 'blur' }],
+  noContractReason: [{ required: true, message: '不签约原因不能为空', trigger: 'blur' }],
+  nonTransferReason: [{ required: true, message: '不流转原因不能为空', trigger: 'blur' }],
   transferRatio: [
     {
       required: true,
diff --git a/src/views/tender/supplierInput/index.vue b/src/views/tender/supplierInput/index.vue
index e94b3ab..3709164 100644
--- a/src/views/tender/supplierInput/index.vue
+++ b/src/views/tender/supplierInput/index.vue
@@ -223,8 +223,8 @@
         <!-- 第十行：安全生产许可证有效期（仅劳务类型显示） -->
         <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
           <el-col :span="12">
-            <el-form-item label="安全生产许可证发证日期" prop="safeCertificateValidity">
-              <el-date-picker v-model="form.safeCertificateValidity" type="date" placeholder="请选择发证日期" />
+            <el-form-item label="安全生产许可证有效期" prop="safeCertificateValidity">
+              <el-date-picker v-model="form.safeCertificateValidity" type="date" placeholder="请选择有效期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -243,7 +243,7 @@
             <el-form-item label="注册造价工程师" prop="registeredEngineerNumber">
               <el-input v-model="form.registeredEngineerNumber" placeholder="请输入注册造价工程师数量" clearable />
             </el-form-item>
-            <el-form-item label="其他（分别写）" prop="otherBuildingNumber">
+            <el-form-item label="其他人员数量" prop="otherBuildingNumber">
               <el-input v-model="form.otherBuildingNumber" placeholder="请输入其他人员数量" clearable />
             </el-form-item>
           </el-col>

From 177da7a28ae9fb36455f0de9724c45ffdec83634 Mon Sep 17 00:00:00 2001
From: dhr <2216804034@qq.com>
Date: Tue, 9 Sep 2025 09:42:28 +0800
Subject: [PATCH 2/3] 0909

---
 src/api/largeScreen/index.ts                  |   8 +
 src/views/ProjectScreen/components/header.vue |  77 +++---
 src/views/largeScreen/components/header.vue   | 244 ++++++++++++++----
 .../overallPlanMaterialSupply/indexEdit.vue   |  22 +-
 .../landTransferLedger/index.vue              |   4 +-
 src/views/system/menu/index.vue               |  14 +-
 6 files changed, 255 insertions(+), 114 deletions(-)

diff --git a/src/api/largeScreen/index.ts b/src/api/largeScreen/index.ts
index 6df57ff..e5ef999 100644
--- a/src/api/largeScreen/index.ts
+++ b/src/api/largeScreen/index.ts
@@ -105,3 +105,11 @@ export const getSafetyDay = (projectId) => {
     method: 'get'
   });
 };
+
+//安全天数
+export const getWeather = (projectId) => {
+  return request({
+    url: '/money/big/screen/weather/' + projectId,
+    method: 'get'
+  });
+};
diff --git a/src/views/ProjectScreen/components/header.vue b/src/views/ProjectScreen/components/header.vue
index 5450f69..e4679a5 100644
--- a/src/views/ProjectScreen/components/header.vue
+++ b/src/views/ProjectScreen/components/header.vue
@@ -19,8 +19,12 @@
         <!-- 左侧：天气图标 + 日期文字 -->
         <div class="left-section">
           <div class="weather-list" @mouseenter="requestPause" @mouseleave="resumeScroll">
-            <div v-for="(item, i) in weatherList" :key="i" class="weather-item"
-              :style="{ transform: `translateY(-${offsetY}px)`, transition: transition }">
+            <div
+              v-for="(item, i) in weatherList"
+              :key="i"
+              class="weather-item"
+              :style="{ transform: `translateY(-${offsetY}px)`, transition: transition }"
+            >
               <img :src="`../../../src/assets/images/${item.icon}.png`" alt="" />
               <div>{{ item.weather }}{{ item.tempMin }}°/{{ item.tempMax }}°</div>
               <div>{{ item.week }}({{ item.date }})</div>
@@ -78,15 +82,15 @@ const props = defineProps({
     type: Boolean,
     default: false
   }
-})
+});
 
-const emit = defineEmits(['changePage'])
+const emit = defineEmits(['changePage']);
 
 const safetyDay = ref<number>(0);
-const weatherList = ref<Weather[]>([])
-const timer = ref<number | null>(0)
-const offsetY = ref<number>(0)
-const curIndex = ref(0)
+const weatherList = ref<Weather[]>([]);
+const timer = ref<number | null>(0);
+const offsetY = ref<number>(0);
+const curIndex = ref(0);
 const transition = ref('transform 0.5s ease');
 const pendingPause = ref(false);
 
@@ -106,18 +110,16 @@ function judgeDayOrNight(sunRise: string, sunSet: string) {
   const now = new Date();
   const currentMinutes = now.getHours() * 60 + now.getMinutes();
   // true 白天 false 夜晚
-  return currentMinutes >= sunRiseMinutes && currentMinutes <= sunSetMinutes
-    ? true
-    : false;
+  return currentMinutes >= sunRiseMinutes && currentMinutes <= sunSetMinutes ? true : false;
 }
 
 /**
  * 设置天气周期滑动
  */
 const setWeatherScroll = () => {
-  curIndex.value += 1
+  curIndex.value += 1;
   transition.value = 'transform 0.3s ease';
-  offsetY.value = curIndex.value * 60
+  offsetY.value = curIndex.value * 60;
 
   if (curIndex.value === weatherList.value.length - 1) {
     setTimeout(() => {
@@ -126,7 +128,7 @@ const setWeatherScroll = () => {
       offsetY.value = 0;
     }, 350);
   }
-}
+};
 
 function startScroll() {
   if (timer.value) clearInterval(timer.value);
@@ -135,57 +137,56 @@ function startScroll() {
 
 function requestPause() {
   if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
+    clearInterval(timer.value);
+    timer.value = null;
   }
   pendingPause.value = true;
 }
 
 function resumeScroll() {
-  console.log('resumeScroll')
+  console.log('resumeScroll');
   pendingPause.value = false;
   startScroll();
 }
 
-
 onMounted(() => {
   /**
    * 获取安全生产天数
    */
-  getScreenSafetyDay(props.projectId).then(res => {
-    const { data, code } = res
+  getScreenSafetyDay(props.projectId).then((res) => {
+    const { data, code } = res;
     if (code === 200) {
       safetyDay.value = data.safetyDay;
     }
-  })
+  });
   /**
    * 获取近三天天气
    */
-  getScreenWeather(props.projectId).then(res => {
-    const { data, code } = res
+  getScreenWeather(props.projectId).then((res) => {
+    const { data, code } = res;
     if (code === 200) {
-      data.forEach(item => {
+      data.forEach((item) => {
         if (judgeDayOrNight(item.sunRise, item.sunSet)) {
-          item.weather = item.dayStatus
-          item.icon = item.dayIcon
+          item.weather = item.dayStatus;
+          item.icon = item.dayIcon;
         } else {
-          item.weather = item.nightStatus
-          item.icon = item.nightIcon
+          item.weather = item.nightStatus;
+          item.icon = item.nightIcon;
         }
-      })
-      weatherList.value = data
+      });
+      weatherList.value = data;
       // 多添加第一项 实现无缝衔接
-      weatherList.value = [...weatherList.value, weatherList.value[0]]
-      startScroll()
+      weatherList.value = [...weatherList.value, weatherList.value[0]];
+      startScroll();
     }
-  })
+  });
 });
 
 onUnmounted(() => {
   if (timer.value) {
-    clearInterval(timer.value)
+    clearInterval(timer.value);
   }
-})
+});
 </script>
 
 <style scoped lang="scss">
@@ -228,13 +229,13 @@ onUnmounted(() => {
   text-align: center;
 }
 
-.title>div:first-child {
+.title > div:first-child {
   /* 第一个子元素的样式 */
   font-size: 38px;
   letter-spacing: 0.1em;
 }
 
-.title>div:last-child {
+.title > div:last-child {
   /* 最后一个子元素的样式 */
   font-size: 14px;
 }
@@ -267,7 +268,7 @@ onUnmounted(() => {
       display: flex;
       align-items: center;
 
-      &>div:last-child {
+      & > div:last-child {
         margin-left: 10px;
       }
 
diff --git a/src/views/largeScreen/components/header.vue b/src/views/largeScreen/components/header.vue
index 3066b3e..c8f9a4b 100644
--- a/src/views/largeScreen/components/header.vue
+++ b/src/views/largeScreen/components/header.vue
@@ -16,14 +16,20 @@
     </div>
     <div class="right">
       <div class="top-bar">
-        <!-- 左侧：天气图标 + 日期文字 -->
+        <!-- 左侧：天气轮播区域 -->
         <div class="left-section">
-          <img src="@/assets/large/weather.png" alt="天气图标" />
-
-          <span>
-            <span>多云 9°/18°</span>
-            <span style="padding-left: 20px"> {{ week[date.week] }} ({{ date.ymd }})</span>
-          </span>
+          <div class="weather-list" @mouseenter="requestPause" @mouseleave="resumeScroll">
+            <div
+              v-for="(item, i) in weatherList"
+              :key="i"
+              class="weather-item"
+              :style="{ transform: `translateY(-${offsetY}px)`, transition: transition }"
+            >
+              <img :src="`../../../src/assets/images/${item.icon}.png`" alt="" />
+              <div>{{ item.weather }}{{ item.tempMin }}°/{{ item.tempMax }}°</div>
+              <div>{{ item.week }}({{ item.date }})</div>
+            </div>
+          </div>
         </div>
         <!-- 分割线 -->
         <div class="divider">
@@ -41,29 +47,141 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed, onMounted, onUnmounted } from 'vue';
 import { useUserStoreHook } from '@/store/modules/user';
-import { getSafetyDay } from '@/api/largeScreen/index';
+import { getSafetyDay, getWeather } from '@/api/largeScreen/index';
 
+interface WeatherData {
+  date: string;
+  week: string;
+  tempMax: string;
+  tempMin: string;
+  sunRise: string;
+  sunSet: string;
+  dayStatus: string;
+  dayIcon: string;
+  nightStatus: string;
+  nightIcon: string;
+}
+
+// 星期映射
 const week = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+// 日期数据
 const date = ref({
   ymd: '',
   hms: '',
   week: 0
 });
+// 安全生产天数
 const safetyDay = ref('');
+// 用户存储
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
 
+// 天气轮播相关变量
+const weatherList = ref<WeatherData[]>([]);
+const offsetY = ref<number>(0);
+const curIndex = ref(0);
+const transition = ref('transform 0.5s ease');
+const timer = ref<number | null>(0);
+const pendingPause = ref(false);
+
+// 判断当前时间是白天/夜晚
+function judgeDayOrNight(sunRise: string, sunSet: string) {
+  const timeToMinutes = (timeStr: string) => {
+    const [hours, minutes] = timeStr.split(':').map(Number);
+    return isNaN(hours) || isNaN(minutes) ? 0 : hours * 60 + minutes;
+  };
+  const sunRiseMinutes = timeToMinutes(sunRise);
+  const sunSetMinutes = timeToMinutes(sunSet);
+  const now = new Date();
+  const currentMinutes = now.getHours() * 60 + now.getMinutes();
+  return currentMinutes >= sunRiseMinutes && currentMinutes <= sunSetMinutes;
+}
+
+// 天气轮播逻辑：每5秒切换一次
+const setWeatherScroll = () => {
+  curIndex.value += 1;
+  transition.value = 'transform 0.3s ease';
+  offsetY.value = curIndex.value * 60; // 每个天气项高度60px，需和样式一致
+
+  // 轮播到最后一项时，无缝衔接回第一项
+  if (curIndex.value === weatherList.value.length - 1) {
+    setTimeout(() => {
+      transition.value = 'none';
+      curIndex.value = 0;
+      offsetY.value = 0;
+    }, 350);
+  }
+};
+
+// 启动轮播定时器
+function startScroll() {
+  if (timer.value) clearInterval(timer.value);
+  timer.value = window.setInterval(setWeatherScroll, 5000) as unknown as number;
+}
+
+// 鼠标悬浮暂停轮播
+function requestPause() {
+  if (timer.value) {
+    clearInterval(timer.value);
+    timer.value = null;
+  }
+  pendingPause.value = true;
+}
+
+// 鼠标离开恢复轮播
+function resumeScroll() {
+  pendingPause.value = false;
+  startScroll();
+}
+
+// 设置实时时间
+const setTime = () => {
+  const date1 = new Date();
+  const year = date1.getFullYear();
+  const month = date1.getMonth() + 1;
+  const day = date1.getDate();
+  const hours = date1.getHours().toString().padStart(2, '0');
+  const minutes = date1.getMinutes().toString().padStart(2, '0');
+  const seconds = date1.getSeconds().toString().padStart(2, '0');
+
+  date.value.ymd = `${year}-${month}-${day}`;
+  date.value.hms = `${hours}:${minutes}:${seconds}`;
+  date.value.week = date1.getDay();
+};
+
+// 获取天气数据
+const getWeatherData = async () => {
+  try {
+    if (currentProject.value?.id) {
+      const res = await getWeather(currentProject.value.id);
+      if (res.code === 200 && res.data && res.data.length > 0) {
+        weatherList.value = res.data;
+
+        // 处理每一天的天气（白天/夜晚切换图标和状态）
+        weatherList.value.forEach((item) => {
+          const isDay = judgeDayOrNight(item.sunRise, item.sunSet);
+          item.status = isDay ? item.dayStatus : item.nightStatus;
+          item.icon = isDay ? item.dayIcon : item.nightIcon;
+          item.tempRange = `${item.tempMin}°/${item.tempMax}°`;
+        });
+
+        // 复制第一项实现无缝轮播
+        weatherList.value = [...weatherList.value, weatherList.value[0]];
+        startScroll(); // 数据加载后启动轮播
+      }
+    }
+  } catch (error) {
+    console.error('获取天气数据失败:', error);
+  }
+};
+
 // 获取安全生产天数
 const getSafetyDays = async () => {
   try {
-    console.log('currentProject', currentProject.value.id);
-
     if (currentProject.value?.id) {
       const res = await getSafetyDay(currentProject.value.id);
-      console.log('111111', res);
-
       if (res.code === 200 && res.data) {
         safetyDay.value = res.data.safetyDay.toString();
       }
@@ -73,36 +191,20 @@ const getSafetyDays = async () => {
   }
 };
 
-// 组件挂载时获取数据
+// 组件挂载时初始化
 onMounted(() => {
+  setTime(); // 初始化时间
   getSafetyDays();
+  getWeatherData();
+  // 时间定时器（每秒更新）
+  window.setInterval(setTime, 1000);
 });
-const setTime = () => {
-  let date1 = new Date();
-  let year: any = date1.getFullYear();
-  let month: any = date1.getMonth() + 1;
-  let day: any = date1.getDate();
-  let hours: any = date1.getHours();
-  if (hours < 10) {
-    hours = '0' + hours;
-  }
-  let minutes: any = date1.getMinutes();
-  if (minutes < 10) {
-    minutes = '0' + minutes;
-  }
-  let seconds: any = date1.getSeconds();
-  if (seconds < 10) {
-    seconds = '0' + seconds;
-  }
-  date.value.ymd = year + '-' + month + '-' + day;
-  date.value.hms = hours + ':' + minutes + ':' + seconds;
-  date.value.week = date1.getDay();
-};
-// 添加定时器，每秒更新一次时间
-const timer = setInterval(setTime, 1000);
+
 // 组件卸载时清除定时器
 onUnmounted(() => {
-  clearInterval(timer);
+  if (timer.value) {
+    clearInterval(timer.value);
+  }
 });
 </script>
 
@@ -116,41 +218,47 @@ onUnmounted(() => {
   grid-template-columns: 1fr 1fr 1fr;
   color: #fff;
 }
+
 .header_left {
   display: flex;
   align-items: center;
+
   .header_left_img {
     width: 48px;
     height: 48px;
     box-sizing: border-box;
     // padding-right: 10px;
   }
+
   .header_left_text {
     font-weight: 500;
     text-shadow: 0px 1.24px 6.21px rgba(25, 179, 250, 1);
   }
 }
+
+.header_right {
+  width: 100%;
+  height: 100%;
+  display: flex;
+}
+
 .title {
   color: #fff;
   font-family: 'AlimamaShuHeiTi', sans-serif;
   text-align: center;
 }
+
 .title > div:first-child {
   /* 第一个子元素的样式 */
   font-size: 38px;
-  //   font-weight: 300;
+  letter-spacing: 0.1em;
 }
 
 .title > div:last-child {
   /* 最后一个子元素的样式 */
   font-size: 14px;
-  letter-spacing: 0.3em; /* 调整这个值来控制间距大小 */
-}
-.right {
-  width: 100%;
-  height: 100%;
-  display: flex;
 }
+
 /* 顶部栏容器：Flex 水平布局 + 垂直居中 */
 .top-bar {
   width: 100%;
@@ -158,27 +266,44 @@ onUnmounted(() => {
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  //   background-color: #1e2128;
   color: #fff;
   padding: 8px 16px;
   font-size: 14px;
 }
+
 /* 左侧区域（天气 + 日期）：自身也用 Flex 水平排列，确保元素在一行 */
 .left-section {
+  height: 100%;
   display: flex;
   align-items: center;
-  //   margin-right: auto; /* 让右侧元素（管理系统）居右 */
-}
-.left-section img {
-  width: 32px;
-  height: 32px;
-  margin-right: 8px; /* 图标与文字间距 */
+
+  .weather-list {
+    height: 60px;
+    overflow: hidden;
+
+    .weather-item {
+      height: 60px;
+      line-height: 60px;
+      display: flex;
+      align-items: center;
+
+      & > div:last-child {
+        margin-left: 10px;
+      }
+
+      img {
+        width: 50px;
+        height: 50px;
+      }
+    }
+  }
 }
+
 /* 分割线（视觉分隔，可根据需求调整样式） */
 .divider {
   display: grid;
   grid-template-rows: 1fr 1fr;
-  height: 100%; /* 根据需要调整高度 */
+  gap: 2px;
   padding: 14px 10px;
 }
 
@@ -195,16 +320,27 @@ onUnmounted(() => {
   background: #19b5fb;
   align-self: end;
 }
+
 /* 右侧区域（管理系统）：图标 + 文字水平排列 */
 .right-section {
   display: flex;
   align-items: center;
   font-family: 'AlimamaShuHeiTi', sans-serif;
   font-size: 20px;
+  cursor: pointer;
 }
+
 .right-section img {
   width: 20px;
   height: 20px;
-  margin-right: 6px; /* 图标与文字间距 */
+  margin-right: 6px;
+  /* 图标与文字间距 */
+}
+
+.change {
+  display: grid;
+  place-items: center;
+  margin-right: 10px;
+  cursor: pointer;
 }
 </style>
diff --git a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
index 56c849b..0781865 100644
--- a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
+++ b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
@@ -73,12 +73,12 @@
             </el-row>
           </el-form> -->
           <el-table :data="tableData" v-loading="loading" row-key="id" border>
-            <el-table-column prop="num" label="编号" />
-            <el-table-column prop="name" label="名称" />
-            <el-table-column prop="specification" label="规格" />
-            <el-table-column prop="unit" label="单位" />
-            <el-table-column prop="quantity" label="数量" />
-            <el-table-column prop="remark" label="备注" />
+            <el-table-column align="center" prop="num" label="编号" />
+            <el-table-column align="center" prop="name" label="名称" />
+            <el-table-column align="center" prop="specification" label="规格" />
+            <el-table-column align="center" prop="unit" label="单位" />
+            <el-table-column align="center" prop="quantity" label="数量" />
+            <el-table-column align="center" prop="remark" label="备注" />
           </el-table>
         </div>
       </el-card>
@@ -214,7 +214,7 @@ const getInfo = () => {
     console.log('res.data', masterDataRes);
     Object.assign(form.value, masterDataRes?.data[0]);
     // console.log('form', form.value);
-    tableData.value = res.rows.reverse();//翻转
+    tableData.value = res.rows; //正序显示
     loading.value = false;
     buttonLoading.value = false;
   });
@@ -319,9 +319,7 @@ onMounted(() => {
   .el-input__inner,
   .el-select .el-input__inner {
     border-radius: 4px;
-    transition:
-      border-color 0.2s,
-      box-shadow 0.2s;
+    transition: border-color 0.2s, box-shadow 0.2s;
 
     &:focus {
       border-color: var(--primary-light);
@@ -331,9 +329,7 @@ onMounted(() => {
 
   .el-textarea__inner {
     border-radius: 4px;
-    transition:
-      border-color 0.2s,
-      box-shadow 0.2s;
+    transition: border-color 0.2s, box-shadow 0.2s;
 
     &:focus {
       border-color: var(--primary-light);
diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
index a3a86c6..e92ea01 100644
--- a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
@@ -292,7 +292,7 @@
             <el-form-item label="已流转面积(亩)" prop="areaValue">
               <el-input v-model="sonForm.areaValue" type="number" placeholder="请输入已流转面积" @input="calcSonTransferRatio" />
               <div style="color: #ff4d4f; font-size: 12px; margin-top: 4px">
-                {{ sonForm.areaValue && sonForm.transferStatus == '1' ? `提示：当前剩余${sonSummaryInfo.remainingArea} 亩未流转面积` : '' }}
+                {{ sonForm.areaValue && sonForm.transferStatus == '1' ? `提示：当前剩余${sonSummaryInfo.remainingArea} 亩` : '' }}
               </div>
             </el-form-item>
           </el-col>
@@ -325,7 +325,7 @@
             <el-form-item label="不流转面积(亩)" prop="areaValue">
               <el-input v-model="sonForm.areaValue" type="number" placeholder="请输入不流转面积" />
               <div style="color: #ff4d4f; font-size: 12px; margin-top: 4px">
-                {{ sonForm.areaValue && sonForm.transferStatus == '2' ? `提示：当前剩余 ${sonSummaryInfo.remainingArea} 亩未流转面积` : '' }}
+                {{ sonForm.areaValue && sonForm.transferStatus == '2' ? `提示：当前剩余 ${sonSummaryInfo.remainingArea} 亩` : '' }}
               </div>
             </el-form-item>
           </el-col>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 540bb57..872df4a 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -46,16 +46,16 @@
         :load="loadChildren"
         :has-children="hasChildren"
       >
-        <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
-        <el-table-column prop="icon" label="图标" align="center" width="100">
+        <el-table-column align="center" prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
+        <el-table-column align="center" prop="icon" label="图标" width="100">
           <template #default="scope">
             <svg-icon :icon-class="scope.row.icon" />
           </template>
         </el-table-column>
-        <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
-        <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="status" label="状态" width="80">
+        <el-table-column align="center" prop="orderNum" label="排序" width="60"></el-table-column>
+        <el-table-column align="center" prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column align="center" prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column align="center" prop="status" label="状态" width="80">
           <template #default="scope">
             <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
           </template>
@@ -65,7 +65,7 @@
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180">
+        <el-table-column align="center" fixed="right" label="操作" width="180">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
               <el-button v-hasPermi="['system:menu:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)" />

From 84246a3a615d31e2aa3ca0c033d4cc8062d7d745 Mon Sep 17 00:00:00 2001
From: dhr <2216804034@qq.com>
Date: Tue, 9 Sep 2025 10:37:05 +0800
Subject: [PATCH 3/3] 0909

---
 .env.development                             |   2 +-
 public/xx.xlsx                               | Bin 0 -> 10871 bytes
 src/api/supplierInput/supplierInput/index.ts |  19 ++++
 src/views/tender/supplierInput/index.vue     |  92 +++++++++++++++++--
 4 files changed, 106 insertions(+), 7 deletions(-)
 create mode 100644 public/xx.xlsx

diff --git a/.env.development b/.env.development
index d3e8059..519f596 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+VITE_APP_BASE_API = 'http://192.168.110.149:8899'
 # 李陈杰 209
 # VITE_APP_BASE_API = 'http://192.168.110.209:8899'
 # 曾涛
diff --git a/public/xx.xlsx b/public/xx.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..fb25b99e7eead984a3897e39476344c1e68a3430
GIT binary patch
literal 10871
zcmbt)Wmp``)-Dbq*kHlkg1fuByL)gM+}(mp2s*)oTae)Ht|7sKTW|;(xI=Qz-aGlu
zcb@0oTR&=gx|dYFRlTa0D9b^^AVNH~2*q{br{90KXW$ESM>A!hqmv7hGMEe#d;{Sp
z8HL&)qaY*%ga8x-1lm8zOq`q;J?-tX6T4)4gfS(qf*+Yj+q3H;rPB*A#a-v<OYc~`
ztl^W=O}24$uWq6DWw{s;AA*!8tE@XGoRR{I_J^1KT!^o-M@~*_2W6hk%T$Q+?!u=8
z%DU3d@fYlTNL~R@qJ+sxRAPm?!p6nr{}3S3v+vA<k@5`%k{Xa?0L&P5gh};R7l--M
z8^VNzzVOWGP+@S-4{1Omer85M!KDYNBU(@R!cKEKtFH%$sb$al9+@_<5^=9%m;uuf
zE*SEo07QwsGi>9{$M=}x%Y4|=&5>`pX-P%wqmn<h-y|f-t>q{pS-&jDMDzo;&7;JQ
z$BN-=R2>{H&J3JCf3@Pciuc*z(8dc5IRlo-{l!6GY7c%(C|eZIM{Dfo(E$*s&7H_%
z(TnSLtHfnvewR*q%jIQb%S@9+%|bUD2zL)xyBNP?opN5PssP5?1dKJ{pIDnY0xh1v
zj!jyX?P133KZae+-E3F*QetJrci$uIM8mDp`h4iKrrmUcc#A;zHO|VNqR;ag_cB6n
z(oL$JyEDF39ty%LbKKUT8i_(yOeq-H98XHb`oYN_J9JQ9CvOo99UUyLZivLj{Rzod
z#@TRZb_qL<Rv<FJjLxuIc<Q+I>zXaOgi*<r+*a<Y81r$XF(})9qXj4@(ZOe_U(<}^
z*5GjVL6Hs8T|Nc=92U>f2*jSDr+na!Griw%GcNdXE>eb+RqJGX`07hPVJ+-&?@C*(
zgk$*uZ>f|$(mSDkrJ2k-_t|RYu}bb7eyl7Y^r!}v(A5kh>Bp8f#nYUn@@n&Wg&z$&
zu#wSj?Ou;dzP^Rmjq6_a_b7;DCqY&(0^ak-F;-b(q)=1vpbVu8u_aA<ia+ymz&mbp
zgmQ;%vVU|mO`6R26kdWn<Ggx!KiC2JJNCU6a#3_(>;YixF@D3|&BfKx{t5lUL=oE%
zW}NWjkRK5VKJxNqb9vaY*!?JU<p*xkF%>yc6g7IdcgJ#j%{4uYi>DhtUY;w*a++0Q
zsBxm1ibI&UL_xyRl^KdhYS(oJ`3O*Ewx4I)lE}iSO}^5$w8?Pl#)>W~;(SG$E;unh
z{Mfs25`ts1(Nyo6skxWi;4te`{-t3fPu&+Uv@Q)D-Bb{_436D@?Q2*g|CbIj{Jsfy
z%SM4%MJ_qPHR?%}23yr@O}KJ;Xmk?YKBSvoCT0HU7m?zjlfkuaSz5<vF+0p*!t)_z
z{sZoDZgnI6zAT!rykvmb40$>dKfD0g61Z4X{6^IzNIGxeCj=EvJovk`VgnGzDn+m2
zQ7d1uIqS(AtbPl9Sd)?wPE-=OQjebw?C<#e^}L?3V^k303ETf{YM{Z`dfNRoGXI$X
z<rjg6Bhc2x%EH3+PlH4+cP$bH3jyJZ2LXZeKWKllu>5>iK7R(5%3{KOy;E~r30n7$
zPDm@6HQ=5&_m!%SRTo|oHvPW%Zq8WhX3f|E%D<dww;qDBZ`CM{!H;#KaY;-@)5S~2
z6n<t|H=;3#{~d?Fz)%t~PDF)C3%q91BdgJa!Nb+N^`Xm^9|C4U;sONsNv){C8_{{!
z+aR9scP{bYgr(docW@y6E><ufcUjEvIe~T(BRj;H1Jx+N*`DaDWWlB7aaNr%4j}?}
zggixlOMJ+&)m1$yql@qLKU4zrCb*}XUf<{|)L;|d94WOajZW0aPh2h=B(NDsMHQv;
zkG$IAaR<ev@6uS*5cK#wazEt7#k&HlQte>_dS<XNOuGu-&FrP{5&p>X;+|Ny37VA(
zgPlVaa>~vC-~gL&ER8o`ZmrMfX>69f<!_)HYQD|W0-5uoh11i!pH+P??DWiL%}j?}
zRIM09uL{!o<hK)KpT~d9kMz|5&(hehmiEJ8QmgWDaoj^_{)r!+=nc_^w^7U|gagY>
z8NCKJ!EZVHU*v4@zsa3_ptoBG>5h6Y!n3Eh=!>K-#dkKKln)4|E5OU0krNNP+V8)4
zkd5oJ)lVhZpvwrD&39*#v-~K$Lptm7p*YChL3mMZR=BW+6>qX6oP6^8l5oBV8{Xu#
z3G|oOaG%xkPJ7_$u+;Jn*v&#CTz=l$Iq`H5)?+FB=8|*T^K$C@D{^I`Cn994Ft%}#
zLLapS(XGO(eEDKB4__(vCYINOL{-{T6h6)xi9+q<8A~`4<_T|;tdg<;8k-5nkyKn%
zRJFy1)7m+g<GSXFQkO}C5%?Gw>FP`+^yZ(cs8okM#&>{bruXQGAF2#gb#mr$ck-gt
z&z|eYh^EeoZ%VXmZh^3w%Ay9N-G}7X`f13RzGxUaWJN#yf6lbO*_*QK|6;}92DwB3
zVkuc1RZO?@MDr%ary%(}9xlM9jA@p1nb0dx5s+mbbyO_4_ln0zU2yNa9f+KE2!Vr0
zMM2W)G*Xv!osmdINpfj`9B(L6ls_*$#xqi?E(s8S8tKlu{*q`)Mv{Mkym<%#3%mX;
zI#k&grDs7Fgax6U%_wT3#wJoPNvmr&QqZ)&$jBm;AF@-zV0)y3$@rAQt*V=&!4H-#
zzz>dSDPc4{vcV5pWS#}h&8abpBByF8H6hiH+|s(X1sGkpMk6rYJ~plIF&mufUi(F?
zLeU~<gyM-3<_1lQTanfQco7UjiA0G_0-42eNMit02x_6Y-2^5<)#BQu<p55EW>CVx
zQlCvAk)#fXaKr{jpt3|U=_~*bK_L`d6hAj)Qev0%0sw~~77FObF$rdtNFyBuU?a$d
zVs+!0gybANE76xJhug(h)<m9M^F$_52iPFEg~Ewq<c3X3?vl6yyb=6DA-mB`LYXDg
zNaO*Q2ri+p-RLG^)shP&yWXO-TIgkv-f-q~5CP)7AlU!w!4JRbwF&gk2lErgeS#3h
z$_-bRvLayz=pxvMqKLl8jhK|eAwdF2BAA6f>&7$*XO_|?p$BLp*oGnpS5g-MDQoa@
zh_nB{=FTAc|2X&E*ar{Re7s1*HYuivxPJTt{FO|%6UxlP-7zIWDTxh<<GG$6odV&q
z6De9;IgjL#N<Oz9DEUUQHw1o%OHB?Wf|GhzyV~U94-JoZj}lvt|K%)r`s@Us1+G>W
z_7;D9cFGf`PA-D2JPGcv<M=PKpTs{6{GpD5BR&^e+l$=*?Qd;~<_F}gWbh4w>s0RO
z;<B#^N(^k?0z8^XUh*|#4b=z-<ylY31+93~e1Ve=G@Lft;FQROx_M3r)S^?(vl$p9
zWiU0OILchx7(GF5Y6f1Kh_;!H!kSnQR2h`s5-CDsC$aBedq{=EGv0v`XpjLGFORNW
z=<mx~i2a>l4+n9m7ohLdzvaXc%cUQx(~<?6P%zdYy+5(*_6(-*-BO|4+=aQPs;kwg
z;G}y-R&rcO1KHR}g@JAy;IY=A)a5}NhKE2yO#9xG5MR+2k#svxuE`_DY9Inv)Sa~(
zweVPlf`WhdTI0u#mV1@@q@s!V7Mxy>L(U^&OE*cD!yb<pJ0o?)C;ZE8!#yMDV*P<j
zy&skxI=3?rm@w7TS<!nRYF1Z{IS|VshlO~3uXNiEGs3v;9jlyIY>NY)SBW$|-s1T)
z?}}nFw8Cv&_v5u2I@-G(U>k-2eO-`OOOG!18NgI5lzXno2KMZYEzxtS3D5H36+K&2
zi0c{<cjPeD#dHj8UO$uDD$<pkgzkrjP!@hoAtS&uaRLLY++iR-l!kGfAYP+BlS3F2
zvvZ?NG9Nx0147^)G9TywkuCt_s;Z3cuW$R<jxVF%zmEsK6TIEJINg|$6545}?}1K{
zELtl&?zp~NRBG!0`CaV~X*skqpLRT6e0J>c--GKG)MfR)xttLK3HjZO?F2lW^g^y~
zSlM+;QFL{;L@BlM(FfJ<buNsargfzE(Ma~z3bS0he>@slfLh5S-|s#&<MX`YmX3Vx
zY5%=*oj2x29(`bxYrPkWh(+=W*8}crc*aQNiB+oP(a_Ck@3P450*A+oLQR{y4@h;%
zANAeM?50{3RA^N~)#wE-V-#52%Z~&}HTC1AJJXFZ_Liwv1j)t|Vg?sz3ks(oWk{G@
zUWiE7V`b+1tO({;YFwSv#D*dV6^Gm-sL{oInv~D$-2#T9+rZtU4J}9jxp#u14xT?t
zk7Kql6zUcIXy@RpU6pu&PeOcDM?B?aO5Q}F_I5(7H!bR0jWw5~%yu`53|{6!d>^JP
zrdMOSYgc?)o7k+!Ahax3(H&8jX7dDga7#`WRiQ;tF*V!K;1<Vd`7Po29*ju^E6KN1
zLuv{Ewbpaol@a%W)s5aJFBHvQZ;T@$nkfNxIY+YvtOJJqHqj0(tH*$<$;|I(i=Va%
zF+*g_dW`+o=XZ|HH%@&-X$XgT`XWT%b;7deI6;IAD;n`Sdl8P9UKhKw${Vkd#nr_Q
zq~C`QdgA0GDIRke@kEKQ@uC~{!z|%lR?jqc&*%VqyYJ_9%1ZDp8Hu2Vwmj=q;(B65
zws$RUy^?8{Z5tBXPZ<$t7P&}G<SmmI+!L%A;4~60e&7XfljLfB*VL{fq-UhNidL_v
zfv~aA{2IF1)l|B{wQme1>0~d889}S$Rr=!d+>mc(`U<9e8C2<sYJPE`MbYBxgZ{0O
zxvfI?IC(va7~lt)-N9WVDpSn$Jl?roFRNDT%Egfs-3xV^*V;Jjx^Ew2`y^bD-OIiR
ztEs)T+Rt{q-*$(Vr4rT|c-MJIC`g4n8>dXICr<8pgCz}eypE=k>ks=z3fO`Cl$Ts4
zB1*AML@6_%HNrF_tX4sqp=bXbW-XiY6P%9Mr$LeFLyC<d82D-V7M47+>;TxXiTdsv
z^-Lpza{A9m(*iL)7>@F<?ooo#ZR>1k14#iVuivLiu~D38)?(IL{HS0r5_KQ@6x<ws
z<}CgJ2aB)|^PHfvu(cq+;|&XQJC<#DARg&UyftoB<awmhIfaqRM3;pHw+T+wL^g4k
z&uk1DDh4wZrt?VAoYm+f(HveOb7Z}fjAJP8<gQ9L8(!!(0u^amU|?Ef-sK;F@=0-K
zQ<HUOF*n?BH8TuizO<Rubg~s^zn8%&UDf|+5T*B-JZq-wYZ$N4LWL#+k^=UQETQ#}
zp0Jze(D*_Sr@LJ(OSo^yULYWU`2qjCYqmWs|B)Q*mUV*9gQvg*_$+X-G67nctGNQL
z9bUQo^v%@A9KHynwQKG3k-YmNW|kqQq0!HyzK>CdY8-^0&{?#geu$j%4k{NGljIpC
zEEgJIDWW>}*M&N-bi(6XhUQt-FajV1Bi*6@s_*&OH>;1?s3qpRZD}g#wU{O#hp_Yn
z8i_4!(J!&gj)ooHXIal)mXh>^7SKllw)2ab!A>}QR$ehF9^Fd-Rb}bk3;Htg4O3a=
zhRr$}mCcGQnP;?ZmhL)~*?_P#^cNBwZ_FEe)?V4kN=wVr(7vMN=(d}o*Liu$NY{S<
z*y$o0yrWJub~b3U#ukAjd9)DN!}_q**+?Fz;T4zdg6*aJBj$1nI7-N6JSjR3JB4Jv
zD1z?JJ2<?yLd<TPtB3pvS+;N4H(>|=tU}laW~YfHB#qG2a1t|zSWWDzo5E<o4E|Hq
z&<VeEu+BJxe3WL<4mvXN_c-blXGa<qrd(F!?gb*VjptKW24XECJXorS$!A2q93g2&
zTum#~ML_}BH5Kr<$|Z>=D*}5hhl*(V5Y0`lixQ10+HkA$2^yjJ$wlv15B)k86GQ+g
zNczVldeqR*X~k%xUMc9Vksp`C7qX<V2e9XSy7=y|23Kq6YaxW<9b};zy{(0XgxP5G
zQAp0PGCJ#}{M`aKRM}Tf$(8rRrK;!88r+=hN*juT4OWyPQK$y3Z;9p^d+(fi8*6m9
zIFXqQ*7nzm$R3+njNs~LF8yKPG8XHdtk<`(Qvq^Z%#SaA-&FZma;uQwO@#*o0fG9r
z8)@q3X#3N9RO@oc6h>>)+84@cTYSFI+s_&&Z#OILjM-E<11jY}vcy`DXgOFf-mm!)
zRPY{jhrx4UyZ^Wg)o(plx?VTB$mM9cinMX=mx@O$EIphaQC=B^WK0@Qv*^7$M!SoY
zNQz|wkl}$wT@Df7Nq)=J5BtIcfBYDUp|c<Yz3>ds&nizsUOVDqd`q=WMlKs+8g0QC
zD9#G0tn=D_hQ9|l7ikWWd`dE8fCbs4zsCShevS-EHP7{qHMhxbHcvrgw?L<}NN=+i
zpB2dhWWPoZtI*G)U}E57oWS2fmF~YMC?P3ZkRhcmvY87)@q(NP3_+?H`9Y{~S+U4w
zA4*NF=Mah_8!(TFcoXwBS4A27bUjs)_B27j=}xz_-w<+{N*1;I2suj?^|45$P1;uD
zeOD=Cz{9n>r#HXv58(CvkCTg>2#s5x624kjAM#S6UJG*#RRw?P=@UtuEfs*lNZoQ0
zq>me=h8rHAh`_~^M|k^ZmqSIN>R`oH;8@)8yGy=t`duDqTXz<ZV5QidJ5?4zot1J?
zNwF@<cnz*i+)C=}PpsNv`WDbCe7PQWtd(<;lz0SF7&xCgr$U4fV^Tkyy&U-V2rxPz
zRLZ5~(Qc$L)MwI+PF*Uy+5cfbnaXc){lVJj!L=!?U2klalk!9exzBssdn99MW4jS_
z5B2+Qd0cKdoI!$sI5viWK>n8ra`m#a_-T8V4ea9=r3nM#dp)XEyPk_@EI1RjHh!+n
zG?1g#C^mgA3Z>2y^}%+nmuJA*12tQH_f2;$SuRxAj0}MX?G~)TS7CiOeIKJD84sgV
ztm}!G!}OW~)MW?soo3Zf&fAaonKu*X4u(8<U#1mivbD#H4U(9&<dS&ydHif$CmH>&
znhhP^6hys>xeY&z8Fk-V$V#cS^Sh+W#5i8yyh2r&Ne=9@nr0;QUh&LVO}{`H%VlZ$
z7BdF$Wpi4}UF(v%%3;NADVlmml9y|sQaUGTVWpjqzE;ihZOep}eTi6UU<<@XfDf9h
zw;SQ>Z<U>{Zam%Y8g!1WL@p(2((S}0GAobJoN%KW?`%OTryVyoz8p;p2j;J5a4~EW
zR@Bw=WT0H;awU3?yKdIY*<8z#t+sxScng#vlk~_EEOr*V4R_tke9NfeDD9ZDL!A0q
z$tb{f-_tQ=h)I84kE=kH60Pq{BhUBQ)MLA+IFU9>O_g>@4bxDxzU*wC?6oSB7Wwz7
z7X(*yTGO%W`S)hSrpK^LW~;aERQ~Vs<on`}=C?a>r%32HB3ZpZ)bn`hHCrzzE0|;E
zg3S0T&0}x36Q4Odt`*~oC8wlk-|zQ*fd2@FMKLD>Z93!i%9`x@TLN7Oor_x0f`rGG
zVs#SKnHb>N_ChFq^>B*BKy^i>E#=<Z?vS)Y5lVO`sgLcIQ)=^8{X<70jRw<~wD&V^
z1#BD?BIa0chQ9;DJFyY$Of+9mCd9*^7CI8v9FtWX)E@O-Zw70PP|A%*Ye&DqMm1EE
z5^56PMk0D;Na$=>;FZPxt+`OfENkym%X1V1L|R*K1xHS7Y|ei64m^^e`o1*^M&(t9
zBTc5dBo}1>!t7K>w5zr3ed?=ay28*b4gNmnU4h{j_zjpQy6~)BVe`T2Cb75c4Cg&=
zxt%X?-D;{k36r0>4$?28+^r?#4rW#;;9z(b@lCJU4h6LP^M`|m5yF{@hc(bFEcc*4
zai?Nssht7j2^ROs8BlnA8<kZOW*sivpgs0zW177*qGb_%P@7lw=;buu=UdAq74DvV
zAkbNKy8!pu{h*c4dU5o^k}h7g-`(pZHYOd_oCtM|=Mej(L1F!Ob0Z20GrGY1IU8#m
z1;h4x-oZ~c3>CS7cykhB91a1<y<7*Eng;Wj8iuYIUq_6R(l4iNdPWD0WYTbN=$^41
z88WnUa%mD+N<PST|Gb^~eB8@Fe@fr^7Xf(yrAhycLUh$wHGj?Y(qEkCNzD+|Ngt+}
z+0L}k!Q8gtxTvp8AeP;h1nKW&9#m8H!@B6a8tbhyp;6%~D&3qS{e8x9kWC0DLc(e*
z#@a0ixXF9M2V{i-_mU~qh6r*Yhe;j?az0&I<t&#30Zlo<h&M}YBc_Dai0Kj{W5Oe&
zwY_OBU)JM4dSG6J)an#TIKM_}S%=Y??|XUn1pzLSjPTmY>U+f=Gm<$s70H@Z+MxRe
zk3^`Op+pa3eTinKje#}VyB!Xu>X4B9V}@p`M6OUIiFPzr7#^`fW&O}tS3!ZQSR@HS
zeB9tHPFBn+8?)8)?lb>LDWN1JF_H5m8H`4@WN~9_Dg{G5w*6@BxXK<NrJ;SG<qiL(
zs<zt4TaZ1Q7QX_rkee{oetJV&ylVdyya})BltXkr<cA-SoJBcd&UHOdha!P8`WFa}
zGW(>&4V)%AcgF1OQq@Zi&7e84kxPMVtLBfnf_UN!rJiD9*hWJ*@rP!Fn`Vid7{$Uu
zhhJS~g&g6%C$&E553u<VtyqQB9@3S)zLG2tE1fhLLeXT&dhKyg9;T+z3TeflZb3^2
zRq?Sl={mrN_gh9~oJZ7DbMU<5?t4mgMoF_Ycs;h*bT|N!bqGRWmx4xceABiaBr^7f
zTAHga+q>@jp$uyzHAvec7FmqE21wzoaJ@=<ZF&b2ZGBHH6*vqpfbL43CyR{4iGu^y
z+e{eq6g$7FU~=nB#LuJ>Td?_w*1IC8rI_qhWooa7PO?<#E-?{MyWz)kLBW=OZXns=
z;7Q<nnnI=zZE~_clj<)dB&a5W8rbXhVu!}p;jQEY;8Xj>?t|L<)KyKA@OSl;DbtsN
zYMn*u&8K0rP_*G0L^gtNlVZ8KKrdC1wX_+Uh(vSi%$<iUcDikb3J*lBha_98(<6E;
zoYhdHN7lEAB;``*qgM^{cB_I?`^E(9dZROav>Cu%+IRGZ=_+VO@a00}3$CkbU2Jgo
zk>26Rq^=x`>xvmr1@5bLyIoG%%<Z?D-gh&OBujW(`VnPEDd~dXtKrlfRhEd5?<IWr
z--^%AY`M^fkpmtqA&N4b62q=ct<8y|<x53K%ZK8Gcrbk}i=4eKQ3yYI<5RFLBCg{j
z7wA>8v^x-WSwhwlk~bU#PQ44V6m$f{@*q!X(ql3rpnb>=UX=%gtBFc|UM&1P19taU
zEwW~_bveJ)P(VV(u>{|F81lCW-StgOtUTHa!#$V|4(9F}b44)iT&%{wQVPIB%Ry7&
zxxSZIA0H7CgeN`kh!9oQ$YH-`mQJzk-~Ar49}i_+Y%Biq^d^{wQYAiDgb+(MgsW`8
z>cQpeTi5wb6)`MOxiM%uA>=!NYgF*Z=EY|8hX`t>)qpE@*?4r`!T~*-eAb=E+k?+-
zS5QGTjjB*-*ciPB7ehvt9bS$PcRuH+57?8rb_0`%`9lDO9pV+fyIoXBSP;-mI`l}$
z@1BK*tK&!7+i>b`8he9CR5C><ip2fb*oNAKVJhcQImJr7X5!f4W7NTUf&f%h9UQKA
z2(NF&`2`07#a7jd?}XBpk*7${PXdDqXmo{v#~+jt;}LM?qNEic?$0(&q`S?63HV}Z
zIUldT-z&viUIlQq_`G^p+aYC$fBx}QoFq<IP%?U;kA3iUwc^C1m!tn(M-Vr^w1sqN
zT84l(cIpmkE&?gb-30~xM7{_hZ|&Rn2}6EA^rRDQ<xuT3zlYCzLPrq&uat;DeivPP
zOhUQUeb5B`R3?;~rAEoas<ik-bd#qT;-X`gJsa@emQb9rcAWf0Hl7>ym}*ci-QFc9
zoxz5&!tvr&p>|G>Z+YM9OQX+`Ptm0)P#8ROe!Gh`3<pZXE~N@LBcL<s3E}gI;Su$v
z@(!zAW6{Gf<pdKVujb8#4k}zATJ(@>VUcMCzNxmTI86()tuurLKaJN}V5c@t1`7(8
zVzk4+s+PHs9fVuzG?l<=h=ZyUmX~f9X^dhqRtrm0=mpC#)5Q8EHZ*fiGIB}0N}2O3
zacV4D6I2yMuWuCuU1|{8hbY5bJI~R1Fw0N1jf~<Bd0I61L``nMQBu3@9NSf)Jidb5
z_z)v=LkmC~6WLNOA*fQCXBJdeeS#g0NYlcJ*d2)yhjPPJx0Vsdbb3-TaC+e=ZZ@XN
zj+I{Y6-7wG{UKs4sJ|qbYbS!b_Kfbe3bFn*oR5Mkql!!~`XK7KH;^~#h%3r^UJmH~
zHLzFBB8$GO3H4|cRg2sID|u7-*I6;(+SgI&?3dC)nt*xHuBLWGi|(v?vmYMgPGO=i
zR4+rS0a~r$H$hD2LAM;F_l2i2rf#M|A&Zs0Np!D`^8{JOT<Yh7u#^L4L~t5FUTD#X
z@1Z^<xFua0uVIb8)1DGP_d1&c()v)Hh;oR>1{~ET4^v{58evQAlr-*~qL*?^9)F(<
zo4$@T<$jN{QPR%CT-4wpa9?YXH}Ody<LJI(dEqE`CW1NgT+Zl&122)~9OKk0Ro!QD
zAIN@qU0}|e^<unBJwrY3@q}?`T}jh*5<R1Kv-fyErOLb2Tv}q`=IBw?x?J2aJZB@d
zSazUcpk{O2sU3{h^r~mM-6?pw=f%!4ud5w~96b5p$@6%k<YD4&tkt4B!W~U*f_R<e
z*FGrpMb(9;Xgnnsoj_{CftvSXA32sj!J&>NBiNB^62+G#4VyvcjJNOTnz5w>ML?9W
zi<cna?&+%W&X4%(CyS7n@N!mKv4Y?<t=a1(%Vub~T>To$-ECse+~1SGt#7l}S$(5d
z;r)t_q54#~OP<4=tCSHnRJ&kvwv)<>)zO!{GDWQ?ChSnD#hFkoUx3ADyqKwAB#v8j
zs4lt{;q8`M!PhkEn*;<*wRM>oitZX`<NZ|Yt13K$8Bpl@$*c_3)D@Bs;)^SI4mhPn
zbs8)@{_qN%I*)2sFE=Q1(`yC=gXegOZP`T)E$`{JG~M27Xxdt~mCt#&=PK-d`*yUi
zt5M><0_l|30aNWvQMS`!-%+Z;e)a;=*iA>1i;8n;==c`7YBlg^#^VtEe2uobJTzuj
z#J-w_Igj<(qiWau<Imjqe@@TBfxRCipoQI^X;~j`_tr=7vsJK9{roQ)#wW^(qzTzx
zX0-m};A6Dyb_EYCz-Lz`vTq9Jet~K7kCRjwNjit^Z6Yf4v(51F={MV%tG?zf_{$`Q
zEJbmx!EP$S!j6OP?J6g}p4!X7(&cS)&|d0J-7qctXQp?dA=~^ZUl=J84SZE6StIyf
zCR<PKsVfV=<KvKc&m&|;9>Uq?pzJVwCfWavNLhiuZ-q9}rv=WLJFNA_(XsSk{Hs8E
zzSsmC-KKhCwwql7R!oR*{z3=Zr34%t&jip-aOBuSHln=3k^xylKP*k{_0pDphckWp
zfW9K}Ys#Fl8{wImo$jv0DZRQ8Y2HxEyn{yy)`8y5R4+jeBWd6nLz&0_o(un1{^LKv
zIcWD8_zetW^HYcd{0okG{UUqHi~l=F@h@~0Y<if{!mh$rL`K_Fvr|=NH|=Ce7v}{6
z6Z%u57@mz?3^Z0bkvfwU;5))N!nIwENiQx>a7Qx9&%#&b(8{9iDpa=}WBRgJc_@)Y
z);D@15MjwnSC=_DHaK!yjlUhdOcZxNE$Cz!c=d9Kn}7q0G;boCvp~fqwIo?3Gvw$A
zU6rCj_}Nz=Q%9_VHb00dc^2x&W5O>DT-WHMJCPtJap`sILFh=y_b57D?-*Ih2S-k?
z%KG`TC)-_y7Y$VDM?M*I+IBnnlk-=YrUC`aY?0<NkXA_v2T9MOHnhojJmQ$oz75QE
z{O*(&pX$220+(zcgX4lvB^!ETjt;IC4z5P(UQQM+22Wv}ij)yWC>G4{E2{RM0zEc0
zCzBWx<28#CigoDO@15)ysi5GK@1U2)P$EGwnKHbGHyw}nZAg-Iwy!D0XIJLRjV`qz
z6}=0W%PonM-=2Z6(n8g`J>fa@plhd2Zf%%#;5&m$3FpgYUh+G|)k4x$pFt9g$@|rj
zO)-yqq5&B#I~{%6_!!&dzN)6{B6AY(cd66M(}J`vd^RY8MKt*xup7!VqR?Ve$r9Dt
zUH1c39iCxnY;!E^26CB)oaTqRZ+mn$9L45E>58ymv$P?~aeh1l68H%#hL?6|#4TLR
zl%xvdJ(mNhPd1bbzX_rsr9u`0J(|lAuK}+a^BZnW*P)Ud-?E|NrRr?UUk^LkiNjoi
z$g-us$q%53(AYsFam<0f9~Bcsw_PUA!#ykuV+)8Vx|Rg)ICi)|=xoEBj11hozd9eU
z?x}luIgEHX{&j~z^ow8V-pXZrVnYXg>v`9?8RtEmvK%B7=FiyducEO(R|dQ|5Recg
z;J%yUKd#d+0sp(jc@pre{)~?7Z~ODR(myTG6UQ&5N`LYEd}IEbvZq(_S9>aUdusov
zi~C*QpOtY>#J}`W|C8-sb#i|~^k=Qt-`vUIE&Z3$e^-9}$^K`#(%<Z;;0l|++5akD
z`frnds>%7)o+fPzj);QI&3|L~9VHL)f7qu#2l}TWd(!g@CD1?F{)bunQ_i1BfWPIG
zf(QMdQUZTU_%nw0w*&^PUlRU`=>1>J9lU43%Kx3h{(Xo1nZ*8EBj}%Of2Xwn9P*z*
z>c0g%qW{$UPuTw3pr4AWezm6+j`_91zm-`1KJq_{te$v(t=h-`!TWc~m9iY{)8_%W
Qb`byp52n+ldiwW&0Qb?&SpWb4

literal 0
HcmV?d00001

diff --git a/src/api/supplierInput/supplierInput/index.ts b/src/api/supplierInput/supplierInput/index.ts
index 834b072..0838699 100644
--- a/src/api/supplierInput/supplierInput/index.ts
+++ b/src/api/supplierInput/supplierInput/index.ts
@@ -61,3 +61,22 @@ export const delSupplierInput = (id: string | number | Array<string | number>) =
     method: 'delete'
   });
 };
+//导入供商入库
+export const leadingIn = (formData: FormData, projectId) => {
+  return request({
+    url: '/supplierInput/supplierInput/import?projectId=' + projectId,
+    method: 'post',
+    data: formData,
+
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  });
+};
+//导入供商出库
+export const leadingOut = () => {
+  return request({
+    url: '/supplierInput/supplierInput/export',
+    method: 'post'
+  });
+};
diff --git a/src/views/tender/supplierInput/index.vue b/src/views/tender/supplierInput/index.vue
index 3709164..a3afeda 100644
--- a/src/views/tender/supplierInput/index.vue
+++ b/src/views/tender/supplierInput/index.vue
@@ -31,9 +31,14 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['supplierInput:supplierInput:add']">新增</el-button>
           </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['supplierInput:supplierInput:export']">导出</el-button>
-          </el-col> -->
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Upload" @click="handleImport" v-hasPermi="['supplierInput:supplierInput:import']">导入</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['supplierInput:supplierInput:export']"
+              >导出模板</el-button
+            >
+          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -309,7 +314,14 @@
 <script setup name="SupplierInput" lang="ts">
 import { ComponentInternalInstance, getCurrentInstance, onMounted, ref, reactive, toRefs, computed } from 'vue';
 import { ElFormInstance } from 'element-plus';
-import { listSupplierInput, getSupplierInput, delSupplierInput, updateSupplierInput } from '@/api/supplierInput/supplierInput/index';
+import {
+  listSupplierInput,
+  getSupplierInput,
+  delSupplierInput,
+  updateSupplierInput,
+  leadingIn,
+  leadingOut
+} from '@/api/supplierInput/supplierInput/index';
 import { SupplierInputVO, SupplierInputQuery, SupplierInputForm, PageData, DialogOption } from '@/api/supplierInput/supplierInput/types';
 import Pagination from '@/components/Pagination/index.vue';
 import RightToolbar from '@/components/RightToolbar/index.vue';
@@ -688,9 +700,77 @@ const handleDelete = async (row?: SupplierInputVO) => {
   }
 };
 
-/** 导出操作 */
+/** 导出操作（下载静态模板文件） */
 const handleExport = () => {
-  proxy?.download('supplierInput/supplierInput/export', { ...queryParams.value }, `supplierInput_${new Date().getTime()}.xlsx`);
+  try {
+    // 创建a标签并直接下载public目录下的静态文件
+    const link = document.createElement('a');
+    link.href = '/xx.xlsx'; // 使用public目录下现有的Excel文件作为模板
+    link.download = '供应商导入模板.xlsx';
+    document.body.appendChild(link);
+    link.click();
+    // 清理DOM元素
+    setTimeout(() => {
+      document.body.removeChild(link);
+    }, 100);
+  } catch (error) {
+    proxy?.$modal.msgError('模板下载失败，请重试');
+  }
+};
+
+/** 导入操作 */
+const handleImport = () => {
+  // 创建一个隐藏的input[type=file]元素
+  const input = document.createElement('input');
+  input.type = 'file';
+  input.accept = '.xlsx,.xls'; // 限定只能导入excel文件
+  input.style.display = 'none';
+
+  // 监听文件选择事件
+  input.onchange = async (e: Event) => {
+    const target = e.target as HTMLInputElement;
+    const file = target.files?.[0];
+
+    if (file) {
+      // 检查文件类型是否为Excel
+      const isValidType = file.name.endsWith('.xlsx') || file.name.endsWith('.xls');
+      if (!isValidType) {
+        proxy?.$modal.msgError('请选择Excel文件(.xlsx或.xls)');
+        return;
+      }
+
+      // 创建FormData并添加文件
+      const formData = new FormData();
+      formData.append('file', file);
+
+      try {
+        // 显示加载状态
+        loading.value = true;
+        // 调用导入接口
+        const res = await leadingIn(formData, queryParams.value.projectId);
+        console.log('111111111111', queryParams.value.projectId);
+
+        if (res.code === 200) {
+          proxy?.$modal.msgSuccess('导入成功');
+          // 刷新列表
+          getList();
+        } else {
+          proxy?.$modal.msgError(res.msg || '导入失败');
+        }
+      } catch (error) {
+        proxy?.$modal.msgError('导入失败，请重试');
+      } finally {
+        loading.value = false;
+      }
+    }
+
+    // 清除input元素
+    input.remove();
+  };
+
+  // 触发文件选择对话框
+  document.body.appendChild(input);
+  input.click();
 };
 //调用projectId并获取列表
 onMounted(() => {