跟新部分样式问题

.env.development

@@ -1,4 +1,5 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 NODE_ENV = 'development'
 VITE_APP_BASE_API = '/api'
-VITE_MINIO_BASE_URL = 'http://192.168.110.30:9000/zksy-file'
+VITE_MINIO_BASE_URL = 'http://192.168.110.30:9000/zksy-file'
+# VITE_MINIO_BASE_URL = 'http://192.168.110.235:8801'

.env.production

@@ -1,4 +1,5 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 NODE_ENV = 'production'
 VITE_APP_BASE_API = '/api'
-VITE_MINIO_BASE_URL = 'http://192.168.110.30:9000/zksy-file'
+VITE_MINIO_BASE_URL = 'http://192.168.110.30:9000/zksy-file'
+# VITE_MINIO_BASE_URL = 'http://192.168.110.235:8801'

src/views/home.vue

@@ -57,6 +57,7 @@
                           round
                           class="w-full"
                           @click="toZflbLink('housing')"
+                          size="medium"
                         >
                           <el-icon class="mr-1">
                             <ArrowRight />
@@ -71,6 +72,7 @@
                           class="w-full bg-gradient-to-r from-cyan-500 to-blue-500 border-0 text-white hover:from-cyan-600 hover:to-blue-600"
                           @click="openARDialog('housing')"
                           :disabled="housingTypes.length === 0"
+                          size="medium"
                           :loading="loadingStates.housing"
                         >
                           <el-icon class="mr-1" v-if="!loadingStates.housing">
@@ -132,6 +134,7 @@
                           round
                           class="w-full"
                           @click="toZflbLink('factory')"
+                          size="medium"
                         >
                           <el-icon class="mr-1">
                             <ArrowRight />
@@ -147,6 +150,7 @@
                           @click="openARDialog('factory')"
                           :disabled="factoryTypes.length === 0"
                           :loading="loadingStates.factory"
+                          size="medium"
                         >
                           <el-icon class="mr-1" v-if="!loadingStates.factory">
                             <Camera />
@@ -207,6 +211,7 @@
                           round
                           class="w-full"
                           @click="toZflbLink('innovation')"
+                          size="medium"
                         >
                           <el-icon class="mr-1">
                             <ArrowRight />
@@ -222,13 +227,14 @@
                           class="w-full bg-gradient-to-r from-purple-500 to-pink-500 border-0 text-white hover:from-purple-600 hover:to-pink-600"
                           @click="openARDialog('innovation')"
                           :loading="loadingStates.innovation"
+                          size="medium"
                         >
                           <el-icon class="mr-1" v-if="!loadingStates.innovation">
                             <Camera />
                           </el-icon>
                           {{ loadingStates.innovation ? '加载中...' : 'AR空间体验' }}
                         </el-button>
-                        <el-button v-else type="info" round class="w-full" disabled>
+                        <el-button v-else type="info" round class="w-full" size="medium" disabled>
                           <el-icon class="mr-1">
                             <Clock />
                           </el-icon>

src/views/zf/fwxq.vue

@@ -983,20 +983,21 @@ onMounted(() => {
 
 <template>
   <el-container class="min-h-screen bg-gradient-to-br from-blue-50 to-indigo-100">
-    <el-button
-      type="primary"
-      @click="router.back"
-      class="relative top-10 left-28 z-50 bg-gradient-to-r from-blue-500 to-indigo-600 hover:from-blue-600 hover:to-indigo-700 text-white font-semibold py-3 px-6 rounded-full shadow-lg transition-all duration-300 ease-in-out transform hover:scale-105"
-    >
-      <el-icon class="mr-1"><ArrowLeft /></el-icon>
-      返回
-    </el-button>
-    <el-main class="h-full p-0" v-loading="loading">
-      <div class="bg-gradient-to-r from-blue-600 to-purple-700 text-white py-8 px-8">
+    <el-main class="h-full" v-loading="loading">
+<!--      <div class="py-0 has-footer">-->
+        <el-button
+          type="primary"
+          @click="router.back"
+        >
+          <el-icon class="mr-1"><ArrowLeft /></el-icon>
+          返回
+        </el-button>
+<!--      </div>-->
+      <div class="bg-gradient-to-r from-blue-600 to-purple-700 text-white py-4 px-8 my-4 rounded-2xl">
         <div class="w-full">
           <div class="flex items-center justify-between">
             <div>
-              <h1 class="text-3xl font-extrabold mb-2">{{ propertyInfo.buildingNumber }}</h1>
+              <h1 class="text-3xl font-extrabold mb-2 my-0">{{ propertyInfo.buildingNumber }}</h1>
               <p class="text-base opacity-90">
                 <el-icon class="mr-2 text-blue-500"><MapPin /></el-icon>
                 <span>{{ propertyInfo.address }}</span>
@@ -1042,7 +1043,7 @@ onMounted(() => {
           </div>
         </div>
       </div>
-      <div class="py-8 px-8">
+      <div class="py-0">
         <div class="w-full">
           <el-card
             v-if="propertyInfo.status === '已租' && tenantInfo"
@@ -1064,25 +1065,25 @@ onMounted(() => {
               <el-col :xs="24" :sm="12" :md="8">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">联系电话</label>
-                  <div class="text-lg text-gray-800">{{ tenantInfo.tenantNumber }}</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ tenantInfo.tenantNumber }}</div>
                 </div>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">身份证号</label>
-                  <div class="text-lg text-gray-800">{{ tenantInfo.tenantIdCard }}</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ tenantInfo.tenantIdCard }}</div>
                 </div>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">入住时间</label>
-                  <div class="text-lg text-gray-800">{{ tenantInfo.tenantInDate }}</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ tenantInfo.tenantInDate }}</div>
                 </div>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">租期</label>
