From fdfd6ad203e224f527eb29a61918a911a5a5834d Mon Sep 17 00:00:00 2001
From: wlikett <2331964395@qq.com>
Date: Fri, 8 Dec 2023 20:30:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/uploadComponent/index.vue   |  16 +-
 src/http/api/home/index.ts                 |   4 +-
 src/store/user.ts                          |   6 +-
 src/views/equip/detail.vue                 |   2 +-
 src/views/equip/list.vue                   |   2 +-
 src/views/home/index.vue                   | 337 +++++++++++----------
 src/views/user/orderManagement/index.vue   |   7 +-
 src/views/user/orderManagementCz/index.vue |   2 +-
 8 files changed, 191 insertions(+), 185 deletions(-)

diff --git a/src/components/uploadComponent/index.vue b/src/components/uploadComponent/index.vue
index fd26d14..4fd99dc 100644
--- a/src/components/uploadComponent/index.vue
+++ b/src/components/uploadComponent/index.vue
@@ -33,7 +33,7 @@
 <script lang="ts" setup>
     import { ref, nextTick } from 'vue'
     import { ElMessage } from 'element-plus'
-    import { Base64 } from 'js-base64'
+    // import { Base64 } from 'js-base64'
     const tmpUploadUrl = import.meta.env.VITE_API_URL +"/zlpt-file/file/cos/upload"
     console.log("tmpUploadUrl",tmpUploadUrl)
     const actionUrl = ref(tmpUploadUrl)
@@ -99,7 +99,7 @@
         },
         extraData: {}, //上传时的额外参数 如 name等
 
