From 57981cf8bc5c461eb0e8ffea657406b4e2fe8e69 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 7 Nov 2023 15:04:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../phone/components/standardSystemPopup.vue     | 15 +++++++++++++--
 .../phone/components/standardSystemTree.vue      |  2 +-
 src/pages/phone/domesticStand.vue                | 16 ++++++++++++++--
 src/pages/phone/phoneHome.vue                    |  8 ++++++++
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/pages/phone/components/standardSystemPopup.vue b/src/pages/phone/components/standardSystemPopup.vue
index cd5c6d868..e2eeab1bb 100644
--- a/src/pages/phone/components/standardSystemPopup.vue
+++ b/src/pages/phone/components/standardSystemPopup.vue
@@ -10,6 +10,14 @@
       <van-icon name="cross" size="22px" @click="handleCancel" />
     </h3>
     <div class="popup-main">
+      <van-field name="radio" label="标准状态">
+        <template #input>
+          <van-radio-group v-model="textStatusName" direction="horizontal">
+            <van-radio name="全部">全部</van-radio>
+            <van-radio name="现行有效">现行有效</van-radio>
+          </van-radio-group>
+        </template>
+      </van-field>
       <standardSystemTree ref="standardSystemTreeRef" :data="standardSystemTreeData" :loading="loading" @checkedKey="getCheckedKey"></standardSystemTree>
     </div>
     <div class="popup-footer">
@@ -31,6 +39,7 @@ export default {
     return {
       popupShow: true,
       checkedKeys: [], // 选择的标准体系
+      textStatusName: '全部',
       standardSystemTreeData: [],
       loading: false,
       api: {
@@ -64,7 +73,8 @@ export default {
     handleOk () {
       // if (this.checkedKeys.length > 0) {
         this.popupShow = false
-        this.$emit('standSystemKeys', this.checkedKeys)
+        // this.$emit('standSystemKeys', this.checkedKeys)
+      this.$emit('searchQuery', { checkedKeys: this.checkedKeys, textStatusName: this.textStatusName })
       // } else {
       //   // this.$toast('请至少选择一项');
       //   this.$message.error('请至少选择一项')
@@ -81,7 +91,8 @@ export default {
     },
     handleReset () {
       this.popupShow = false
-      this.$emit('standSystemKeys', [])
+      // this.$emit('standSystemKeys', [])
+      this.$emit('searchQuery', { checkedKeys: [], textStatusName: '全部' })
     },
     async getData () {
       let url = this.api.getListStand
diff --git a/src/pages/phone/components/standardSystemTree.vue b/src/pages/phone/components/standardSystemTree.vue
index d5f0098f4..3857acee2 100644
--- a/src/pages/phone/components/standardSystemTree.vue
+++ b/src/pages/phone/components/standardSystemTree.vue
@@ -9,7 +9,7 @@
        :lazy="false"
        :show-checkbox="true"
        node-key="id"
-       :default-expanded-keys="data[0].id"
+       :default-expanded-keys="[data[0].id]"
        :check-strictly="true"
        :expand-on-click-node="false"
        :check-on-click-node="true"
diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue
index 3a49c4082..9ce0d422b 100644
--- a/src/pages/phone/domesticStand.vue
+++ b/src/pages/phone/domesticStand.vue
@@ -34,7 +34,7 @@
          <div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>
        </div>
        <div class="standContent">
-         <div class="standState">{{item.standName && item.standName !== '' ? item.standName : item.standEnName}}</div>
+         <div class="standState">{{item.standName && item.standName !== '' ? item.standName : item.standEnName !== '' ? item.standEnName : item.nameshow }}</div>
 <!--         <div class="standSubTime">标准性质:-->
 <!--           <span v-if="natureMap[item.standNature] === '强制性' "-->
 <!--                 style="color: #F56C6C; padding-left: 5px;">-->
@@ -102,7 +102,7 @@
      <div v-else-if="!listFlag && moreFlag"  @click="moreList" >点击加载更多</div>
      <van-loading v-else size="24px" color="#3170A8">加载中...</van-loading>
    </div>
-   <standardSystemPopup :init-keys="standSystemKeys" @standSystemKeys="setStandSystemKeys" ref="standardSystemPopupRef" />
+   <standardSystemPopup :init-keys="standSystemKeys" @searchQuery="setSearchQuery" ref="standardSystemPopupRef" />
  </div>
 </template>
 
@@ -131,6 +131,7 @@ export default {
       textStatusMap: {},// 文本状态id与name对应
       natureMap:{},
       lawsMap:{},
+      textStatusName: '全部',
       standSystemKeys: []
     }
   },
@@ -190,6 +191,7 @@ export default {
           selectIndex: 'stand',
           selectValue: this.searchKey,
           standSystem: this.standSystemKeys,
+          textStatusName: this.textStatusName,
           selectType: 'titleSearch',
           standType: 'INLAND',
           page: this.page,
@@ -227,6 +229,7 @@ export default {
           selectIndex: 'stand',
           selectValue: this.searchKey,
           standSystem: this.standSystemKeys,
+          textStatusName: this.textStatusName,
           selectType: 'titleSearch',
           standType: 'FOREIGN',
           page: this.page,
@@ -249,6 +252,7 @@ export default {
           selectIndex: 'bussstand',
           selectValue: this.searchKey,
           standSystem: this.standSystemKeys,
+          textStatusBussName: this.textStatusName,
           selectType: 'titleSearch',
           standType: 'bussstand',
           page: this.page,
@@ -355,6 +359,7 @@ export default {
           selectIndex: 'stand',
           selectValue: this.searchKey,
           standSystem: this.standSystemKeys,
+          textStatusName: this.textStatusName,
           selectType: 'titleSearch',
           standType: 'INLAND',
           page: this.page,
@@ -410,6 +415,7 @@ export default {
           selectIndex: 'stand',
           selectValue: this.searchKey,
           standSystem: this.standSystemKeys,
+          textStatusName: this.textStatusName,
           selectType: 'titleSearch',
           standType: 'FOREIGN',
           page: this.page,
@@ -440,6 +446,7 @@ export default {
           selectIndex: 'bussstand',
           selectValue: this.searchKey,
           standSystem: this.standSystemKeys,
+          textStatusBussName: this.textStatusName,
           selectType: 'titleSearch',
           standType: 'bussstand',
           page: this.page,
@@ -572,6 +579,11 @@ export default {
     onChoose () {
       this.$refs.standardSystemPopupRef.open()
     },
+    setSearchQuery (searchQuery) {
+      this.standSystemKeys = searchQuery.checkedKeys
+      this.textStatusName = searchQuery.textStatusName
+      this.onSearch()
+    },
     setStandSystemKeys (standSystemKeys) {
       this.standSystemKeys = standSystemKeys
       this.onSearch()
diff --git a/src/pages/phone/phoneHome.vue b/src/pages/phone/phoneHome.vue
index 0c66fc044..0d15d352c 100644
--- a/src/pages/phone/phoneHome.vue
+++ b/src/pages/phone/phoneHome.vue
@@ -40,6 +40,7 @@
         <span class="content-span">标准化动态</span>
       </div>
     </div>
+    <div class="footer" style="">系统开发中...</div>
   </div>
 </template>
 
@@ -199,5 +200,12 @@ export default {
       font-weight: 500;
     }
   }
+  .footer{
+    color: #3170A7;
+    position: absolute;
+    bottom: 10px;
+    left: 50%;
+    transform: translateX(-50%);
+  }
 }
 </style>