diff --git a/components.d.ts b/components.d.ts
index a73d136..d030040 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -3,34 +3,29 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-export { }
+export {}
 
 declare module 'vue' {
-    export interface GlobalComponents {
-        ElButton: typeof import('element-plus/es')['ElButton']
-        ElCarousel: typeof import('element-plus/es')['ElCarousel']
-        ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-        ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-        ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-        ElCascader: typeof import('element-plus/es')['ElCascader']
-        ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-        ElCol: typeof import('element-plus/es')['ElCol']
-        ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-        ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-        ElDialog: typeof import('element-plus/es')['ElDialog']
-        ElEmpty: typeof import('element-plus/es')['ElEmpty']
-        ElForm: typeof import('element-plus/es')['ElForm']
-        ElFormItem: typeof import('element-plus/es')['ElFormItem']
-        ElImage: typeof import('element-plus/es')['ElImage']
-        ElInput: typeof import('element-plus/es')['ElInput']
-        ElMenu: typeof import('element-plus/es')['ElMenu']
-        ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
-<<<<<<< HEAD
-        ElPagination: typeof import('element-plus/es')['ElPagination']
-        ElTable: typeof import('element-plus/es')['ElTable']
-        ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-=======
+  export interface GlobalComponents {
+    ElButton: typeof import('element-plus/es')['ElButton']
+    ElCarousel: typeof import('element-plus/es')['ElCarousel']
+    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCol: typeof import('element-plus/es')['ElCol']
+    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDialog: typeof import('element-plus/es')['ElDialog']
+    ElEmpty: typeof import('element-plus/es')['ElEmpty']
+    ElForm: typeof import('element-plus/es')['ElForm']
+    ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
+    ElInput: typeof import('element-plus/es')['ElInput']
+    ElMenu: typeof import('element-plus/es')['ElMenu']
+    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
+    ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
@@ -40,18 +35,19 @@ declare module 'vue' {
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElUpload: typeof import('element-plus/es')['ElUpload']
->>>>>>> dev-songyang
-        EquipCard: typeof import('./src/components/equipCard.vue')['default']
-        EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']
-        FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default']
-        FormComponent: typeof import('./src/components/FormComponent/index.vue')['default']
-        Navmenu: typeof import('./src/components/Navmenu/index.vue')['default']
-        PagingComponent: typeof import('./src/components/PagingComponent/index.vue')['default']
-        RouterLink: typeof import('vue-router')['RouterLink']
-        RouterView: typeof import('vue-router')['RouterView']
-        TableComponent: typeof import('./src/components/TableComponent/index.vue')['default']
-        UploadComponent: typeof import('./src/components/uploadComponent/index.vue')['default']
-        UploadImg: typeof import('./src/components/uploadImg.vue')['default']
-    }
+    EquipCard: typeof import('./src/components/equipCard.vue')['default']
+    EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']
+    FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default']
+    FormComponent: typeof import('./src/components/FormComponent/index.vue')['default']
+    Navmenu: typeof import('./src/components/Navmenu/index.vue')['default']
+    PagingComponent: typeof import('./src/components/PagingComponent/index.vue')['default']
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
+    TableComponent: typeof import('./src/components/TableComponent/index.vue')['default']
+    UploadComponent: typeof import('./src/components/uploadComponent/index.vue')['default']
+    UploadImg: typeof import('./src/components/uploadImg.vue')['default']
+  }
 }
diff --git a/env/.env.dev b/env/.env.dev
index cae1be7..2c980fb 100644
--- a/env/.env.dev
+++ b/env/.env.dev
@@ -5,9 +5,9 @@ VITE_BUILD_MODE = 'dev'
 VITE_API_URL = '/proxyApi' 
 
 # 开发环境接口地址
-VITE_proxyTarget = 'http://10.40.92.74:8080'  #盛旭
+# VITE_proxyTarget = 'http://10.40.92.74:8080'  #盛旭
 
-# VITE_proxyTarget = 'http://10.40.92.186:8080'  # 赵福海 (登录) 
+VITE_proxyTarget = 'http://10.40.92.186:8080'  # 赵福海 (登录) 
 
 # VITE_proxyTarget = 'http://10.40.92.185:9206'  # 赵福海 ( 设备类型) 
 # VITE_proxyTarget = 'http://10.40.92.253:8080'  # 牛 (个人中心 基础信息企业申请认证) 
diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue
index ac5ebca..60fc9d5 100644
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@@ -258,7 +258,7 @@
                 /* 设备图片 */
                 {
                     id: '20',
-                    utr: 'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png'
+                    utr: 'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/DemoData/10/655f1724956e0b38bf6adb6087123f7e_b.jpg'
                 }
             ],
             /* 设备状态 */