-        /* 
+        /*
     {
         name:'12321'
     }
@@ -155,7 +155,7 @@
                 url: response.data,
                 name: file.name
             })
-         
+
         } else {
             ElMessage({
                 type: 'warning',
@@ -218,11 +218,11 @@
             //预览 'doc', 'docx', 'xlsx', 'xls', 'txt' 文件
             name = name.replace(/&/g, '') // & 不兼容
             const target = encodeURIComponent(
-                Base64.encode(
-                    `${location.origin}/api/abk/web/v1/resource/file?fileId=${
-                        url || response.data
-                    }&fullfilename=${name}&sid=4AC67ADB4E264AB0A8B899A671072875`
-                )
+                // Base64.encode(
+                //     `${location.origin}/api/abk/web/v1/resource/file?fileId=${
+                //         url || response.data
+                //     }&fullfilename=${name}&sid=4AC67ADB4E264AB0A8B899A671072875`
+                // )
             )
             if (props.officePreviewFlag && officeType.includes(suffixFileType)) {
                 // office预览的
diff --git a/src/http/api/home/index.ts b/src/http/api/home/index.ts
index 3ded165..0bc8aa5 100644
--- a/src/http/api/home/index.ts
+++ b/src/http/api/home/index.ts
@@ -1,5 +1,5 @@
 import { get, post } from '../../index'
 
 export const getGoodsClassListApi = () => {
-    return get('/zlpt-order/maType/getEquipmentType', {})
-}
\ No newline at end of file
+    return get('/zlpt-home/maType/getEquipmentType', {})
+}
diff --git a/src/store/user.ts b/src/store/user.ts
index 575c14d..f184a46 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -39,13 +39,13 @@ export const useStore = defineStore('myUser', {
         },
         // 获取省份信息
         async getprovinceList() {
-            const res: any = await post('/zlpt-company/baseAddress/selectAddress', {})
+            const res: any = await post('/zlpt-system/baseAddress/selectAddress', {})
             this.provinceList = res.data
 
         },
         // 获取市级信息
         async getmarketList(val: any) {
-            const res: any = await post('/zlpt-company/baseAddress/selectAddress', { code: val })
+            const res: any = await post('/zlpt-system/baseAddress/selectAddress', { code: val })
             console.log(res, '市区信息');
             this.marketList = res.data
 
@@ -53,7 +53,7 @@ export const useStore = defineStore('myUser', {
         },
         // 获取区级信息
         async getareaList(val: any) {
-            const res: any = await post('/zlpt-company/baseAddress/selectAddress', { code: val })
+            const res: any = await post('/zlpt-system/baseAddress/selectAddress', { code: val })
             this.areaList = res.data
         },
         // 获取证件类型
diff --git a/src/views/equip/detail.vue b/src/views/equip/detail.vue
index 36f02c6..24babb5 100644
--- a/src/views/equip/detail.vue
+++ b/src/views/equip/detail.vue
@@ -56,7 +56,7 @@
 
                     <div class="business">
                         <img
-                                :src="pageData.companyLogoUrl"
+                                src="@/assets/img/bns-logo.png"
                                 class="avatar"/>
                         <div class="fonts">
                             <div class="name">{{ pageData.companyName }}</div>
diff --git a/src/views/equip/list.vue b/src/views/equip/list.vue
index 6f50092..c33c003 100644
--- a/src/views/equip/list.vue
+++ b/src/views/equip/list.vue
@@ -32,7 +32,7 @@
                         <div class="label">
                             {{ v.list[v.index].name }}
                         </div>
-                        <div class="select">
+                        <div class="select" :style=" i == 0 ? 'min-height:105px' : ''">
                             <div class="item"
                                  @click="selectScreen(i,val,v.index)"
                                  v-for="(val,index) in v.list[v.index].select" :key="index">
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index e39478b..fba0185 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -4,181 +4,186 @@
     import { getGoodsClassListApi } from 'http/api/home'
     import { useStore } from 'store/main'
     import { getHotList } from 'http/api/equip'
+    import {reactive} from "vue";
     const router = useRouter()
 
+    const leftNavList = ref([])
     // 获取商品分类
     const getGoodsClassList = async () => {
         const res = await getGoodsClassListApi()
         console.log(res, '商品分类列表')
+
+        leftNavList.value = res.rows
     }
 
     getGoodsClassList()
 
-    const leftNavList = [
-        {
-            name: '全部商品',
-            children: [
-                {
-                    title: '挖掘机',
-                    children: [
-                        { goodsName: '履带挖掘机' },
-                        { goodsName: '履带挖掘机' },
-                        { goodsName: '履带挖掘机' },
-                        { goodsName: '履带挖掘机' },
-                        { goodsName: '履带挖掘机' },
-                        { goodsName: '履带挖掘机' }
-                    ]
-                },
-                {
-                    title: '开沟机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '斗轮挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                }
-            ]
-        },
-        {
-            name: '挖掘机',
-            children: [
-                {
-                    title: '挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '开沟机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '斗轮挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                }
-            ]
-        },
-        {
-            name: '土方机械',
-            children: [
-                {
-                    title: '挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '开沟机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '斗轮挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                }
-            ]
-        },
-        {
-            name: '工程起重机械',
-            children: [
-                {
-                    title: '挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '开沟机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '斗轮挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                }
-            ]
-        },
-        {
-            name: '动力设备',
-            children: [
-                {
-                    title: '挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '开沟机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '斗轮挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                }
-            ]
-        },
-        {
-            name: '压实机械',
-            children: [
-                {
-                    title: '挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '开沟机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '斗轮挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                }
-            ]
-        },
-        {
-            name: '路桥机械',
-            children: [
-                {
-                    title: '挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '开沟机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '斗轮挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                }
-            ]
-        },
-        {
-            name: '混凝土机械',
-            children: [
-                {
-                    title: '挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '开沟机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '斗轮挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                }
-            ]
-        },
-        {
-            name: '桩工机械',
-            children: [
-                {
-                    title: '挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '开沟机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                },
-                {
-                    title: '斗轮挖掘机',
-                    children: [{ goodsName: '履带挖掘机' }]
-                }
-            ]
-        }
-    ]
 
+        // [
+        //     {
+        //         name: '全部商品',
+        //         children: [
+        //             {
+        //                 title: '挖掘机',
+        //                 children: [
+        //                     { goodsName: '履带挖掘机' },
+        //                     { goodsName: '履带挖掘机' },
+        //                     { goodsName: '履带挖掘机' },
+        //                     { goodsName: '履带挖掘机' },
+        //                     { goodsName: '履带挖掘机' },
+        //                     { goodsName: '履带挖掘机' }
+        //                 ]
+        //             },
+        //             {
+        //                 title: '开沟机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '斗轮挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             }
+        //         ]
+        //     },
+        //     {
+        //         name: '挖掘机',
+        //         children: [
+        //             {
+        //                 title: '挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '开沟机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '斗轮挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             }
+        //         ]
+        //     },
+        //     {
+        //         name: '土方机械',
+        //         children: [
+        //             {
+        //                 title: '挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '开沟机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '斗轮挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             }
+        //         ]
+        //     },
+        //     {
+        //         name: '工程起重机械',
+        //         children: [
+        //             {
+        //                 title: '挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '开沟机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '斗轮挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             }
+        //         ]
+        //     },
+        //     {
+        //         name: '动力设备',
+        //         children: [
+        //             {
+        //                 title: '挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '开沟机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '斗轮挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             }
+        //         ]
+        //     },
+        //     {
+        //         name: '压实机械',
+        //         children: [
+        //             {
+        //                 title: '挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '开沟机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '斗轮挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             }
+        //         ]
+        //     },
+        //     {
+        //         name: '路桥机械',
+        //         children: [
+        //             {
+        //                 title: '挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '开沟机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '斗轮挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             }
+        //         ]
+        //     },
+        //     {
+        //         name: '混凝土机械',
+        //         children: [
+        //             {
+        //                 title: '挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '开沟机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '斗轮挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             }
+        //         ]
+        //     },
+        //     {
+        //         name: '桩工机械',
+        //         children: [
+        //             {
+        //                 title: '挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '开沟机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             },
+        //             {
+        //                 title: '斗轮挖掘机',
+        //                 children: [{ goodsName: '履带挖掘机' }]
+        //             }
+        //         ]
+        //     }
+        // ]
     const handlerGoodsDetails = () => {
         console.log('去往商品详情页')
+
     }
 
     const detailsList = ref([
@@ -231,15 +236,15 @@
                         {{ item.name }}
                         <ul class="sub-goods">
                             <!-- 级联框内 类别名称 -->
-                            <li v-for="child in item.children" :key="child.title">
-                                <span>{{ child.title }}</span>
+                            <li v-for="child in item.children" :key="child.id">
+                                <span>{{ child.name }}</span>
                                 <span>
                                     <!-- 小类名称 -->
                                     <a
                                         v-for="son in child.children"
-                                        :key="son.goodsName"
+                                        :key="son.id"
                                         @click="handlerGoodsDetails">
-                                        {{ son.goodsName }}
+                                        {{ son.name }}
                                     </a>
                                 </span>
                             </li>
diff --git a/src/views/user/orderManagement/index.vue b/src/views/user/orderManagement/index.vue
index fb8c964..7b53b1e 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'
@@ -113,7 +114,7 @@
         <el-table-column align="center" prop="time" label="订单创建日期" />
         <el-table-column align="center" prop="payType" label="装备类型" />
         <el-table-column align="center" prop="deviceName" label="装备名称" />
-        <el-table-column align="center" label="订单状态">
+        <el-table-column align="center" label="订单状态" width="80">
             <template #default="{ row }">
                 <el-tag v-if="row.orderStatus == 31">待确认</el-tag>
                 <el-tag v-if="row.orderStatus == 32">待合同上传</el-tag>
@@ -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="center" 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..7b10819 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>