-                  <div class="text-lg text-gray-800">{{ tenantInfo.tenantTime }}</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ tenantInfo.tenantTime }}</div>
                 </div>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8">
@@ -1106,25 +1107,25 @@ onMounted(() => {
               <el-col :xs="24" :sm="12" :md="6">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">建筑面积</label>
-                  <div class="text-lg text-gray-800">{{ propertyInfo.area }} ㎡</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ propertyInfo.area }} ㎡</div>
                 </div>
               </el-col>
               <el-col :xs="24" :sm="12" :md="6" v-if="propertyInfo.floor">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">所在楼层</label>
-                  <div class="text-lg text-gray-800">{{ propertyInfo.floor }}</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ propertyInfo.floor }}</div>
                 </div>
               </el-col>
               <el-col :xs="24" :sm="12" :md="6">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">介绍</label>
-                  <div class="text-lg text-gray-800">{{ propertyInfo.facilities }}</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ propertyInfo.facilities }}</div>
                 </div>
               </el-col>
               <el-col :xs="24" :sm="12" :md="6" v-if="basicInfo.houseType">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">房屋类型</label>
-                  <div class="text-lg text-gray-800">{{ basicInfo.houseType }}</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ basicInfo.houseType }}</div>
                 </div>
               </el-col>
             </el-row>
@@ -1166,10 +1167,10 @@ onMounted(() => {
                 class="mb-4"
               >
                 <div
-                  class="border border-gray-200 rounded-lg p-4 hover:shadow-md transition-shadow bg-white"
+                  class="border border-gray-200 rounded-lg px-4 py-2 hover:shadow-md transition-shadow bg-white"
                 >
                   <div class="mb-3">
-                    <h4 class="font-semibold text-gray-800 text-lg">{{ asset.deviceName }}</h4>
+                    <span class="font-semibold text-gray-800 text-lg">{{ asset.deviceName }}</span>
                     <p class="text-sm text-gray-500">{{ asset.deviceType }}</p>
                   </div>
                   <div class="text-sm text-gray-600 space-y-1">
@@ -1214,37 +1215,37 @@ onMounted(() => {
               <el-col :xs="24" :sm="12" :md="8">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">合同编号</label>
-                  <div class="text-lg text-gray-800">{{ contractInfo.contractNumber }}</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ contractInfo.contractNumber }}</div>
                 </div>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">签约日期</label>
-                  <div class="text-lg text-gray-800">{{ contractInfo.contractDate }}</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ contractInfo.contractDate }}</div>
                 </div>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">合同期限</label>
-                  <div class="text-lg text-gray-800">{{ contractInfo.contractTime }}</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ contractInfo.contractTime }}</div>
                 </div>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">到期日期</label>
-                  <div class="text-lg text-gray-800">{{ contractInfo.contractExpirationDate }}</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ contractInfo.contractExpirationDate }}</div>
                 </div>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">押金</label>
-                  <div class="text-lg text-gray-800">{{ contractInfo.contractDeposit }} 元</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ contractInfo.contractDeposit }} 元</div>
                 </div>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8">
                 <div class="mb-4">
                   <label class="block text-sm font-medium text-gray-700 mb-1">合同状态</label>