diff --git a/src/views/user/orderManagement/index.vue b/src/views/user/orderManagement/index.vue
index fb8c964..2fe90b8 100644
--- a/src/views/user/orderManagement/index.vue
+++ b/src/views/user/orderManagement/index.vue
@@ -24,7 +24,7 @@
         getList()
     }
 
-    const tableData = ref([{ supplierCompany: '供应商' }])
+    const tableData = ref([])
 
     /* 退租按钮 */
     const clickRentingTermination = () => {
@@ -104,6 +104,7 @@
     <el-table
         :data="tableData"
         style="width: 100%"
+        show-overflow-tooltip
         :header-cell-style="{
             background: '#3E98FF',
             color: '#fff'
@@ -121,7 +122,7 @@
                 <el-tag v-if="row.orderStatus == 36">进行中</el-tag>
             </template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="操作" width="320px">
+        <el-table-column align="left" prop="name" label="操作" width="160px">
             <template #default="scope">
                 <el-button size="small" type="primary" @click="clickPreviewDetails(scope.row)">
                     查看
diff --git a/src/views/user/orderManagementCz/index.vue b/src/views/user/orderManagementCz/index.vue
index 83305cd..ebdb8d3 100644
--- a/src/views/user/orderManagementCz/index.vue
+++ b/src/views/user/orderManagementCz/index.vue
@@ -47,7 +47,7 @@
         })
     }
 
-    const tableData: any = ref([{ address: '客户单位' }])
+    const tableData: any = ref([])
 
     const time = ref([])
 </script>
@@ -83,33 +83,49 @@
         </el-form-item>
     </el-form>
 
-        <!-- 表格 -->
-        <el-table
-            :data="tableData"
-            show-overflow-tooltip
-            :header-cell-style="{
-                background: '#3E98FF',
-                color: '#fff'
-            }"
-            fit>
-            <el-table-column align="center" prop="code" label="订单编号" />
-            <el-table-column align="center" prop="supplierCompany" label="客户单位" />
-            <el-table-column align="center" prop="time" label="订单创建日期" />
-            <el-table-column align="center" prop="orderPhone" label="联系方式" />
-            <el-table-column align="center" prop="typeName" label="装备类型" />
-            <el-table-column align="center" prop="deviceName" label="装备名称" />
-            <el-table-column align="center" prop="orderStatus" label="订单状态" />
-            <el-table-column align="center" prop="name" label="操作" width="260px">
-                <template #default="{ row }">
-                    <el-button size="small" type="primary" @click="confirmBtn(row)" v-if="row.orderStatus==31">确认</el-button>
-                    <el-button size="small" type="warning" @click="clickPreviewDetails(row)"  v-if="row.orderStatus!=31">
-                        查看
-                    </el-button>
-                    <el-button size="small" type="danger"  v-if="row.orderStatus=39">删除</el-button>
-                    <el-button size="small" type="success" @click="settlementBtn" v-if="row.orderStatus=34">结算</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
+    <!-- 表格 -->
+    <el-table
+        :data="tableData"
+        show-overflow-tooltip
+        :header-cell-style="{
+            background: '#3E98FF',
+            color: '#fff'
+        }"
+        fit>
+        <el-table-column align="center" prop="code" label="订单编号" />
+        <el-table-column align="center" prop="supplierCompany" label="客户单位" />
+        <el-table-column align="center" prop="time" label="订单创建日期" />
+        <el-table-column align="center" prop="orderPhone" label="联系方式" />
+        <el-table-column align="center" prop="typeName" label="装备类型" />
+        <el-table-column align="center" prop="deviceName" label="装备名称" />
+        <el-table-column align="center" prop="orderStatus" label="订单状态" />
+        <el-table-column align="center" prop="name" label="操作" width="260px">
+            <template #default="{ row }">
+                <el-button
+                    size="small"
+                    type="primary"
+                    @click="confirmBtn(row)"
+                    v-if="row.orderStatus == 31">
+                    确认
+                </el-button>
+                <el-button
+                    size="small"
+                    type="warning"
+                    @click="clickPreviewDetails(row)"
+                    v-if="row.orderStatus != 31">
+                    查看
+                </el-button>
+                <el-button size="small" type="danger" v-if="(row.orderStatus = 39)">删除</el-button>
+                <el-button
+                    size="small"
+                    type="success"
+                    @click="settlementBtn"
+                    v-if="(row.orderStatus = 34)">
+                    结算
+                </el-button>
+            </template>
+        </el-table-column>
+    </el-table>
 
     <PagingComponent
         @getList="getList"