From 1331c522468a2c4bf49ed011979fff22e33fc027 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 12 Sep 2023 16:59:00 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85/=E6=B5=B7=E5=A4=96=E5=A2=9E=E5=8A=A0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=BC=B9=E7=AA=97=E3=80=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../phone/components/standardSystemPopup.vue  | 100 ++++++++++++++++++
 .../phone/components/standardSystemTree.vue   |  73 +++++++++++++
 src/pages/phone/domesticStand.vue             | 100 +++++++++++++++---
 src/pages/phone/phoneHome.vue                 |  10 +-
 4 files changed, 267 insertions(+), 16 deletions(-)
 create mode 100644 src/pages/phone/components/standardSystemPopup.vue
 create mode 100644 src/pages/phone/components/standardSystemTree.vue

diff --git a/src/pages/phone/components/standardSystemPopup.vue b/src/pages/phone/components/standardSystemPopup.vue
new file mode 100644
index 000000000..4af9e17ac
--- /dev/null
+++ b/src/pages/phone/components/standardSystemPopup.vue
@@ -0,0 +1,100 @@
+<template>
+  <van-popup v-model="popupShow"
+             position="right"
+             :style="{ height: '100%', width: '90%' }"
+             round
+             :close-on-click-overlay="false"
+             @click-overlay="handleCancel">
+    <h3 class="popup-title">
+      <span>标准体系</span>
+      <van-icon name="cross" size="22px" @click="handleCancel" />
+    </h3>
+    <div class="popup-main">
+      <standardSystemTree ref="standardSystemTreeRef" @checkedKey="getCheckedKey"></standardSystemTree>
+    </div>
+    <div class="popup-footer">
+      <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="handleOk">确定</el-button>
+      <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleCancel">取消</el-button>
+    </div>
+  </van-popup>
+</template>
+
+<script>
+import standardSystemTree from "./standardSystemTree";
+export default {
+  name: "standardSystemPopup",
+  components: {
+    standardSystemTree,
+  },
+  data () {
+    return {
+      popupShow: true,
+      checkedKeys: [], // 选择的标准体系
+    }
+  },
+  props: {
+    // 以前的选中项
+    initKeys: {
+      type: Array,
+      required: true
+    }
+  },
+  methods: {
+    open () {
+      this.$refs.standardSystemTreeRef.setCheckedKeys(this.initKeys)
+      this.popupShow = true
+    },
+    hide () {
+      this.popupShow = false
+    },
+    getCheckedKey (val) {
+      this.checkedKeys = val
+    },
+    handleOk () {
+      if (this.checkedKeys.length > 0) {
+        this.popupShow = false
+        this.$emit('standSystemKeys', this.checkedKeys)
+      } else {
+        // this.$toast('请至少选择一项');
+        this.$message.error('请至少选择一项')
+        this.popupShow = true
+      }
+    },
+    handleCancel () {
+      if (this.initKeys.length > 0) {
+        this.hide()
+      } else {
+        this.$message.error('请至少选择一项')
+        this.open()
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+.popup-title{
+  line-height: 1rem;
+  border-bottom: 1px solid #e5e5e5;
+  padding: 0 0.3rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.popup-main{
+  height: calc(100vh - 1rem - 50px);
+  overflow: hidden;
+  overflow-y: auto;
+  overflow-x: auto;
+}
+.popup-footer{
+  border-top: 1px solid #e8e8e8;
+  text-align: right;
+  padding-right: 0.2rem;
+  height: 50px;
+  line-height: 50px;
+  position: fixed;
+  bottom: 1px;
+  width: 100%;
+}
+</style>
diff --git a/src/pages/phone/components/standardSystemTree.vue b/src/pages/phone/components/standardSystemTree.vue
new file mode 100644
index 000000000..1d5ad8035
--- /dev/null
+++ b/src/pages/phone/components/standardSystemTree.vue
@@ -0,0 +1,73 @@
+<template>
+    <el-tree class="popup-tree"  ref="tree" :data="data" :props="defaultProps"
+       :lazy="false"
+       :show-checkbox="true"
+       node-key="id"
+       :check-strictly="true"
+       :expand-on-click-node="false"
+       :check-on-click-node="true"
+       :default-checked-keys="defaultCheckedKeys"
+       :highlight-current="true"
+       @node-click="handleNodeClick"
+       @check-change="handleCheckChange">
+    </el-tree>
+</template>
+
+<script>
+export default {
+  name: "standardSystemTree",
+  data () {
+    return {
+      data: [],
+      defaultProps: {
+        children: 'children',
+        label: 'menuName'
+      },
+      defaultCheckedKeys: [],
+      checkedKeys: []
+    }
+  },
+  created () {
+    this.getStandardSystem()
+  },
+  methods: {
+    getStandardSystem () {
+      this.$http._getData('sys/dictype/getDicTypeListCode').then(res => {
+        if (res.ok && res.data) {
+          this.data = res.data.TXLBBUSS // 标准体系
+        }
+      })
+    },
+    handleNodeClick (data, node, element) {
+      // console.log(data, node, element)
+    },
+    handleCheckChange (data, isChecked, childIsChecked) {
+      const id = data.id
+      if (isChecked) {
+        if (!this.checkedKeys.some(key => key === id)) {
+          this.checkedKeys = [...this.checkedKeys, id]
+        }
+      } else {
+        if (this.checkedKeys.some(key => key === id)) {
+          this.checkedKeys = this.checkedKeys.filter(key => key !== id)
+        }
+      }
+      this.$emit('checkedKey', this.checkedKeys)
+    },
+    setCheckedKeys (keys) {
+      this.$refs.tree.setCheckedKeys(keys)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.popup-tree{
+  /deep/ .el-tree-node__expand-icon{
+    font-size: 20px;
+  }
+  /deep/ .el-tree-node__label{
+    font-size: 18px;
+  }
+}
+</style>
diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue
index fb2535f97..a4e6fe71c 100644
--- a/src/pages/phone/domesticStand.vue
+++ b/src/pages/phone/domesticStand.vue
@@ -6,16 +6,20 @@
        <span class="left-title" @click="back"> < </span>
        <span class="right-title">{{titleName}}</span>
      </div>
-     <van-search
-       v-model="searchKey"
-       show-action
-       placeholder="请输入搜索关键词"
-       @search="onSearch"
-     >
-       <template #action>
-         <div @click="onSearch">搜索</div>
-       </template>
-     </van-search>
+     <div style="display: flex;align-items: center">
+       <van-search
+           style="flex: 1"
+           v-model="searchKey"
+           show-action
+           placeholder="请输入搜索关键词"
+           @search="onSearch"
+       >
+         <template #action>
+           <div @click="onSearch">搜索</div>
+         </template>
+       </van-search>
+       <div @click="onChoose" style="color: #fff;padding: 10px 12px 0 0">选择标准体系</div>
+     </div>
    </div>
    <div class="card-box" ref="cardBox" @scroll="scrool">
      <div v-if="loading">
@@ -96,12 +100,17 @@
      <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" />
  </div>
 </template>
 
 <script>
+import standardSystemPopup from "./components/standardSystemPopup";
 export default {
   name: "domesticStand",
+  components: {
+    standardSystemPopup,
+  },
   data(){
     return{
       scrolled: '',
@@ -120,6 +129,7 @@ export default {
       textStatusMap: {},// 文本状态id与name对应
       natureMap:{},
       lawsMap:{},
+      standSystemKeys: []
     }
   },
   methods:{
@@ -177,6 +187,7 @@ export default {
         this.$http.post('search/searchCenter/searchSarBykey',{
           selectIndex: 'stand',
           selectValue: this.searchKey,
+          standSystem: this.standSystemKeys,
           selectType: 'titleSearch',
           standType: 'INLAND',
           page: this.page,
@@ -213,6 +224,7 @@ export default {
         this.$http.post('search/searchCenter/searchSarBykey',{
           selectIndex: 'stand',
           selectValue: this.searchKey,
+          standSystem: this.standSystemKeys,
           selectType: 'titleSearch',
           standType: 'FOREIGN',
           page: this.page,
@@ -230,6 +242,26 @@ export default {
           console.log(e)
         })
 
+      } else if (this.titleType === 'bussstand') {
+        this.$http.post('search/searchCenter/searchSarBykey',{
+          selectIndex: 'bussstand',
+          selectValue: this.searchKey,
+          standSystem: this.standSystemKeys,
+          selectType: 'titleSearch',
+          standType: 'bussstand',
+          page: this.page,
+          pageSize: 20
+        },{
+          _this: this,
+        }, res => {
+          if (res.ok){
+            this.standList = res.data.list
+            this.loading = false
+          }else {
+            this.$message.error(res.message)
+          }
+        }, e => {
+        })
       }else if(this.titleType === 'POLICY'){
         // this.$http.get('lawss/sarLawsInfo/page',{
         //   page: 1,
@@ -250,6 +282,7 @@ export default {
         this.$http.post('search/searchCenter/searchSarBykey',{
           selectIndex: 'laws',
           selectValue: this.searchKey,
+          standSystem: this.standSystemKeys,
           selectType: 'titleSearch',
           type: 'laws',
           page: this.page,
@@ -271,6 +304,7 @@ export default {
         this.$http.get("/lawss/NewsFeed/getNewsFeed", {
           messageType: 'ZYBZFG',
           standard: this.searchKey,
+          standSystem: this.standSystemKeys,
           page: 1,
           paeSize: 10
         }, {
@@ -318,6 +352,7 @@ export default {
         this.$http.post('search/searchCenter/searchSarBykey',{
           selectIndex: 'stand',
           selectValue: this.searchKey,
+          standSystem: this.standSystemKeys,
           selectType: 'titleSearch',
           standType: 'INLAND',
           page: this.page,
@@ -372,6 +407,7 @@ export default {
         this.$http.post('search/searchCenter/searchSarBykey',{
           selectIndex: 'stand',
           selectValue: this.searchKey,
+          standSystem: this.standSystemKeys,
           selectType: 'titleSearch',
           standType: 'FOREIGN',
           page: this.page,
@@ -397,6 +433,36 @@ export default {
         }, e => {
           console.log(e)
         })
+      } else if (this.titleType === 'bussstand') {
+        this.$http.post('search/searchCenter/searchSarBykey',{
+          selectIndex: 'bussstand',
+          selectValue: this.searchKey,
+          standSystem: this.standSystemKeys,
+          selectType: 'titleSearch',
+          standType: 'bussstand',
+          page: this.page,
+          pageSize: 20
+        },{
+          _this: this,
+        }, res => {
+          if(res.ok){
+            if(res.data.list.length){
+              if(this.standList.length){
+                this.standList = this.standList.concat(res.data.list)
+              }else{
+                this.standList = res.data.list
+              }
+              this.loading = false
+            }else{
+              this.loading = false
+              this.listFlag = true
+            }
+          }else{
+            this.$message.error(res.message)
+          }
+        }, e => {
+          console.log(e)
+        })
       }else if(this.titleType === 'POLICY'){
        // this.$http.get('lawss/sarLawsInfo/page',{
        //   lawsNumber: this.searchKey,
@@ -425,6 +491,7 @@ export default {
         this.$http.post('search/searchCenter/searchSarBykey',{
           selectIndex: 'laws',
           selectValue: this.searchKey,
+          standSystem: this.standSystemKeys,
           selectType: 'titleSearch',
           type: 'laws',
           page: this.page,
@@ -454,6 +521,7 @@ export default {
         this.$http.get("/lawss/NewsFeed/getNewsFeed", {
           messageType: 'ZYBZFG',
           standard: this.searchKey,
+          standSystem: this.standSystemKeys,
           page: 1,
           paeSize: 10
         }, {
@@ -499,10 +567,17 @@ export default {
         this.$set(this.lawsMap, item.value, item.label);
       });
     },
+    onChoose () {
+      this.$refs.standardSystemPopupRef.open()
+    },
+    setStandSystemKeys (standSystemKeys) {
+      this.standSystemKeys = standSystemKeys
+      this.onSearch()
+    }
   },
   mounted() {
     this.titleType = this.$route.query.standType
-    this.titleName = this.titleType === 'INLAND' ? '国内标准法规库' : (this.titleType === 'FOREIGN' ? '海外标准法规库' : this.titleType === 'POLICY' ? '国内外政策库' : '标准化动态库' )
+    this.titleName = this.titleType === 'INLAND' ? '国内标准法规库' : (this.titleType === 'FOREIGN' ? '海外标准法规库' : this.titleType === 'bussstand' ? '企业标准' : this.titleType === 'POLICY' ? '国内外政策库' : '标准化动态库' )
     this.standSearch()
     this.$refs.cardBox.addEventListener('scroll', this.scrool);
     //从数据库中查询下拉框数据
@@ -533,7 +608,7 @@ export default {
     height: 100px;
     position: absolute;
     top: 0;
-    z-index: 9999;
+    z-index: 1000;
     background: #3170A8;
   }
   .head-title{
@@ -632,5 +707,4 @@ export default {
     margin-bottom: 30px;
   }
 }
-
 </style>
diff --git a/src/pages/phone/phoneHome.vue b/src/pages/phone/phoneHome.vue
index b8e8de649..0c66fc044 100644
--- a/src/pages/phone/phoneHome.vue
+++ b/src/pages/phone/phoneHome.vue
@@ -27,9 +27,13 @@
         <div class="content-box content-box2"></div>
         <span class="content-span">海外标准法规</span>
       </div>
-      <div class="content-top" @click="standChange('POLICY')">
-        <div class="content-box content-box3"></div>
-        <span class="content-span">国内外政策</span>
+      <!--<div class="content-top" @click="standChange('POLICY')">-->
+      <!--  <div class="content-box content-box3"></div>-->
+      <!--  <span class="content-span">国内外政策</span>-->
+      <!--</div>-->
+      <div class="content-top" @click="standChange('bussstand')">
+        <div class="content-box content-box3" style="margin-left: 0.2em"></div>
+        <span class="content-span">企业标准</span>
       </div>
       <div class="content-top" @click="standChange('DYNAMIC')">
         <div class="content-box content-box4"></div>

From 006e4b46cdd70effcb33c7f0d4043e78c851f93a Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 14 Sep 2023 09:45:37 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=8C=96=E5=8A=A8=E6=80=81-=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/phone/components/folderPopup.vue    |  84 +++++++++
 src/pages/phone/components/folderTree.vue     | 169 ++++++++++++++++++
 .../phone/components/standardSystemTree.vue   |   4 +
 src/pages/phone/standDynamics.vue             |  27 ++-
 4 files changed, 282 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/phone/components/folderPopup.vue
 create mode 100644 src/pages/phone/components/folderTree.vue

diff --git a/src/pages/phone/components/folderPopup.vue b/src/pages/phone/components/folderPopup.vue
new file mode 100644
index 000000000..2957ea640
--- /dev/null
+++ b/src/pages/phone/components/folderPopup.vue
@@ -0,0 +1,84 @@
+<template>
+  <van-popup v-model="popupShow"
+             position="right"
+             :style="{ height: '100%', width: '90%' }"
+             round
+             :close-on-click-overlay="false"
+             @click-overlay="handleCancel">
+    <h3 class="popup-title">
+      <span>体系结构</span>
+      <van-icon name="cross" size="22px" @click="handleCancel" />
+    </h3>
+    <div class="popup-main">
+      <folderTree ref="folderTreeRef" @checked="getChecked"></folderTree>
+    </div>
+    <div class="popup-footer">
+      <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="handleOk">确定</el-button>
+      <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleCancel">取消</el-button>
+    </div>
+  </van-popup>
+</template>
+
+<script>
+import folderTree from "./folderTree";
+export default {
+  name: "folderPopup",
+  components: {
+    folderTree,
+  },
+  data () {
+    return {
+      popupShow: false,
+      currentData: {}
+    }
+  },
+  methods: {
+    open (id) {
+      this.popupShow = true
+      this.$nextTick(() => {
+        this.$refs.folderTreeRef.setCurrentKey(id)
+      })
+    },
+    hide () {
+      this.popupShow = false
+    },
+    getChecked (obj) {
+      this.currentData = obj
+    },
+    handleOk () {
+      this.$emit('checked',  this.currentData)
+      this.hide()
+    },
+    handleCancel () {
+      this.hide()
+    },
+  }
+}
+</script>
+
+<style scoped>
+.popup-title{
+  line-height: 1rem;
+  border-bottom: 1px solid #e5e5e5;
+  padding: 0 0.3rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.popup-main{
+  height: calc(100vh - 1rem - 50px);
+  overflow: hidden;
+  overflow-y: auto;
+  overflow-x: auto;
+}
+.popup-footer{
+  border-top: 1px solid #e8e8e8;
+  text-align: right;
+  padding-right: 0.2rem;
+  height: 50px;
+  line-height: 50px;
+  position: fixed;
+  bottom: 1px;
+  width: 100%;
+}
+</style>
diff --git a/src/pages/phone/components/folderTree.vue b/src/pages/phone/components/folderTree.vue
new file mode 100644
index 000000000..d100cd8f4
--- /dev/null
+++ b/src/pages/phone/components/folderTree.vue
@@ -0,0 +1,169 @@
+<template>
+    <div class="tree">
+      <el-tree
+         ref="tree"
+         node-key="id"
+         class="tree-line"
+         icon-class="icon-tree"
+         :indent="0"
+         :props="props"
+         :data="treeList"
+         :default-expanded-keys="['1']"
+         highlight-current
+         :current-node-key="currentKey"
+         :filter-node-method="filterNode"
+         @node-click="handleNodeClick">
+        <span class="custom-tree-node" slot-scope="{ node, data }">
+          <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
+          <span style="font-size:18px"> {{ node.label }} </span>
+        </span>
+      </el-tree>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "folderTree",
+  data () {
+    return {
+      treeList: [],
+      props: {
+        label: 'name',
+        children: 'children'
+      },
+      currentKey: ''
+    }
+  },
+  created () {
+    this.getTreeData()
+  },
+  methods: {
+    getTreeData () {
+      this.$http._getData('fileMaterialCenter/zlTree').then(res => {
+        if (res.ok && res.data) {
+          this.treeList = res.data
+        }
+      })
+    },
+    filterNode (value, data) {
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    },
+    handleNodeClick (data, node, element) {
+      this.$emit('checked', data)
+    },
+    setCurrentKey (id) {
+      this.currentKey = id
+      this.$nextTick(()=>{
+        this.$refs.tree.setCurrentKey(this.currentKey)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.tree-line {
+
+  /deep/ .el-tree-node {
+    position: relative;
+    padding-left: 0px; // 缩进量
+    line-height: 30px;
+  }
+
+  /deep/ .el-tree-node__children {
+    padding-left: 16px; // 缩进量
+    overflow: inherit; // 横向滚动条默认hidden
+  }
+  .el-tree-node__content{
+    //display: block!important;
+  }
+
+  // 竖线
+  /deep/ .el-tree-node::before {
+    content: "";
+    height: 100%;
+    width: 1px;
+    position: absolute;
+    //left: -3px;
+    //top: -26px;
+    left: -1px;
+    top: -5px;
+    border-width: 1px;
+    border-left: 1px dashed #858990e0;
+  }
+
+  // 当前层最后一个节点的竖线高度固定
+  /deep/ .el-tree-node:last-child::before {
+    //height: 38px; // 可以自己调节到合适数值
+    height: 17px; // 可以自己调节到合适数值
+  }
+
+  // 横线
+  /deep/ .el-tree-node::after {
+    content: "";
+    width: 11px;
+    height: 20px;
+    position: absolute;
+    //left: -3px;
+    left: -1px;
+    top: 12px;
+    border-width: 1px;
+    border-top: 1px dashed #858990e0;
+  }
+
+  // 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
+  /deep/ & > .el-tree-node::after {
+    border-top: none;
+  }
+
+  /deep/ & > .el-tree-node::before {
+    border-left: none;
+  }
+
+  // 展开关闭的icon
+  /deep/ .el-tree-node__expand-icon {
+    font-size: 20px;
+    // 叶子节点（无子节点）
+    &.is-leaf {
+      color: transparent;
+       //display: none; // 也可以去掉
+    }
+  }
+}
+
+/deep/ .icon-tree {
+  margin: 0 5px 0 10px;
+  position: relative;
+  background: url('~@/assets/images/shangqi/img/tree-add.png');
+  background-size: 100% 100%;
+}
+
+/deep/ .is-leaf {
+  background-image: none;
+  background-size: 100% 100%;
+}
+
+/deep/ .expanded {
+  background: url('~@/assets/images/shangqi/img/tree-sub.png');
+  background-size: 100% 100%;
+}
+
+/deep/ .is-leaf-none {
+  position: relative;
+  display: inline-block;
+  width: 15px;
+  height: 15px;
+  background: url('~@/assets/images/shangqi/img/none-file-new.png');
+  background-size: 100% 100%;
+}
+
+/deep/ .is-show {
+  position: relative;
+  display: inline-block;
+  width: 15px;
+  height: 15px;
+  background: url('~@/assets/images/shangqi/img/tree.png');
+  background-size: 100% 100%;
+}
+</style>
diff --git a/src/pages/phone/components/standardSystemTree.vue b/src/pages/phone/components/standardSystemTree.vue
index 1d5ad8035..9746846f1 100644
--- a/src/pages/phone/components/standardSystemTree.vue
+++ b/src/pages/phone/components/standardSystemTree.vue
@@ -54,6 +54,7 @@ export default {
       }
       this.$emit('checkedKey', this.checkedKeys)
     },
+    // 通过 keys 设置目前勾选的节点
     setCheckedKeys (keys) {
       this.$refs.tree.setCheckedKeys(keys)
     }
@@ -69,5 +70,8 @@ export default {
   /deep/ .el-tree-node__label{
     font-size: 18px;
   }
+  /deep/ .el-tree-node__children {
+    overflow: inherit; // 横向滚动条
+  }
 }
 </style>
diff --git a/src/pages/phone/standDynamics.vue b/src/pages/phone/standDynamics.vue
index ffadc7615..9affe344c 100644
--- a/src/pages/phone/standDynamics.vue
+++ b/src/pages/phone/standDynamics.vue
@@ -72,6 +72,11 @@
           </div>
         </van-tab>
         <van-tab name="ZLZX" title="资料中心">
+          <van-search v-model="currentSearch.name" show-action clearable placeholder="请输入搜索关键词" @focus="onFocus" >
+            <template #action>
+              <div @click="onCancel">取消</div>
+            </template>
+          </van-search>
           <div class="card-box" ref="cardBoxTwo" @scroll="scroolThree">
             <div v-if="loading">
               <van-loading size="24px" color="#3170A8">加载中...</van-loading>
@@ -108,13 +113,18 @@
           </div>
         </van-tab>
       </van-tabs>
+      <folderPopup ref="folderPopupRef"  @checked="setChecked" />
     </div>
   </div>
 </template>
 
 <script>
+import folderPopup from "./components/folderPopup";
 export default {
   name: "standDynamics",
+  components: {
+    folderPopup
+  },
   data() {
     return {
       active: "",
@@ -127,7 +137,8 @@ export default {
       loading: true,
       scrolled: "",
       moreFlag: false,
-      listFlag: false
+      listFlag: false,
+      currentSearch: {}
     };
   },
   methods: {
@@ -231,7 +242,8 @@ export default {
     getAdvice() {
       this.$http.get("fileMaterialCenter/file-material/getFileMaterialIndex", {
         page: this.page,
-        pageSize: 10
+        pageSize: 10,
+        treeId: this.currentSearch.id || ''
       }, {
         _this: this, loading: "loading"
       }, res => {
@@ -292,6 +304,17 @@ export default {
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label);
       });
+    },
+    onFocus () {
+      this.$refs.folderPopupRef.open(this.currentSearch.id || null)
+    },
+    onCancel () {
+      this.$set(this, 'currentSearch', {})
+      this.getAdvice()
+    },
+    setChecked (currentData) {
+      this.currentSearch = currentData
+      this.getAdvice()
     }
   },
   mounted() {

From b8165c73e9b6280923ede8cd9b403c8d6836bce0 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 14 Sep 2023 10:39:48 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=8C=96=E5=8A=A8=E6=80=81-=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=90=9C=E7=B4=A2=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/phone/standDynamics.vue | 39 ++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/pages/phone/standDynamics.vue b/src/pages/phone/standDynamics.vue
index 9affe344c..62c9cea99 100644
--- a/src/pages/phone/standDynamics.vue
+++ b/src/pages/phone/standDynamics.vue
@@ -77,7 +77,7 @@
               <div @click="onCancel">取消</div>
             </template>
           </van-search>
-          <div class="card-box" ref="cardBoxTwo" @scroll="scroolThree">
+          <div class="card-box-three" ref="cardBoxThree" @scroll="scroolThree">
             <div v-if="loading">
               <van-loading size="24px" color="#3170A8">加载中...</van-loading>
             </div>
@@ -173,12 +173,11 @@ export default {
       }
     },
     scroolThree() {
-      this.scrolled = this.$refs.cardBoxTwo.scrollTop;
-      console.log(this.$refs.cardBoxTwo.scrollTop);
+      this.scrolled = this.$refs.cardBoxThree.scrollTop;
       //获得可视区的高度
-      const windowHeight = this.$refs.cardBoxTwo.clientHeight;
+      const windowHeight = this.$refs.cardBoxThree.clientHeight;
       //获取滚动条的总高度
-      const scrollHeight = this.$refs.cardBoxTwo.scrollHeight;
+      const scrollHeight = this.$refs.cardBoxThree.scrollHeight;
       let windowScrolled = this.scrolled + windowHeight;
       if (scrollHeight - windowScrolled < 100 && this.scrolled !== 0) {
         //把距离顶部的距离加上可视区域的高度
@@ -233,37 +232,37 @@ export default {
       this.standList = [];
       this.standardReleaseList = [];
       if (this.messageType == "ZLZX") {
-        this.getAdvice();
+        this.getAdvice(true);
       } else {
         this.onDynamics();
       }
     },
     //获取数据
-    getAdvice() {
-      this.$http.get("fileMaterialCenter/file-material/getFileMaterialIndex", {
-        page: this.page,
+    getAdvice(first = false) {
+      this.listFlag = false;
+      this.$http.get("fileMaterialCenter/file-material", {
+        page: first ? 1 : this.page,
         pageSize: 10,
         treeId: this.currentSearch.id || ''
       }, {
         _this: this, loading: "loading"
       }, res => {
         if (res.ok) {
-          let mList = res.data;
+          let mList = res.data.records || [];
           if (mList.length) {
-            if (this.standardReleaseList.length) {
+            if (!first && this.standardReleaseList.length) {
               this.standardReleaseList = this.standardReleaseList.concat(mList);
             } else {
               this.standardReleaseList = mList;
             }
-            this.loading = false;
           } else {
-            this.loading = false;
+            this.standardReleaseList = [];
             this.listFlag = true;
           }
         } else {
           this.standardReleaseList = [];
-          this.loading = false;
         }
+        this.loading = false;
       }, e => {
         this.standardReleaseList = [];
         this.total = 0;
@@ -310,11 +309,11 @@ export default {
     },
     onCancel () {
       this.$set(this, 'currentSearch', {})
-      this.getAdvice()
+      this.getAdvice(true)
     },
     setChecked (currentData) {
       this.currentSearch = currentData
-      this.getAdvice()
+      this.getAdvice(true)
     }
   },
   mounted() {
@@ -398,6 +397,14 @@ export default {
 
   }
 
+  .card-box-three {
+    height: calc(85% - 54px);
+    position: relative;
+    overflow-x: hidden;
+    overflow-y: scroll;
+    top: 10px;
+  }
+
   .card-content {
     width: 95%;
     height: auto;

From 035464f391d5f6f4d438e6b97ccdb6dc2304751f Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 14 Sep 2023 10:47:49 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85/=E6=B5=B7=E5=A4=96/=E4=BC=81=E6=A0=87-=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E4=BD=93=E7=B3=BB=E5=8F=AF=E4=B8=8D=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/phone/domesticStand.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue
index a4e6fe71c..3a49c4082 100644
--- a/src/pages/phone/domesticStand.vue
+++ b/src/pages/phone/domesticStand.vue
@@ -8,7 +8,7 @@
      </div>
      <div style="display: flex;align-items: center">
        <van-search
-           style="flex: 1"
+           style="flex: 1;padding-right: 0"
            v-model="searchKey"
            show-action
            placeholder="请输入搜索关键词"
@@ -18,7 +18,9 @@
            <div @click="onSearch">搜索</div>
          </template>
        </van-search>
-       <div @click="onChoose" style="color: #fff;padding: 10px 12px 0 0">选择标准体系</div>
+       <div @click="onChoose" style="color: #fff;padding: 10px 12px 0 0">
+         <van-icon name="filter-o" color="#fff"  />
+       </div>
      </div>
    </div>
    <div class="card-box" ref="cardBox" @scroll="scrool">

From 44bb5f51d146a5ab07bb8da53c2c426986224c37 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 14 Sep 2023 10:54:41 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85/=E6=B5=B7=E5=A4=96/=E4=BC=81=E6=A0=87-=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E4=BD=93=E7=B3=BB=E5=8F=AF=E4=B8=8D=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../phone/components/standardSystemPopup.vue  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/pages/phone/components/standardSystemPopup.vue b/src/pages/phone/components/standardSystemPopup.vue
index 4af9e17ac..bf33f569c 100644
--- a/src/pages/phone/components/standardSystemPopup.vue
+++ b/src/pages/phone/components/standardSystemPopup.vue
@@ -51,22 +51,22 @@ export default {
       this.checkedKeys = val
     },
     handleOk () {
-      if (this.checkedKeys.length > 0) {
+      // if (this.checkedKeys.length > 0) {
         this.popupShow = false
         this.$emit('standSystemKeys', this.checkedKeys)
-      } else {
-        // this.$toast('请至少选择一项');
-        this.$message.error('请至少选择一项')
-        this.popupShow = true
-      }
+      // } else {
+      //   // this.$toast('请至少选择一项');
+      //   this.$message.error('请至少选择一项')
+      //   this.popupShow = true
+      // }
     },
     handleCancel () {
-      if (this.initKeys.length > 0) {
+      // if (this.initKeys.length > 0) {
         this.hide()
-      } else {
-        this.$message.error('请至少选择一项')
-        this.open()
-      }
+      // } else {
+      //   this.$message.error('请至少选择一项')
+      //   this.open()
+      // }
     },
   }
 }

From 2976d41fdfcd6d956567e40d22164e7e391c8a3d Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 14 Sep 2023 14:35:04 +0800
Subject: [PATCH 6/6] =?UTF-8?q?pc=E7=AB=AF-=E6=90=9C=E7=B4=A2=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83-=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=87=86=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/components/standSystemModel.vue     | 104 ++++++++++++++++++
 .../pages/components/standSystemTree.vue      |  73 ++++++++++++
 .../searchCenter/pages/standardSearch.vue     |  24 ++++
 3 files changed, 201 insertions(+)
 create mode 100644 src/pages/searchCenter/pages/components/standSystemModel.vue
 create mode 100644 src/pages/searchCenter/pages/components/standSystemTree.vue

diff --git a/src/pages/searchCenter/pages/components/standSystemModel.vue b/src/pages/searchCenter/pages/components/standSystemModel.vue
new file mode 100644
index 000000000..bca169dad
--- /dev/null
+++ b/src/pages/searchCenter/pages/components/standSystemModel.vue
@@ -0,0 +1,104 @@
+<template>
+  <el-drawer
+      title="标准体系"
+      :visible.sync="isShow"
+      direction="rtl"
+      :size="600"
+      :before-close="handleCancel">
+      <div class="popup-main">
+        <standSystemTree ref="standardSystemTreeRef" @checkedKey="getCheckedKey"></standSystemTree>
+      </div>
+      <div class="popup-footer">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="handleOk">确定</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleCancel">取消</el-button>
+      </div>
+  </el-drawer>
+  <!--<van-popup v-model="isShow"-->
+  <!--           position="right"-->
+  <!--           :style="{ height: '100%', width: '600px' }"-->
+  <!--           :close-on-click-overlay="false"-->
+  <!--           @click-overlay="handleCancel">-->
+  <!--  <h3 class="popup-title">-->
+  <!--    <span>标准体系</span>-->
+  <!--    <van-icon name="cross" size="22px" @click="handleCancel" />-->
+  <!--  </h3>-->
+  <!--  <div class="popup-main">-->
+  <!--    <standSystemTree ref="standardSystemTreeRef" @checkedKey="getCheckedKey"></standSystemTree>-->
+  <!--  </div>-->
+  <!--  <div class="popup-footer">-->
+  <!--    <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="handleOk">确定</el-button>-->
+  <!--    <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleCancel">取消</el-button>-->
+  <!--  </div>-->
+  <!--</van-popup>-->
+</template>
+
+<script>
+import standSystemTree from "./standSystemTree";
+export default {
+  name: "standSystemModel",
+  components: {
+    standSystemTree,
+  },
+  data () {
+    return {
+      isShow: false,
+      checkedKeys: [], // 选择的标准体系
+    }
+  },
+  props: {
+    // 以前的选中项
+    initKeys: {
+      type: Array,
+      required: true
+    }
+  },
+  methods: {
+    open () {
+      this.isShow = true
+      this.$nextTick(() => {
+        this.$refs.standardSystemTreeRef.setCheckedKeys(this.initKeys)
+      })
+    },
+    hide () {
+      this.isShow = false
+    },
+    getCheckedKey (val) {
+      this.checkedKeys = val
+    },
+    handleOk () {
+      this.hide()
+      this.$emit('standSystemKeys', this.checkedKeys)
+    },
+    handleCancel () {
+      this.hide()
+    },
+  }
+}
+</script>
+
+<style scoped>
+/*.popup-title{*/
+/*  line-height: 1rem;*/
+/*  border-bottom: 1px solid #e5e5e5;*/
+/*  padding: 0 0.3rem;*/
+/*  display: flex;*/
+/*  justify-content: space-between;*/
+/*  align-items: center;*/
+/*}*/
+.popup-main{
+  height: calc(100vh - 1rem - 50px);
+  overflow: hidden;
+  overflow-y: auto;
+  overflow-x: auto;
+}
+.popup-footer{
+  border-top: 1px solid #e8e8e8;
+  text-align: right;
+  padding-right: 0.2rem;
+  height: 50px;
+  line-height: 50px;
+  /*position: fixed;*/
+  /*bottom: 1px;*/
+  width: 100%;
+}
+</style>
diff --git a/src/pages/searchCenter/pages/components/standSystemTree.vue b/src/pages/searchCenter/pages/components/standSystemTree.vue
new file mode 100644
index 000000000..90ee9a199
--- /dev/null
+++ b/src/pages/searchCenter/pages/components/standSystemTree.vue
@@ -0,0 +1,73 @@
+<template>
+  <el-tree class="popup-tree"  ref="tree" :data="data" :props="defaultProps"
+           :lazy="false"
+           :show-checkbox="true"
+           node-key="id"
+           :check-strictly="true"
+           :expand-on-click-node="false"
+           :check-on-click-node="true"
+           :default-checked-keys="defaultCheckedKeys"
+           :highlight-current="true"
+           @node-click="handleNodeClick"
+           @check-change="handleCheckChange">
+  </el-tree>
+</template>
+
+<script>
+export default {
+  name: "standSystemTree",
+  data () {
+    return {
+      data: [],
+      defaultProps: {
+        children: 'children',
+        label: 'menuName'
+      },
+      defaultCheckedKeys: [],
+      checkedKeys: []
+    }
+  },
+  created () {
+    this.getStandardSystem()
+  },
+  methods: {
+    getStandardSystem () {
+      this.$http._getData('sys/dictype/getDicTypeListCode').then(res => {
+        if (res.ok && res.data) {
+          this.data = res.data.TXLBBUSS // 标准体系
+        }
+      })
+    },
+    handleNodeClick (data, node, element) {
+      // console.log(data, node, element)
+    },
+    handleCheckChange (data, isChecked, childIsChecked) {
+      const id = data.id
+      if (isChecked) {
+        if (!this.checkedKeys.some(key => key === id)) {
+          this.checkedKeys = [...this.checkedKeys, id]
+        }
+      } else {
+        if (this.checkedKeys.some(key => key === id)) {
+          this.checkedKeys = this.checkedKeys.filter(key => key !== id)
+        }
+      }
+      this.$emit('checkedKey', this.checkedKeys)
+    },
+    setCheckedKeys (keys) {
+      this.$refs.tree.setCheckedKeys(keys)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.popup-tree{
+  /deep/ .el-tree-node__expand-icon{
+    font-size: 20px;
+  }
+  /deep/ .el-tree-node__label{
+    font-size: 18px;
+  }
+}
+</style>
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index f093e2848..94d218194 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -89,6 +89,13 @@
                                         <!--                  <el-button type="primary" size="small" @click="exportSearchResult" class="common-button-default export-button"-->
                                         <!--                             round><i class="iconfont">&#xe6e9;</i>导出</el-button>-->
                                     </div>
+                                  <div class="operate-area" style="padding: 0 10px 10px 10px">
+                                    <el-button
+                                        size="mini"
+                                        type="primary"
+                                        @click="openStandSystemModel">选择标准体系
+                                    </el-button>
+                                  </div>
                                     <el-table
                                             ref="selection"
                                             :data="resultData"
@@ -338,6 +345,7 @@
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
         </el-dialog>
+        <standSystemModel ref="standSystemModelRef" :init-keys="standSystemKeys"  @standSystemKeys="setStandSystemKeys" />
     </div>
 </template>
 
@@ -349,6 +357,7 @@
     import '../../../assets/zTree/js/jquery.ztree.exedit.js'
     // import deptTree from '../../processCenter/pages/components/deptTree'
     import {dateFormat} from '@/common/date'
+    import standSystemModel from "./components/standSystemModel";
     export default {
         name: 'StandardSearch',
         filters: {
@@ -362,6 +371,7 @@
         },
         data () {
             return {
+                standSystemKeys: [],
                 selectType: '',
                 externalStatus:'',
                 itermsConditionsTitle1: '',
@@ -502,7 +512,18 @@
             }
         },
         methods: {
+            openStandSystemModel () {
+              this.$refs.standSystemModelRef.open()
+            },
+            setStandSystemKeys(standSystemKeys){
+              this.standSystemKeys = standSystemKeys
+              this.searchSarBykey()
+            },
+            resetStandSystemKeys () {
+              this.standSystemKeys = []
+            },
             searchClick(type) {
+                this.resetStandSystemKeys()
                 this.selectType = type
                 this.searchSarByInputKey()
             },
@@ -809,6 +830,7 @@
              * @date: 2018/12/19 11:38:21
              */
             optChecked (key, value) {
+                this.resetStandSystemKeys()
                 console.log(value)
                 console.log(this.selectIndex)
                 if (value === 'All') {
@@ -1508,6 +1530,7 @@
                     condition.selectValue = ''
                 }
                 condition.selectType = this.selectType
+                condition.standSystem = this.standSystemKeys // 标准体系id
                 this.$http.post('search/searchCenter/searchSarBykey', condition, {
                     _this: this,
                     loading: 'resultLoading'
@@ -2661,6 +2684,7 @@
             }
         },
         components: {
+            standSystemModel,
             // deptTree,
             PersonalCenter
         },