From c55eedc5b47bb2f21a93baa2b11db88e47deda76 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 21 Sep 2022 23:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=85=B5=E5=92=8C=E6=97=A0=E4=BA=BA?=
 =?UTF-8?q?=E6=9C=BA=EF=BC=9A=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue | 73 ++++++++++-----------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index d1bdda27..98d4f90a 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -344,6 +344,7 @@
               <a @click="goToApply(record)" style="margin-right: 10px">
                 申请
               </a>
+              <a @click="showWrj(record)">详情</a>
             </template>
           </template>
         </a-table>
@@ -405,43 +406,23 @@
       </a-modal>
       <a-modal wrapClassName="wrj" v-model:visible="wrjVisible" :width="1000" :title="wrjName + '详情'"
         @ok="wrjVisible = false">
-        <template v-if="dataSource2[0].type !== '单兵设备'">
-          <div v-for="wrj in wrjData" :key="wrj.name">
+        <div v-for="(db, key) in wrjData" :key="key">
+          <template v-if="typeof db == 'object'">
             <div style="
-                font-size: 20px;
-                font-weight: 600;
-                margin: 10px 0;
-                text-align: center;
-              ">
-              {{ wrj.name }}
-            </div>
-            <div style="padding: 0 30px" v-for="(value, key) in wrj.attribute" :key="value">
-              {{ key + '：' + value }}
-            </div>
-          </div>
-        </template>
-        <template v-else>
-          <div v-for="(db, key) in wrjData" :key="key">
-            <template v-if="typeof db == 'object'">
-              <div style="
                   font-size: 20px;
                   font-weight: 600;
                   margin: 10px 0;
                   text-align: center;
                 ">
-                {{ key }}
-              </div>
-              <div style="padding: 0 30px" v-for="(value, key2) in db" :key="value">
+              {{ db.attrType || '--' }}
+            </div>
+            <template v-if="db.attrValue">
+              <div style="padding: 0 30px" v-for="(value, key2) in JSON.parse(db.attrValue)" :key="value">
                 {{ key2 + '：' + value }}
               </div>
             </template>
-            <template v-else>
-              <div style="padding: 0 30px">
-                {{ key + '：' + db }}
-              </div>
-            </template>
-          </div>
-        </template>
+          </template>
+        </div>
       </a-modal>
     </div>
   </div>
@@ -670,8 +651,26 @@ const wrjVisible = ref(false)
 const wrjName = ref('')
 const wrjData = ref([])
 const showWrj = (data) => {
+  console.log('data---dddd--------->', data);
   wrjName.value = data.wrjName
-  wrjData.value = data.details
+  // wrjData.value = data.details
+  wrjData.value = data.deviceAttrDTOList
+  // wrjData.value = []
+  // data.deviceAttrDTOList.map(v => {
+  //   console.log('v.attrType------------>', v.attrType);
+  //   console.log('v.attrValue------------>', v.attrValue);
+  //   try {
+  //     let obj = {
+  //       name: v.attrType,
+  //       list: v.attrValue && JSON.parse(v.attrValue)
+  //     }
+  //     wrjData.value.push(obj)
+  //   } catch (error) {
+  //     console.log('error------------>', error);
+  //   }
+  // })
+  // console.log('wrjData.value------------>', wrjData.value);
+
   wrjVisible.value = true
 }
 const goToWrj = (data) => {
@@ -1188,7 +1187,7 @@ const tabClick = (indexFather, name) => {
       getSoldierData(indexFather, name)
     } else if (name == '单兵设备') {
       pagination.value.current = 1;
-      getSoldierData(indexFather , name)
+      getSoldierData(indexFather, name)
     } else if (name == '城市云脑会客厅') {
       showMap.value = false
       dataSource.value = []
@@ -1218,7 +1217,7 @@ const tabClick = (indexFather, name) => {
   })
   console.log('选中的标签code', mapSearchParam.value)
   mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
- 
+
   if (name == '云资源' || name == '感知资源') {
     dataSource.value = []
     dataSource2.value = []
@@ -1262,7 +1261,7 @@ const getSoldierData = (indexFather, name) => {
     }
     let { list = [], total = 0 } = res.data.data;
     console.log('total------------>', total);
-    
+
     pagination.value.total = total
     if (name == '无人机') {
       list.map((wrj) => {
@@ -1413,7 +1412,7 @@ const dept = reactive({})
 // eslint-disable-next-line no-undef
 if (infrastructure) {
   console.log('infrastructure------------>', infrastructure);
-  
+
   // eslint-disable-next-line no-undef
   dept.deptId = infrastructure.deptId || ''
   // eslint-disable-next-line no-undef
@@ -1631,12 +1630,12 @@ const handleTableChange = (val) => {
   mapSearchParam.value.pageNum = val.current
   mapSearchParam.value.pageSize = val.pageSize
 
-  let _arr = clickList.value.filter(v=>v.content.includes('单兵设备') || v.content.includes('无人机')) || []
+  let _arr = clickList.value.filter(v => v.content.includes('单兵设备') || v.content.includes('无人机')) || []
   let _tab_name = _arr[0] && _arr[0].content && _arr[0].content[0]
   // 无人机、单兵设备
-  if(_tab_name) {
+  if (_tab_name) {
     getSoldierData(0, _tab_name)
-  }else {
+  } else {
     getCamera()
   }
 }
@@ -1977,6 +1976,7 @@ const showMsg = () => {
 .wrj {
   .ant-modal-body {
     height: 700px !important;
+    overflow-y: auto;
   }
 }
 
@@ -2087,5 +2087,4 @@ const showMsg = () => {
 video::-webkit-media-controls {
   display: none !important;
 }
-
 </style>