Merge branch 'main' into dev-sy

src/views/enterpriseZone/index.vue

@@ -1,12 +1,30 @@
 <script setup lang="ts">
 import NavMenu from 'components/Navmenu/index.vue'
+const leaseList = ref([
+    {
+        orderCode: '202303221234567890',
+        leaseName: '张三',
+
+    }])
 </script>
 
 <template>
     <!-- 企业专区 -->
     <NavMenu />
 
-    <div class="container"></div>
+    <div class="container">
+        <el-table
+        :data="leaseList"
+        style="width: 100%"
+        :header-cell-style="{ background: '#00a288', color: '#fff' }"
+    >
+        <el-table-column align="center" type="index" label="序号" width="80" />
+        <el-table-column align="center" prop="orderCode" label="消息发布时间" />
+        <el-table-column align="center" prop="leaseName" label="消息内容" />
+
+    </el-table>
+
+    </div>
 </template>
 
 <style scoped>

src/views/equip/detail.vue

@@ -249,8 +249,8 @@
                 >
                     <el-table-column align="center" type="index" label="序号" width="80" />
                     <el-table-column align="center" prop="qcTime" label="检测日期" />
-                    <el-table-column align="center" prop="leaseName" label="有效期" />
+                    <el-table-column align="center" prop="maintenanceAlarmDay" label="有效期" />
-                    <el-table-column align="center" prop="leaseStartTime" label="检测单位" />
+                    <el-table-column align="center" prop="comName" label="检测单位" />
                 </el-table>
             </div>
         </div>