Merge branch 'develop' into FOTON

src/components/roleTree/index.vue

@@ -135,10 +135,7 @@
                 this.isVisible2 = false
             },
             saveUserInfo () {
-                if (this.nodeList[0].length === 0) {
-                    this.isVisible2 = false
-                    this.$emit('checkedRole', this.roleList)
-                } else if (this.nodeList.length > 0) {
+                if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) {
                     let ids = ''
                     this.nodeList.forEach(item => {
                         if (ids.length > 0) {

src/pages/config/pages/mechanismManage/index.vue

@@ -265,7 +265,7 @@ export default {
       total: 0,
       total2: 0,
       pageSize: this.$store.getters.userInfo.configContent,
-      sideClose: true,
+      sideClose: false,
       data: [], // table数据
       treeLoading: false,
       Loading: false,

src/pages/config/pages/roleManage/index.vue

@@ -313,7 +313,7 @@ export default {
       },
       nodeList2: [],
       modalflag: false,
-      sideClose: true, // 边栏收展状态
+      sideClose: false, // 边栏收展状态
       filterText: '',
       treeData: [],
       defaultProps: {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -20,7 +20,6 @@
               highlight-current
               @node-click="treeClick"
               :filter-node-method="filterNode"
-              default-expand-all
               :expand-on-click-node="false">
                   <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)"
                         @mouseleave="mouseleave(data)">
@@ -1895,7 +1894,7 @@ export default {
       loading: false,
       importLoading: false,
       isCollapse: true,
-      sideClose: true, // 边栏收展状态
+      sideClose: false, // 边栏收展状态
       isAdvancedSearch: false, // 高级检索窗口是否打开
       replaceStandNumModel: false,
       lawsExplainQuoteModel: false,

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -23,7 +23,6 @@
                   highlight-current
                   @node-click="treeClick"
                   :filter-node-method="filterNode"
-                  default-expand-all
                   :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                         <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
@@ -1961,7 +1960,7 @@ export default {
         creationTime: ''
       },
       removeOneId: '',
-      sideClose: true, // 边栏收展状态
+      sideClose: false, // 边栏收展状态
       twoOptions: [],
       threeOptions: [],
       orgData: [],

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -21,7 +21,6 @@
                     highlight-current
                     @node-click="treeClick"
                     :filter-node-method="filterNode"
-                    default-expand-all
                     :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                         <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
@@ -2129,7 +2128,7 @@
           creationTime: ''
         },
         removeOneId: '',
-        sideClose: true, // 边栏收展状态
+        sideClose: false, // 边栏收展状态
         twoOptions: [],
         threeOptions: [],
         orgData: [],

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -21,7 +21,6 @@
               highlight-current
               @node-click="treeClick"
               :filter-node-method="filterNode"
-              default-expand-all
               :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                         <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
@@ -1751,7 +1750,7 @@ export default {
       // 分页查询过程中用到的对象
       loading: false,
       isCollapse: true,
-      sideClose: true, // 边栏收展状态
+      sideClose: false, // 边栏收展状态
       isAdvancedSearch: false, // 高级检索窗口是否打开
       replaceStandNumModel: false,
       lawsExplainQuoteModel: false,