From f9af97eb92e5927e550ba3dd51c81784d20a4957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 8 Dec 2021 11:14:17 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/empennage/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue
index 66e7ad0ea..e4bddce2a 100644
--- a/src/pages/home2/components/empennage/index.vue
+++ b/src/pages/home2/components/empennage/index.vue
@@ -7,7 +7,7 @@
     </div>
     <div style="display: inline-block;width: 80%;text-align: center">
       <el-row>
-        <span v-for="(item, index) in linkListFirst" :key="index">
+        <span v-for="(item, index) in linkListFirst" :key="index" v-if="index < 5">
               <el-col :span="4">
 <!--                <img
                   style="height: 10px;width: 10px;margin-bottom: 3px"
@@ -27,7 +27,7 @@
             </span>
       </el-row>
       <el-row style="margin-bottom: 10px;">
-        <span v-for="(item, index) in linkListSecond" :key="index">
+        <span v-for="(item, index) in linkListSecond" :key="index" v-if="index< 5">
               <el-col :span="4">
 <!--                <img
                   style="height: 10px;width: 10px;margin-bottom: 3px"

From 6afe997c426d86369ca2134f424cd18a6de0c1c6 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 8 Dec 2021 13:51:56 +0800
Subject: [PATCH 2/4] commit

---
 .../pages/technologyInvolveProject.vue                          | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
index ccf456ccf..4645b6d36 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
@@ -173,7 +173,6 @@
                   style="width: 100%"
                   border
                   :height="sarProStateTableHeight"
-                  :default-sort = "{prop: 'specificItem', order: 'ascending'}"
                   :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
             <el-table-column
@@ -201,7 +200,6 @@
             </el-table-column>
             <el-table-column
                     prop="specificItem"
-                    sortable
                     label="具体章条">
             </el-table-column>
             <el-table-column

From 0d1d70a3d2ac3f1bdf3930fdf678fec94bddc92a Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 8 Dec 2021 15:38:15 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/technologyInvolveProject.vue               | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
index 4645b6d36..d1a1a8024 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
@@ -14,12 +14,12 @@
                       placeholder="标准/政策名称查找"
                       clearable></el-input>
           </el-form-item>
-          <el-form-item label="类型" class="search-item search-item-last">
-            <el-select v-model="sarProject.position" placeholder="请选择标准性质">
-              <el-option value="1" label="国内"></el-option>
-              <el-option value="2" label="海外"></el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="类型" class="search-item search-item-last">-->
+<!--            <el-select v-model="sarProject.position" placeholder="请选择标准性质">-->
+<!--              <el-option value="1" label="国内"></el-option>-->
+<!--              <el-option value="2" label="海外"></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item label="" class="search-item btn-box">
             <el-button class="common-button-primary" type="primary"  size="mini" @click="searchStandAndLaws" v-btn-permission="'f3ea8cde1a7116aa7ba56ff33a19189f'">查询</el-button>
           </el-form-item>

From a5b6b9c75f73d3b44b3c7abaefe17205fb20be40 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 8 Dec 2021 16:54:54 +0800
Subject: [PATCH 4/4] commit

---
 src/components/roleTree/index.vue | 55 ++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 64c8f8a1e..c21e09c28 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -143,26 +143,33 @@
                 }
             }),
             checkChange2 (row, type, c) {
-                if (type) {
-                    this.nodeList.push(row.id)
+                if (this.checkBox) {
                 } else {
-                    for (let a = 0; a < this.nodeList.length; a ++) {
-                        if (row.id === this.nodeList[a]) {
-                            this.nodeList.splice(a, 1)
+                    if (type) {
+                        this.nodeList.push(row.id)
+                    } else {
+                        for (let a = 0; a < this.nodeList.length; a ++) {
+                            if (row.id === this.nodeList[a]) {
+                                this.nodeList.splice(a, 1)
+                            }
                         }
                     }
                 }
             },
             checkChange (row, type, c) {
-                if (type) {
-                    this.nodeList.push(row.id)
+                if (this.checkBox) {
                 } else {
-                    for (let a = 0; a < this.nodeList.length; a ++) {
-                        if (row.id === this.nodeList[a]) {
-                            this.nodeList.splice(a, 1)
+                    if (type) {
+                        this.nodeList.push(row.id)
+                    } else {
+                        for (let a = 0; a < this.nodeList.length; a ++) {
+                            if (row.id === this.nodeList[a]) {
+                                this.nodeList.splice(a, 1)
+                            }
                         }
                     }
                 }
+
             },
             handleTreeDrawerCancel () {
                 this.filterText = ''
@@ -200,17 +207,27 @@
                 this.open1 = true
             },
             drawerCheck (data) {
-                if (this.checkBox) {
+                if (this.checkBox) { // 单选
                     // 单选判断
-                    var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-                    if(getlist.length == 1) {
-                        this.roleRow = getlist[0]
-                    } else {
-                        this.$refs.tree.setCheckedKeys([data.id]);
-                        this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+                    let getlist = this.$refs.tree.getCheckedNodes()
+                    if (getlist.length > 1) {
+                        this.$refs.tree.setCheckedKeys([])
+                        this.$refs.tree.setCheckedKeys([data.id])
+                        this.roleList = [data]
+                    } else if (getlist.length === 0) {
+                        this.roleList = [{}]
+                    } else if (getlist.length === 1) {
+                        this.roleList = [data]
                     }
-                    this.roleList = [this.roleRow]
-                } else {
+                    // var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+                    // if(getlist.length == 1) {
+                    //     this.roleRow = getlist[0]
+                    // } else {
+                    //     this.$refs.tree.setCheckedKeys([data.id])
+                    //     this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+                    // }
+                    // this.roleList = [this.roleRow]
+                } else { // 多选
                     this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
                 }
             },