From bcef134cf9c5f9af1dbe864d477617a1974ebcd4 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 21 Sep 2022 17:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BA=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/apply.vue              | 1 +
 front/src/views/home/infrastructurePage.vue | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 6d4b4877..5cd8885a 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -738,6 +738,7 @@ export default {
     const handleWrjApply = (formName) => {
       let _data = {
         deviceId: formName.system && formName.system[0] && formName.system[0].resourceId,
+        deviceName: formName.system && formName.system[0] && formName.system[0].resourceName,
         title: formName.title,
         name: formName.user,
         phone: formName.phone,
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 79fc1397..27aec4f0 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -333,12 +333,12 @@
           </template>
         </a-table>
       </div>
+      <!-- 西海岸-无人机、单兵设备 -->
       <div class="infrastructrue-table" v-else-if="isXiHaiAn && wrjFlag">
         <a-table class="ant-table-striped" :dataSource="dataSource2" :columns="columns2" :scroll="{ y: tableHeight }"
           rowKey="channelId" :rowClassName="
             (record, index) => (index % 2 === 1 ? 'table-striped' : null)
           " :pagination="pagination" @change="handleTableChange">
-          <!-- todo-->
           <template #bodyCell="{ column, record }">
             <template v-if="column.dataIndex === 'operation'">
               <a @click="goToApply(record)" style="margin-right: 10px">
@@ -678,7 +678,7 @@ const goToWrj = (data) => {
   window.open(data.url)
 }
 
-// 申请
+// 西海岸-无人机、单兵设备申请
 const goToApply = (data) => {
   console.log(data, dept)
   let arr = [
@@ -1622,7 +1622,7 @@ const onSelectAll = (selected, selectedRows, changeRows) => {
   console.log('heiheiheiehiehei', selected, selectedRows, changeRows)
 }
 
-// 切换tab todo
+// 切换tab
 const handleTableChange = (val) => {
   pagination.value.current = val.current
   pagination.value.pageSize = val.pageSize
@@ -1637,9 +1637,6 @@ const handleTableChange = (val) => {
   }else {
     getCamera()
   }
-  console.log('_arr------------>', _arr);
-  console.log('clickList------------>', clickList);
-  
 }
 
 const showMsg = () => {