From 4c4fe02f74178dc943a18b97f48478daea6da46a Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Mon, 10 Oct 2022 10:11:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/AbilityToApplyFor.vue            | 8 ++++----
 front/src/views/home/apply.vue                        | 2 +-
 front/src/views/personalCenter/components/MyApply.vue | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index 4f23d218..ed119a40 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -92,8 +92,8 @@
             <div class="description">
               {{
                 val.description ||
-                ((val.note1 || '') &&
-                  (JSON.parse(val.note1)[0].channelName || '--') +
+                ((val.note1) &&
+                  (JSON.parse(val.note1) && JSON.parse(val.note1)[0] && JSON.parse(val.note1)[0].channelName || '--') +
                     '等' +
                     JSON.parse(val.note1).length +
                     '个摄像头') ||
@@ -148,7 +148,7 @@
   ])
   // eslint-disable-next-line vue/no-setup-props-destructure
   dataForm.value = props.dataList
-  console.log('=========================>', dataForm.value)
+  console.log('============dataList=============>', dataForm.value)
   // const router = useRouter()
   // const arr =
   //   router.currentRoute.value.query.name instanceof Array
@@ -177,7 +177,7 @@
       let arr = JSON.parse(note1)
       xVideoList.value = []
       arr.map((val) => {
-        xVideoList.value.push({ name: val.channelName, key: val.channelId })
+        xVideoList.value.push({ name: val.channelName || '', key: val.channelId })
       })
       videoVisible.value = true
     } else {
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 47f72b18..1f3f2e7c 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -51,7 +51,7 @@
                       style="width: 230px" :options="systemOptions" @focus="handleFocus" @blur="handleBlur"
                       @change="systemHandleChange" @search="systemHandleSearch"></a-select>
                   </a-form-item>
-                  <span style="font-size:12px;color:#666;padding-left:106px"> 请输入关键字（如选项没有系统请新增）</span>
+                  <span style="font-size:12px;color:#666;padding-left:106px"> 如选项没有系统请新增</span>
                 </div>
                 <a-form-item class="applicationScene" label="应用领域" name="applicationScene"
                   :rules="[{ required: true, message: '请选择应用领域' }]" style="width: 6.93rem">
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 1c11bafe..4e1b1353 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -148,7 +148,7 @@ let typeList = ref([
   '能力下架',
   '能力需求',
   '需求评论',
-  '能力评价',
+  // '能力评价',
 ])
 // 西海岸-设备申请
 let isXiHaiAn = whoShow.itShowXiHaiAn