-                  <div class="text-lg text-gray-800">{{ contractInfo.contractStatus }}</div>
+                  <div class="text-lg font-semibold text-gray-800">{{ contractInfo.contractStatus }}</div>
                 </div>
               </el-col>
             </el-row>

src/views/zf/zflb.vue

@@ -174,7 +174,8 @@ const getList = async () => {
 const formatDisplayData = (item: ASimplifiedHouseInfoVo) => {
   return {
     id: item.id,
-    buildingNumber: item.houseName,
+    buildingNumber:item.building,//楼栋数
+    houseNameNumber: item.houseName,
     priceRange: item.rentRange ? `${item.rentRange}` : '面议',
     address: item.address,
     area: parseInt(item.area) || 0,
@@ -447,7 +448,7 @@ onMounted(() => {
               >
                 <div>
                   <div class="flex justify-between items-start">
-                    <h3 class="text-xl font-bold text-gray-800">{{ item.buildingNumber }}</h3>
+                    <h3 class="text-xl font-bold text-gray-800">{{ item.buildingNumber }}栋{{ item.houseNameNumber }}</h3>
                     <div class="text-right">
                       <div class="text-2xl font-bold text-blue-600">{{ item.priceRange }}</div>
                       <div class="text-sm text-gray-500">元/月</div>

src/views/zfgl/zfxxgl.vue

@@ -907,83 +907,102 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="p-6 bg-gray-50 min-h-screen">
+  <div class="p-0 bg-gray-50 min-h-screen">
     <div class="bg-white rounded-lg shadow-sm">
       <!-- 页面标题 -->
-      <div class="flex items-center gap-3 p-6 border-b border-gray-200">
-        <div class="flex items-center justify-center w-10 h-10 bg-blue-100 rounded-lg">
-          <Home class="w-5 h-5 text-blue-600" />
-        </div>
-        <div>
-          <h1 class="text-xl font-semibold text-gray-900">租房信息管理</h1>
-          <p class="text-sm text-gray-500">管理房屋基本信息、详细信息和设备信息</p>
-        </div>
-      </div>
+<!--      <div class="flex items-center gap-3 p-6 border-b border-gray-200">-->
+<!--        <div class="flex items-center justify-center w-10 h-10 bg-blue-100 rounded-lg">-->
+<!--          <Home class="w-5 h-5 text-blue-600" />-->
+<!--        </div>-->
+<!--        <div>-->
+<!--          <h1 class="text-xl font-semibold text-gray-900">租房信息管理</h1>-->
+<!--          <p class="text-sm text-gray-500">管理房屋基本信息、详细信息和设备信息</p>-->
+<!--        </div>-->
+<!--      </div>-->
 
       <!-- 搜索区域 -->
-      <div class="p-6 border-b border-gray-200">
-        <el-form :model="searchForm" inline class="flex flex-wrap gap-4">
-          <el-form-item label="资产类型">
+      <div class="py-4 px-4 border-b border-gray-200">
+        <el-form :model="searchForm" inline class="flex-grow flex flex-wrap">
+          <el-form-item label="">
+            <span slot="label" class="font-size-4.5">资产类型：</span>
             <el-select
               v-model="searchForm.assetType"
               placeholder="请选择资产类型"
               clearable
-              style="width: 8rem"
+              style="width: 10rem"
+              size="default"
             >
               <el-option label="公租房" value="公租房" />
               <el-option label="厂房" value="厂房" />
               <el-option label="创新创业基地" value="创新创业基地" />
             </el-select>
           </el-form-item>
-          <el-form-item label="楼栋">
+          <el-form-item>
+            <span slot="label" class="font-size-4.5">楼栋：</span>
             <el-input
               v-model="searchForm.building"
+              style="width: 240px"
+              size="default"
               placeholder="请输入楼栋"
               clearable
-              class="w-40"
             />
           </el-form-item>
-          <el-form-item label="房间名称">
+
+          <el-form-item>
+            <span slot="label" class="font-size-4.5">房间名称：</span>
             <el-input
               v-model="searchForm.houseName"
+              style="width: 240px"
+              size="default"
               placeholder="请输入房间名称"
               clearable
-              class="w-40"
             />
           </el-form-item>
-          <el-form-item label="状态">
+          <el-form-item>
+            <span slot="label" class="font-size-4.5">状态：</span>
             <el-select
               v-model="searchForm.status"
               placeholder="请选择状态"
               clearable
               style="width: 8rem"
+              size="default"
             >
               <el-option label="空闲" value="空闲" />
               <el-option label="已租" value="已租" />
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="handleSearch" :icon="Search">搜索</el-button>
-            <el-button @click="handleReset">重置</el-button>
+            <el-button type="primary" @click="handleSearch" :icon="Search" size="default">搜索</el-button>
+            <el-button @click="handleReset" size="default">重置</el-button>
+            <el-button type="primary" @click="handleAdd" :icon="Plus" size="default">新增房屋</el-button>
+            <el-button
+              type="danger"
+              @click="handleBatchDelete"
+              :disabled="selectedRows.length === 0"
+              :icon="Delete"
+              size="default"
+            >
+              批量删除
+            </el-button>
           </el-form-item>
         </el-form>
       </div>
 
       <!-- 操作按钮区域 -->
-      <div class="flex items-center justify-between p-6">
-        <div class="flex gap-3">
-          <el-button type="primary" @click="handleAdd" :icon="Plus">新增房屋</el-button>
-          <el-button
-            type="danger"
-            @click="handleBatchDelete"
-            :disabled="selectedRows.length === 0"
-            :icon="Delete"
-          >
-            批量删除
-          </el-button>
-        </div>
-        <div class="text-sm text-gray-500">共 {{ total }} 条记录</div>
-      </div>
+<!--      <div class="flex items-center justify-between p-6">-->
+<!--        <div class="flex gap-3">-->
+<!--          <el-button type="primary" @click="handleAdd" :icon="Plus">新增房屋</el-button>-->
+<!--          <el-button-->
+<!--            type="danger"-->
+<!--            @click="handleBatchDelete"-->
+<!--            :disabled="selectedRows.length === 0"-->
+<!--            :icon="Delete"-->
+<!--          >-->
+<!--            批量删除-->
+<!--          </el-button>-->
+<!--        </div>-->
+<!--        <div class="text-sm text-gray-500">共 {{ total }} 条记录</div>-->
+<!--      </div>-->
 
       <!-- 数据表格 -->
       <div class="px-6">
@@ -1090,8 +1109,7 @@ onMounted(() => {
             placeholder="请输入租金"
           />
         </el-form-item>
-        <el-form-item label="地址" class="col-span-2">
-          <el-input v-model="houseForm.address" placeholder="请输入详细地址" />
+        <el-form-item label="地址" class="col-span-2"> <el-input v-model="houseForm.address" placeholder="请输入详细地址" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -1311,8 +1329,7 @@ onMounted(() => {
                     <div class="flex items-center gap-3">
                       <span class="text-gray-600 font-medium w-24">押金:</span>
                       <span class="text-green-600 font-semibold"
-                        >¥{{ contractInfo.contractDeposit }}</span
-                      >
+                        >¥{{ contractInfo.contractDeposit }}</span>
                     </div>
                     <div class="flex items-center gap-3">
                       <span class="text-gray-600 font-medium w-24">合同状态:</span>
@@ -1363,8 +1380,7 @@ onMounted(() => {
                   <!-- 签订后合同 -->
                   <div
                     v-if="contractInfo.signContractUrl"
-                    class="flex items-center justify-between p-4 bg-white rounded-lg border"
-                  >
+                    class="flex items-center justify-between p-4 bg-white rounded-lg border">
                     <div class="flex items-center gap-3">
                       <FileText class="w-6 h-6 text-green-600" />
                       <div>
@@ -1378,21 +1394,18 @@ onMounted(() => {
                         size="small"
                         @click="previewDocx(contractInfo.signContractUrl, '签订后合同')"
                         :loading="previewLoading"
-                        :icon="Eye"
-                      >
+                        :icon="Eye">
                         预览
                       </el-button>
                       <el-button
                         type="success"
                         size="small"
                         @click="downloadDocument(contractInfo.signContractUrl, '签订后合同.docx')"
-                        :icon="Download"
-                      >
+                        :icon="Download">
                         下载
                       </el-button>
                     </div>
                   </div>
-
                   <!-- 签订后合同为空的提示 -->
                   <div
                     v-else

vite.config.ts

@@ -31,7 +31,9 @@ export default defineConfig({
   server: {
     proxy: {
       '/api': {
-        target: 'http://192.168.110.93:8801',
+        // target: 'http://192.168.110.93:8801',
+        target: 'http://192.168.110.235:8801',
+
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, ''),
       },