From eefac010ff62f0bdd6c92686d09050dd15b601f3 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Fri, 24 Nov 2023 17:38:37 +0800
Subject: [PATCH 1/5] =?UTF-8?q?bug:=20=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=84=8F=E8=A7=81=EF=BC=8C=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue
index cf88d25e8..11603e062 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue
@@ -26,7 +26,7 @@
                         <el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input>
                     </el-form-item>
                     <el-form-item label="修改前" label-width="" class="add-form-item">
-                        <div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div>
+                        <div v-html="opinionContent.oldText" class="itemsTextBox" style="margin: 56px 0 0 10px;"></div>
                     </el-form-item>
                     <el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
                         <el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>

From cf7af05cd6cde2715e28191ccd3866d0f160293e Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Mon, 27 Nov 2023 09:23:05 +0800
Subject: [PATCH 2/5] =?UTF-8?q?Revert=20"=E5=88=A0=E9=99=A4=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E5=B2=97=E4=BD=8D=20=E6=96=B0=E5=A2=9E=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=88=97"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 92f5515620f2a4a4c03f067991870f8ee7f97f65.
---
 .../pages/mechanismManage/pages/mechanism.vue | 38 ++++++-------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/pages/mechanism.vue b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
index c93a51236..ec54c73ab 100644
--- a/src/pages/config/pages/mechanismManage/pages/mechanism.vue
+++ b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
@@ -148,28 +148,20 @@
             </template>
           </el-table-column>
           <el-table-column
-              prop="roles"
-              label="角色"
-              >
-            <template  slot-scope="scope">
-              {{getRoleName(scope.row.roles)}}
+            prop="NameList"
+            label="所属岗位">
+            <template slot-scope="scope">
+              <el-popover trigger="hover" placement="top">
+                {{ scope.row.NameList }}
+                <div slot="reference" class="name-wrapper">
+                  <p v-if="!scope.row.institutionName ||scope.row.NameList.length<15">
+                    {{ scope.row.NameList }}
+                  </p>
+                  <p v-else> {{ scope.row.NameList.substring(0, 15) }}...</p>
+                </div>
+              </el-popover>
             </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="NameList"-->
-<!--            label="所属岗位">-->
-<!--            <template slot-scope="scope">-->
-<!--              <el-popover trigger="hover" placement="top">-->
-<!--                {{ scope.row.NameList }}-->
-<!--                <div slot="reference" class="name-wrapper">-->
-<!--                  <p v-if="!scope.row.institutionName ||scope.row.NameList.length<15">-->
-<!--                    {{ scope.row.NameList }}-->
-<!--                  </p>-->
-<!--                  <p v-else> {{ scope.row.NameList.substring(0, 15) }}...</p>-->
-<!--                </div>-->
-<!--              </el-popover>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
           <el-table-column
             label="状态"
             width="100px">
@@ -314,12 +306,6 @@ export default {
     }
   },
   methods: {
-    getRoleName(roles){
-        let names=roles.map(item=>{
-          return item.name
-        })
-      return names.join(',')
-    },
     clearAllSearch() {
       this.searchForm = {
         uname: "",

From 88706b61278d7e900b9a4cce23144d2547ecb6c1 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Mon, 27 Nov 2023 11:26:20 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E6=89=8B=E6=9C=BA=E7=AB=AF-?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=8A=A0=E8=BD=BD=E5=85=AC=E5=85=B1=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  11 +-
 .../hzwlComponents/phone/PhoneScroll.vue      | 103 ++++++++++++++++++
 2 files changed, 111 insertions(+), 3 deletions(-)
 create mode 100644 src/components/hzwlComponents/phone/PhoneScroll.vue

diff --git a/package.json b/package.json
index 49df7c2c9..529594fbe 100644
--- a/package.json
+++ b/package.json
@@ -5,18 +5,25 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
+    "inspect": "vue-cli-service inspect > outputDev.js",
+    "inspectProd": "vue-cli-service inspect --mode=production > outputProd.js",
     "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
   },
   "dependencies": {
     "@antv/g6": "^4.3.6",
     "@babel/polyfill": "^7.12.1",
+    "@better-scroll/core": "^2.5.1",
+    "@better-scroll/pull-up": "^2.5.1",
+    "@better-scroll/scroll-bar": "^2.5.1",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "babel-polyfill": "^6.26.0",
     "core-js": "^3.6.5",
+    "cross-env": "^5.0.5",
     "echarts": "^5.0.1",
     "element-ui": "^2.13.2",
     "es6-promise": "^4.2.8",
+    "increase-memory-limit": "^1.0.3",
     "jquery": "^3.5.1",
     "js-base64": "^2.6.2",
     "moment": "^2.29.1",
@@ -31,9 +38,7 @@
     "vue-custom-scrollbar": "^1.4.4",
     "vue-i18n": "^8.22.4",
     "vue-router": "^3.2.0",
-    "vuex": "^3.4.0",
-    "increase-memory-limit": "^1.0.3",
-    "cross-env": "^5.0.5"
+    "vuex": "^3.4.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",
diff --git a/src/components/hzwlComponents/phone/PhoneScroll.vue b/src/components/hzwlComponents/phone/PhoneScroll.vue
new file mode 100644
index 000000000..380484cc2
--- /dev/null
+++ b/src/components/hzwlComponents/phone/PhoneScroll.vue
@@ -0,0 +1,103 @@
+<template>
+  <div class="scroll-wrapper" ref="scroll" :style="{height: height}">
+    <div class="scroll-content" ref="content">
+      <slot></slot>
+      <van-loading
+          v-if="loading"
+          type="spinner"
+          size="16px"
+          text-size="12px"
+          color="#3170A8"
+          style="text-align: center"
+      >加载中...</van-loading>
+      <div v-if="data.length > 0 && data.length >= total" style="font-size: 12px;text-align: center;color: #999">已加载全部数据</div>
+      <van-empty v-if="!loading && data.length === 0" description="暂无数据" />
+    </div>
+  </div>
+</template>
+
+<script>
+import BScroll from '@better-scroll/core'
+import ScrollBar from '@better-scroll/scroll-bar'
+import Pullup from '@better-scroll/pull-up'
+
+BScroll.use(ScrollBar)
+BScroll.use(Pullup)
+
+export default {
+  name: "PhoneScroll",
+  props: {
+    // 容器wrapper高度
+    height: {
+      type: String,
+      default: '100%'
+    },
+    data: {
+      type: Array,
+      default: () => [],
+      required: true
+    },
+    // 是否加载中
+    loading: {
+      type: Boolean,
+      default: false,
+      required: true
+    },
+    // 总数
+    total: {
+      type: Number,
+      required: true
+    },
+    // 上拉加载回调
+    pullingUpHandler: {
+      type: Function,
+      default: () => {
+        console.log('请传入上拉加载回调函数参数pullingUpHandler')
+      }
+    },
+  },
+  data () {
+    return {
+      bs: null,
+      toEnd: false
+    }
+  },
+  watch: {
+    data() {
+      this.refreshScroll()
+    }
+  },
+  methods: {
+    refreshScroll () {
+      this.$nextTick(() => {
+        if (!this.bs) {
+          this.bs = new BScroll(this.$refs.scroll, {
+            probeType: 3,
+            scrollbar: true,
+            pullUpLoad: {
+              threshold: 50
+            },
+            click: true
+          })
+          this.bs && this.bs.on('pullingUp', () => {
+            this.pullingUpHandler()
+            // 结束上拉加载
+            this.bs.finishPullUp()
+          })
+
+        } else {
+          this.bs.refresh()
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style scoped>
+.scroll-wrapper {
+  height: calc(100vh - 131px);
+  overflow: hidden;
+  position: relative;
+}
+</style>

From 4341b0603a741e701c93b38bd93e1a43af402698 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Mon, 27 Nov 2023 11:26:53 +0800
Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=E6=89=8B=E6=9C=BA=E7=AB=AF-?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E5=8A=A8=E6=80=81=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?-=E5=A2=9E=E5=8A=A0=E4=B8=8B=E6=8B=89=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standDynamics/components/DataCenter.vue   | 156 +++++++++++++++
 .../standDynamics/components/DataCenter2.vue  | 187 ++++++++++++++++++
 .../components/StandardRegulations.vue        | 145 ++++++++++++++
 .../components/UnderResearchStandards.vue     | 145 ++++++++++++++
 .../components/folderPopup.vue                |   0
 .../components/folderTree.vue                 |   0
 src/pages/phone/standDynamics/index.vue       | 108 ++++++++++
 src/router/index.js                           |   3 +
 8 files changed, 744 insertions(+)
 create mode 100644 src/pages/phone/standDynamics/components/DataCenter.vue
 create mode 100644 src/pages/phone/standDynamics/components/DataCenter2.vue
 create mode 100644 src/pages/phone/standDynamics/components/StandardRegulations.vue
 create mode 100644 src/pages/phone/standDynamics/components/UnderResearchStandards.vue
 rename src/pages/phone/{ => standDynamics}/components/folderPopup.vue (100%)
 rename src/pages/phone/{ => standDynamics}/components/folderTree.vue (100%)
 create mode 100644 src/pages/phone/standDynamics/index.vue

diff --git a/src/pages/phone/standDynamics/components/DataCenter.vue b/src/pages/phone/standDynamics/components/DataCenter.vue
new file mode 100644
index 000000000..99b959e25
--- /dev/null
+++ b/src/pages/phone/standDynamics/components/DataCenter.vue
@@ -0,0 +1,156 @@
+<template>
+  <div class="root">
+    <div  style="padding: 10px 12px 0;text-align: right">
+      <van-icon name="filter-o" color="#000" size="20px" style="margin-right: 20px" @click="onOpen" />
+    </div>
+    <PhoneScroll
+        height="calc(100vh - 131px)"
+        :data="list"
+        :total="total"
+        :loading="loading"
+        :pullingUpHandler="pullingUpHandler">
+      <div class="card-content" v-for="item in list" :key="item.id" @click="jumpDetails(item)">
+        <div class="standTitle">
+          <div class="title">
+            {{ item.dataTitle && item.dataTitle.length > 40 ? item.dataTitle.slice(0, 39) + "..." : item.dataTitle }}
+          </div>
+        </div>
+        <div class="standContent">
+          <div class="standState">类型:
+            <span style="color: #35720B; padding-left: 5px;">
+                {{ item.dataType && item.dataType.length > 30 ? item.dataType.slice(0, 29) + "..." : item.dataType }}
+              </span>
+          </div>
+          <div class="standSubTime">上传时间:
+            <span style="padding-left: 5px;">
+               {{ $moment(item.dataUploadTime).format("YYYY-MM-DD HH:mm:ss") }}
+              </span>
+          </div>
+        </div>
+      </div>
+    </PhoneScroll>
+    <folderPopup ref="folderPopupRef"  @checked="setChecked" />
+  </div>
+</template>
+
+<script>
+import folderPopup from "./folderPopup";
+import PhoneScroll from "@/components/hzwlComponents/phone/PhoneScroll";
+
+export default {
+  name: "DataCenter",
+  components: {
+    folderPopup,
+    PhoneScroll
+  },
+  data () {
+    return {
+      searchQuery: {
+        page: 1,
+        pageSize: 10,
+        treeId: ''
+      },
+      total: 0,
+      list: [],
+      loading: false,
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    pullingUpHandler () {
+      if (this.searchQuery.page * this.searchQuery.pageSize <= this.total) {
+        this.searchQuery.page = this.searchQuery.page + 1
+        this.getData()
+      }
+    },
+    onOpen () {
+      this.$refs.folderPopupRef.open(this.searchQuery.treeId || null)
+    },
+    setChecked (currentData) {
+      this.currentSearch = currentData
+      this.searchQuery.treeId = currentData.id || ''
+      this.searchQuery.page = 1
+      this.getData()
+    },
+    getData () {
+      const config = {
+        _this: this,
+        loading: 'loading'
+      }
+      this.$http._getData('fileMaterialCenter/file-material', this.searchQuery, config).then(res => {
+        if (res.ok) {
+          this.total = res.data.total
+          if (this.searchQuery.page === 1) {
+            this.list = res.data.records
+          } else {
+            this.list = [...this.list, ...res.data.records]
+          }
+        }
+      })
+    },
+    jumpDetails(item) {
+      this.$router.push({
+        name: "zlzxDetails",
+        query: {
+          id: item.id
+        }
+      });
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+.root {
+  height: 100%;
+}
+.scroll-wrapper {
+  height: calc(100vh - 131px);
+  overflow: hidden;
+  position: relative;
+}
+
+.card-content {
+  width: 95%;
+  height: auto;
+  margin: 10px;
+  background-color: #FFFFFF;
+  border-radius: 5px;
+  box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.1);
+
+  .standTitle {
+    .title {
+      font-size: 3.4vw;
+      color: #333333;
+      font-weight: 600;
+      height: auto;
+      line-height: 20px;
+      padding: 5px 10px;
+      text-align: left;
+      border-bottom: 1px solid #cccccc;
+    }
+  }
+
+  .standContent {
+    font-size: 3.4vw;
+    color: #555555;
+    font-weight: 450;
+    margin-top: 5px;
+
+    .standState {
+      padding-left: 10px;
+      height: 35px;
+      line-height: 35px;
+    }
+
+    .standSubTime {
+      font-size: 3.4vw;
+      padding-left: 10px;
+      height: 35px;
+      line-height: 35px;
+    }
+  }
+}
+</style>
diff --git a/src/pages/phone/standDynamics/components/DataCenter2.vue b/src/pages/phone/standDynamics/components/DataCenter2.vue
new file mode 100644
index 000000000..306daedbe
--- /dev/null
+++ b/src/pages/phone/standDynamics/components/DataCenter2.vue
@@ -0,0 +1,187 @@
+<template>
+  <div class="root">
+    <div  style="padding: 10px 12px 0;text-align: right">
+      <van-icon name="filter-o" color="#000" size="20px" style="margin-right: 20px" @click="onOpen" />
+    </div>
+    <div class="scroll-wrapper" ref="scroll">
+      <div class="scroll-content" ref="content">
+        <div class="card-content" v-for="item in standardReleaseList" :key="item.id">
+          <div class="standTitle">
+            <div class="title">
+              {{ item.dataTitle && item.dataTitle.length > 40 ? item.dataTitle.slice(0, 39) + "..." : item.dataTitle }}
+            </div>
+          </div>
+          <div class="standContent">
+            <div class="standState">类型:
+              <span style="color: #35720B; padding-left: 5px;">
+                {{ item.dataType && item.dataType.length > 30 ? item.dataType.slice(0, 29) + "..." : item.dataType }}
+              </span>
+            </div>
+            <div class="standSubTime">上传时间:
+              <span style="padding-left: 5px;">
+               {{ $moment(item.dataUploadTime).format("YYYY-MM-DD HH:mm:ss") }}
+              </span>
+            </div>
+          </div>
+        </div>
+        <van-loading
+            v-if="loading"
+            type="spinner"
+            size="16px"
+            text-size="12px"
+            color="#3170A8"
+            style="text-align: center"
+        >加载中...</van-loading>
+        <div v-if="toEnd && total > 0" style="font-size: 12px;text-align: center;color: #999">暂无更多数据</div>
+        <van-empty v-if="total === 0" description="暂无数据" />
+      </div>
+    </div>
+    <folderPopup ref="folderPopupRef"  @checked="setChecked" />
+  </div>
+</template>
+
+<script>
+import BScroll from '@better-scroll/core'
+import ScrollBar from '@better-scroll/scroll-bar'
+import Pullup from '@better-scroll/pull-up'
+import folderPopup from "./folderPopup";
+
+BScroll.use(ScrollBar)
+BScroll.use(Pullup)
+
+export default {
+  name: "DataCenter",
+  components: {
+    folderPopup
+  },
+  data () {
+    return {
+      searchQuery: {
+        page: 1,
+        pageSize: 10,
+        treeId: ''
+      },
+      total: 0,
+      standardReleaseList: [],
+      loading: false,
+      toEnd: false,
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    refreshScroll () {
+      this.$nextTick(() => {
+        if (!this.bs) {
+          this.bs = new BScroll(this.$refs.scroll, {
+            probeType: 3,
+            scrollbar: true,
+            pullUpLoad: {
+              threshold: 50
+            },
+            click: true
+          })
+          this.bs.on('pullingUp', () => {
+            this.pullingUpHandler()
+
+            // 结束上拉加载
+            this.bs.finishPullUp()
+          })
+
+        } else {
+          this.bs.refresh()
+        }
+      })
+    },
+    pullingUpHandler () {
+      if (this.searchQuery.page * this.searchQuery.pageSize >= this.total) {
+        // 没有更多数据
+        this.toEnd = true
+      } else {
+        this.searchQuery.page = this.searchQuery.page + 1
+        this.getData()
+      }
+    },
+    onOpen () {
+      this.$refs.folderPopupRef.open(this.searchQuery.treeId || null)
+    },
+    setChecked (currentData) {
+      this.currentSearch = currentData
+      this.searchQuery.treeId = currentData.id || ''
+      this.searchQuery.page = 1
+      this.getData()
+    },
+    getData () {
+      const config = {
+        _this: this,
+        loading: 'loading'
+      }
+      this.$http._getData('fileMaterialCenter/file-material', this.searchQuery, config).then(res => {
+        if (res.ok) {
+          this.total = res.data.total
+          if (this.searchQuery.page === 1) {
+            this.standardReleaseList = res.data.records
+          } else {
+            this.standardReleaseList = [...this.standardReleaseList, ...res.data.records]
+          }
+          this.refreshScroll()
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.root {
+  height: 100%;
+}
+.scroll-wrapper {
+  height: calc(100vh - 131px);
+  overflow: hidden;
+  position: relative;
+}
+
+.card-content {
+  width: 95%;
+  height: auto;
+  margin: 10px;
+  background-color: #FFFFFF;
+  border-radius: 5px;
+  box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.1);
+
+  .standTitle {
+    .title {
+      font-size: 3.4vw;
+      color: #333333;
+      font-weight: 600;
+      height: auto;
+      line-height: 20px;
+      padding: 5px 10px;
+      text-align: left;
+      border-bottom: 1px solid #cccccc;
+    }
+  }
+
+  .standContent {
+    font-size: 3.4vw;
+    color: #555555;
+    font-weight: 450;
+    margin-top: 5px;
+
+    .standState {
+      padding-left: 10px;
+      height: 35px;
+      line-height: 35px;
+    }
+
+    .standSubTime {
+      font-size: 3.4vw;
+      padding-left: 10px;
+      height: 35px;
+      line-height: 35px;
+    }
+  }
+}
+</style>
diff --git a/src/pages/phone/standDynamics/components/StandardRegulations.vue b/src/pages/phone/standDynamics/components/StandardRegulations.vue
new file mode 100644
index 000000000..8c6772458
--- /dev/null
+++ b/src/pages/phone/standDynamics/components/StandardRegulations.vue
@@ -0,0 +1,145 @@
+<template>
+  <PhoneScroll
+      height="calc(100vh - 131px)"
+      :data="list"
+      :total="total"
+      :loading="loading"
+      :pullingUpHandler="pullingUpHandler">
+    <div class="card-content" v-for="item in list" :key="item.id" @click="jumpDetails(item)">
+      <div class="standTitle">
+        <div class="title">{{ item.standardName }}</div>
+      </div>
+      <div class="standContent">
+        <div class="standState">标准状态:
+          <span style="color: #35720B; padding-left: 5px;">
+            {{ dict.WBZTCLASS && dict.WBZTCLASS.find(i => i.value === item.textState).label || '-' }}
+          </span>
+        </div>
+        <div class="standSubTime">发布日期:
+          <span style="padding-left: 5px;">{{ item.releaseDate }}</span>
+        </div>
+      </div>
+    </div>
+  </PhoneScroll>
+</template>
+
+<script>
+import PhoneScroll from "@/components/hzwlComponents/phone/PhoneScroll";
+
+export default {
+  name: "StandardRegulations",
+  components: {
+    PhoneScroll
+  },
+  data() {
+    return {
+      searchQuery: {
+        page: 1,
+        pageSize: 10,
+        messageType: 'GNWBZFG'
+      },
+      total: 0,
+      list: [],
+      loading: false,
+      dict: {}
+    }
+  },
+  created() {
+    this.getDicTypeListCode()
+    this.getData()
+  },
+  methods: {
+    pullingUpHandler () {
+      if (this.searchQuery.page * this.searchQuery.pageSize <= this.total) {
+        this.searchQuery.page = this.searchQuery.page + 1
+        this.getData()
+      }
+    },
+    getData () {
+      const config = {
+        _this: this,
+        loading: 'loading'
+      }
+      this.$http._getData("lawss/NewsFeed/getNewsFeed", this.searchQuery, config).then(res => {
+        if (res.ok) {
+          this.total = res.data.total
+
+          if (this.searchQuery.page === 1) {
+            this.list = res.data.records
+          } else {
+            this.list = [...this.list, ...res.data.records]
+          }
+        }
+      })
+    },
+    getDicTypeListCode () {
+      this.$http._getData('sys/dictype/getDicTypeListCode').then(res => {
+        this.dict = {...res.data}
+      })
+    },
+    jumpDetails(item) {
+      this.$router.push({
+        name: "domesticDetails",
+        query: {
+          id: item.standardId,
+          pageType: "INLAND_STAND"
+        }
+      });
+    }
+  }
+}
+</script>
+
+
+<style scoped lang="less">
+.root {
+  height: 100%;
+}
+.scroll-wrapper {
+  height: calc(100vh - 131px);
+  overflow: hidden;
+  position: relative;
+}
+
+.card-content {
+  width: 95%;
+  height: auto;
+  margin: 10px;
+  background-color: #FFFFFF;
+  border-radius: 5px;
+  box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.1);
+
+  .standTitle {
+    .title {
+      font-size: 3.4vw;
+      color: #333333;
+      font-weight: 600;
+      height: auto;
+      line-height: 20px;
+      padding: 5px 10px;
+      text-align: left;
+      border-bottom: 1px solid #cccccc;
+    }
+  }
+
+  .standContent {
+    font-size: 3.4vw;
+    color: #555555;
+    font-weight: 450;
+    margin-top: 5px;
+
+    .standState {
+      padding-left: 10px;
+      height: 35px;
+      line-height: 35px;
+    }
+
+    .standSubTime {
+      font-size: 3.4vw;
+      padding-left: 10px;
+      height: 35px;
+      line-height: 35px;
+    }
+  }
+}
+</style>
diff --git a/src/pages/phone/standDynamics/components/UnderResearchStandards.vue b/src/pages/phone/standDynamics/components/UnderResearchStandards.vue
new file mode 100644
index 000000000..0da19b0f6
--- /dev/null
+++ b/src/pages/phone/standDynamics/components/UnderResearchStandards.vue
@@ -0,0 +1,145 @@
+<template>
+  <PhoneScroll
+      height="calc(100vh - 131px)"
+      :data="list"
+      :total="total"
+      :loading="loading"
+      :pullingUpHandler="pullingUpHandler">
+    <div class="card-content" v-for="item in list" :key="item.id" @click="jumpDetails(item)">
+      <div class="standTitle">
+        <div class="title">{{ item.standardName }}</div>
+      </div>
+      <div class="standContent">
+        <div class="standState">标准状态:
+          <span style="color: #35720B; padding-left: 5px;">
+            {{ dict.WBZTCLASS && dict.WBZTCLASS.find(i => i.value === item.textState).label || '-' }}
+          </span>
+        </div>
+        <div class="standSubTime">发布日期:
+          <span style="padding-left: 5px;">{{ item.releaseDate }}</span>
+        </div>
+      </div>
+    </div>
+  </PhoneScroll>
+</template>
+
+<script>
+import PhoneScroll from "@/components/hzwlComponents/phone/PhoneScroll";
+
+export default {
+  name: "UnderResearchStandards",
+  components: {
+    PhoneScroll
+  },
+  data() {
+    return {
+      searchQuery: {
+        page: 1,
+        pageSize: 10,
+        messageType: 'ZYBZFG'
+      },
+      total: 0,
+      list: [],
+      loading: false,
+      dict: {}
+    }
+  },
+  created() {
+    this.getDicTypeListCode()
+    this.getData()
+  },
+  methods: {
+    pullingUpHandler () {
+      if (this.searchQuery.page * this.searchQuery.pageSize <= this.total) {
+        this.searchQuery.page = this.searchQuery.page + 1
+        this.getData()
+      }
+    },
+    getData () {
+      const config = {
+        _this: this,
+        loading: 'loading'
+      }
+      this.$http._getData("lawss/NewsFeed/getNewsFeed", this.searchQuery, config).then(res => {
+        if (res.ok) {
+          this.total = res.data.total
+
+          if (this.searchQuery.page === 1) {
+            this.list = res.data.records
+          } else {
+            this.list = [...this.list, ...res.data.records]
+          }
+        }
+      })
+    },
+    getDicTypeListCode () {
+      this.$http._getData('sys/dictype/getDicTypeListCode').then(res => {
+        this.dict = {...res.data}
+      })
+    },
+    jumpDetails(item) {
+      this.$router.push({
+        name: "domesticDetails",
+        query: {
+          id: item.standardId,
+          pageType: "INLAND_STAND"
+        }
+      });
+    }
+  }
+}
+</script>
+
+
+<style scoped lang="less">
+.root {
+  height: 100%;
+}
+.scroll-wrapper {
+  height: calc(100vh - 131px);
+  overflow: hidden;
+  position: relative;
+}
+
+.card-content {
+  width: 95%;
+  height: auto;
+  margin: 10px;
+  background-color: #FFFFFF;
+  border-radius: 5px;
+  box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.1);
+
+  .standTitle {
+    .title {
+      font-size: 3.4vw;
+      color: #333333;
+      font-weight: 600;
+      height: auto;
+      line-height: 20px;
+      padding: 5px 10px;
+      text-align: left;
+      border-bottom: 1px solid #cccccc;
+    }
+  }
+
+  .standContent {
+    font-size: 3.4vw;
+    color: #555555;
+    font-weight: 450;
+    margin-top: 5px;
+
+    .standState {
+      padding-left: 10px;
+      height: 35px;
+      line-height: 35px;
+    }
+
+    .standSubTime {
+      font-size: 3.4vw;
+      padding-left: 10px;
+      height: 35px;
+      line-height: 35px;
+    }
+  }
+}
+</style>
diff --git a/src/pages/phone/components/folderPopup.vue b/src/pages/phone/standDynamics/components/folderPopup.vue
similarity index 100%
rename from src/pages/phone/components/folderPopup.vue
rename to src/pages/phone/standDynamics/components/folderPopup.vue
diff --git a/src/pages/phone/components/folderTree.vue b/src/pages/phone/standDynamics/components/folderTree.vue
similarity index 100%
rename from src/pages/phone/components/folderTree.vue
rename to src/pages/phone/standDynamics/components/folderTree.vue
diff --git a/src/pages/phone/standDynamics/index.vue b/src/pages/phone/standDynamics/index.vue
new file mode 100644
index 000000000..cfc768362
--- /dev/null
+++ b/src/pages/phone/standDynamics/index.vue
@@ -0,0 +1,108 @@
+<!--全库检索-->
+<template>
+  <div id="standDynamics">
+    <div class="search-head">
+      <div class="head-title">
+        <span class="left-title" @click="back"> < </span>
+        <span class="right-title">标准化动态</span>
+      </div>
+      <van-tabs v-model="active">
+        <van-tab name="ZYBZFG" title="在研标准入库">
+          <UnderResearchStandards v-if="active==='ZYBZFG'"></UnderResearchStandards>
+        </van-tab>
+        <van-tab name="GNWBZFG" title="标准法规入库">
+          <StandardRegulations v-if="active==='GNWBZFG'"></StandardRegulations>
+        </van-tab>
+        <van-tab name="ZLZX" title="资料中心">
+          <DataCenter v-if="active==='ZLZX'"></DataCenter>
+        </van-tab>
+      </van-tabs>
+    </div>
+  </div>
+</template>
+
+<script>
+import UnderResearchStandards from "./components/UnderResearchStandards";
+import StandardRegulations from "./components/StandardRegulations";
+import DataCenter from "./components/DataCenter";
+
+export default {
+  name: "standDynamics",
+  components: {
+    UnderResearchStandards,
+    StandardRegulations,
+    DataCenter
+  },
+  data() {
+    return {
+      active: "ZYBZFG",
+    };
+  },
+  methods: {
+    //返回上一个页面
+    back() {
+      this.$router.push("/phoneHome");
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+#standDynamics {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  background: #F6F6F6;
+
+  .search-head {
+    width: 100%;
+    height: 100px;
+    background: #3170A8;
+  }
+
+  .head-title {
+    color: #FFFFFF;
+    line-height: 40px;
+    font-size: 18px;
+
+    .left-title {
+      margin-left: 10px;
+    }
+
+    .right-title {
+      float: right;
+      margin-right: 40%;
+    }
+  }
+
+  .van-tabs {
+    margin-top: 17px;
+  }
+
+  /deep/ .van-tabs__content {
+    width: 100%;
+    height: 95%;
+  }
+
+  .van-tab {
+    color: #3170A8;
+  }
+
+  /deep/ .van-tab--active {
+    color: #3170A8;
+    font-weight: 600;
+  }
+
+  /deep/ .van-tabs__line {
+    width: 30%;
+    background-color: #3170A8;
+  }
+
+  /deep/ .van-tab__pane {
+    height: 95%;
+    position: fixed;
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 7299ca608..eebcda262 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -105,8 +105,11 @@ const routes = [
   {
     path: '/standDynamics',
     name: 'standDynamics',
+    component: () => import('@/pages/phone/standDynamics/index')
+    /*
     component: () =>
       import('@/pages/phone/standDynamics')
+     */
   },
   {
     path: '/domesticStand',

From dc5fb966be2e015d4e0db28bd8334a0cf7922218 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Mon, 27 Nov 2023 14:44:55 +0800
Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20=E6=89=8B=E6=9C=BA=E7=AB=AF-?=
 =?UTF-8?q?=E5=9B=BD=E5=86=85/=E6=B5=B7=E5=A4=96/=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84-=E5=A2=9E=E5=8A=A0=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzwlComponents/phone/PhoneScroll.vue      |  11 +-
 .../phone/components/standardSystemTree.vue   |   2 +-
 src/pages/phone/domesticStand/index.vue       | 341 ++++++++++++++++++
 src/router/index.js                           |   3 +
 4 files changed, 355 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/phone/domesticStand/index.vue

diff --git a/src/components/hzwlComponents/phone/PhoneScroll.vue b/src/components/hzwlComponents/phone/PhoneScroll.vue
index 380484cc2..0d83b6446 100644
--- a/src/components/hzwlComponents/phone/PhoneScroll.vue
+++ b/src/components/hzwlComponents/phone/PhoneScroll.vue
@@ -85,18 +85,27 @@ export default {
             this.bs.finishPullUp()
           })
 
+          this.bs.on('scroll', (x, y ,z) => {
+            console.log(x,y,z)
+          })
+
         } else {
           this.bs.refresh()
         }
       })
     },
+    scrollTo (x, y ,time, easing) {
+      if (this.bs) {
+        this.bs.scrollTo(x, y, time, easing)
+      }
+    }
   }
 }
 </script>
 
 <style scoped>
 .scroll-wrapper {
-  height: calc(100vh - 131px);
+  /*height: calc(100vh - 131px);*/
   overflow: hidden;
   position: relative;
 }
diff --git a/src/pages/phone/components/standardSystemTree.vue b/src/pages/phone/components/standardSystemTree.vue
index 3857acee2..c5c0970a1 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.length > 0 ? [data[0].id] : []"
        :check-strictly="true"
        :expand-on-click-node="false"
        :check-on-click-node="true"
diff --git a/src/pages/phone/domesticStand/index.vue b/src/pages/phone/domesticStand/index.vue
new file mode 100644
index 000000000..50e2138e5
--- /dev/null
+++ b/src/pages/phone/domesticStand/index.vue
@@ -0,0 +1,341 @@
+<template>
+  <div id="domestic-stand">
+    <div class="search-head">
+      <div class="head-title">
+        <span class="left-title" @click="back"> < </span>
+        <span class="right-title">{{titleName}}</span>
+      </div>
+      <div style="display: flex;align-items: center">
+        <van-search
+            style="flex: 1;padding-right: 0"
+            v-model="searchQuery.selectValue"
+            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">
+          <van-icon name="filter-o" color="#fff"  />
+        </div>
+      </div>
+    </div>
+
+    <PhoneScroll
+        ref="scroll"
+        height="calc(100vh - 100px)"
+        :data="list"
+        :total="total"
+        :loading="loading"
+        :pullingUpHandler="pullingUpHandler">
+      <div style="padding-top: 10px">
+        <div class="card-content"
+             v-for="item in list"
+             :key="item.id"
+             @click="jumpDetails(item)">
+          <div class="standTitle">
+            <div v-if="$route.query.standType === 'POLICY'"  class="title">{{item.lawsNumber}}</div>
+            <div v-else class="title">{{ item.stand_code || item.numbershow }}</div>
+          </div>
+
+          <div class="standContent">
+            <div class="standState">{{(item.nameshow && item.nameshow !== '') ? item.nameshow : (item.standName && item.standName !== '') ? item.standName : item.standEnName }}</div>
+            <div class="standSubTime" v-if="$route.query.standType === 'POLICY'">标准状态:
+              <span v-if="lawsMap[item.lawsTextState] === '作废'"
+                    style="color: #F56C6C; padding-left: 5px;">
+                            {{ lawsMap[item.lawsTextState] }}
+               </span>
+              <span v-else-if="lawsMap[item.lawsTextState] === '参考' || lawsMap[item.lawsTextState] === '被代替' || lawsMap[item.lawsTextState] === '现行有效'"
+                    style="color: #35720B; padding-left: 5px;">
+                            {{ lawsMap[item.lawsTextState] }}
+               </span>
+              <span v-else style=" padding-left: 5px;">
+                            {{ lawsMap[item.lawsTextState] }}
+               </span>
+            </div>
+            <div class="standSubTime" v-else-if="$route.query.standType === 'bussstand'" >标准状态:
+              <span v-if="item.textStatusBussName === '废止'" style="color: #F56C6C; padding-left: 5px;"> {{ item.textStatusBussName }} </span>
+              <span v-else-if="item.textStatusBussName === '参考' || item.textStatusBussName === '被代替'" style="color: #35720B; padding-left: 5px;">{{ item.textStatusBussName }}</span>
+              <span v-else style=" padding-left: 5px;">{{ item.textStatusBussName }}</span>
+            </div>
+            <div class="standSubTime" v-else >标准状态:
+              <span v-if="textStatusMap[item.textStatus] === '废止'"
+                    style="color: #F56C6C; padding-left: 5px;">
+                            {{ textStatusMap[item.textStatus] }}
+               </span>
+              <span v-else-if="textStatusMap[item.textStatus] === '参考' || textStatusMap[item.textStatus] === '被代替'"
+                    style="color: #35720B; padding-left: 5px;">
+                            {{ textStatusMap[item.textStatus] }}
+               </span>
+              <span v-else style=" padding-left: 5px;">
+                            {{ textStatusMap[item.textStatus] }}
+               </span>
+            </div>
+          </div>
+
+          <div class="content-time">
+            <div style="margin-top: 10px">
+                  <span style="padding-left: 10px;min-width: 200px;">
+                    发布日期： {{ item.issueTime ? (item.issueTime !== '' ? $moment(item.issueTime).format("YYYY-MM-DD") : "          ") : "          " }}
+                  </span>
+              <span style="padding-left: 15px;" v-if="$route.query.standType === 'POLICY'">实施日期： {{item.XCXSSRQLAWS}}</span>
+              <span style="padding-left: 15px;" v-else-if="$route.query.standType === 'bussstand'">实施日期： {{item.putTime}}</span>
+              <span style="padding-left: 15px;" v-else>实施日期： {{item.SSRQ}}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </PhoneScroll>
+
+    <standardSystemPopup :init-keys="searchQuery.standSystem" @searchQuery="setSearchQuery" ref="standardSystemPopupRef" />
+  </div>
+</template>
+
+<script>
+import PhoneScroll from "@/components/hzwlComponents/phone/PhoneScroll";
+import standardSystemPopup from "../components/standardSystemPopup";
+
+export default {
+  name: "domesticStand",
+  components: {
+    PhoneScroll,
+    standardSystemPopup,
+  },
+  data () {
+    return {
+      titleName: '',
+      searchQuery: {
+        selectIndex: 'stand',
+        selectValue: '',
+        standSystem: [],
+        textStatus: '现行有效',
+        selectType: 'titleSearch',
+        standType: 'INLAND',
+        page: 1,
+        pageSize: 20
+      },
+      total: 0,
+      loading: false,
+      list: [],
+      url: {
+        searchSarBykey: 'search/searchCenter/searchSarBykey'
+      },
+      textStatusMap: {},
+      natureMap:{},
+      lawsMap:{},
+    }
+  },
+  created() {
+    switch (this.$route.query.standType) {
+      case 'INLAND':
+        this.titleName = '国内标准法规库'
+        break
+      case 'FOREIGN':
+        this.titleName = '海外标准法规库'
+        break
+      case 'bussstand':
+        this.titleName = '企业标准'
+        break
+      case 'POLICY':
+        this.titleName = '国内外政策库'
+        break
+    }
+    this.getDicTypeListCode()
+    this.getData()
+  },
+  methods: {
+    pullingUpHandler () {
+      if (this.searchQuery.page * this.searchQuery.pageSize <= this.total) {
+        this.searchQuery.page = this.searchQuery.page + 1
+        this.getData()
+      }
+    },
+    onSearch () {
+      this.list = []
+      this.searchQuery.page = 1
+      // 返回顶部
+      this.$refs.scroll.scrollTo(0, 0)
+      this.getData()
+    },
+    getData () {
+      switch (this.$route.query.standType) {
+        case 'INLAND':
+          this.searchQuery.selectIndex = 'stand'
+          this.searchQuery.standType = 'INLAND'
+          break
+        case 'FOREIGN':
+          this.searchQuery.selectIndex = 'stand'
+          this.searchQuery.standType = 'FOREIGN'
+          break
+        case 'bussstand':
+          this.searchQuery.selectIndex = 'bussstand'
+          this.searchQuery.standType = 'bussstand'
+          break
+        case 'POLICY':
+          this.searchQuery.selectIndex = 'laws'
+          this.searchQuery.standType = 'laws'
+          break
+      }
+      const config = {
+        _this: this,
+        loading: 'loading'
+      }
+      this.$http._postData("search/searchCenter/searchSarBykey", this.searchQuery, config).then(res => {
+        if (res.ok) {
+          this.total = res.data.count
+
+          if (this.searchQuery.page === 1) {
+            this.list = res.data.list
+          } else {
+            this.list = [...this.list, ...res.data.list]
+          }
+        }
+      })
+    },
+    onChoose () {
+      this.$refs.standardSystemPopupRef.open()
+    },
+    setSearchQuery (searchQuery) {
+      this.searchQuery.standSystem = searchQuery.checkedKeys
+      this.searchQuery.textStatus = searchQuery.textStatusName
+      this.onSearch()
+    },
+    getDicTypeListCode () {
+      this.$http._getData('sys/dictype/getDicTypeListCode').then(res => {
+        this.dict = {...res.data}
+        this.setMap(this.dict.WBZTCLASS, 'textStatusMap')
+        this.setMap(this.dict.lawsTextState, 'lawsMap')
+        this.setMap(this.dict.SARPROPERTY, 'natureMap')
+      })
+    },
+    setMap(data, key) {
+      data.forEach(item => {
+        this.$set(this[key], item.value, item.label);
+      });
+    },
+    //返回上一个页面
+    back(){
+      this.$router.push('/phoneHome')
+    },
+    jumpDetails(item){
+      if (this.$route.query.standType === 'INLAND') {
+        this.$router.push({
+          name: 'domesticDetails',
+          query: {
+            id: item.id,
+            pageType: 'INLAND_STAND'
+          }
+        })
+      } else if (this.$route.query.standType === 'FOREIGN') {
+        this.$router.push({
+          name: 'domesticDetails',
+          query: {
+            id: item.id,
+            pageType: 'FOREIGN_STAND'
+          }
+        })
+      } else if (this.$route.query.standType === 'bussstand') {
+        this.$router.push({
+          name: 'domesticDetails',
+          query: {
+            id: item.id,
+            pageType: 'BUSS'
+          }
+        })
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+#domestic-stand {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  background: #F6F6F6;
+
+  .search-head {
+    width: 100%;
+    height: 100px;
+    background: #3170A8;
+  }
+
+  .head-title {
+    color: #FFFFFF;
+    line-height: 40px;
+    font-size: 18px;
+
+  .left-title {
+    margin-left: 10px;
+  }
+
+  .right-title {
+    float: right;
+    margin-right: 34%;
+  }
+
+  }
+  .van-search {
+    background: #3170A8;
+    padding: 10px 12px 0 12px;
+  }
+
+  .van-search__content {
+    background: #8DB2D0;
+  }
+
+  .van-search__action {
+    color: #FFFFFF;
+  }
+}
+.card-content{
+  width: 95%;
+  height: auto;
+  margin: 10px;
+  background-color: #FFFFFF;
+  border-radius: 5px;
+  box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.1);
+  .standTitle{
+    .title{
+      font-size: 3.4vw;
+      color: #333333;
+      font-weight: 600;
+      height: auto;
+      line-height: 20px;
+      padding: 5px 10px;
+      text-align: left;
+      border-bottom: 1px solid #cccccc;
+    }
+  }
+  .standContent{
+    font-size: 3.4vw;
+    color: #333333;
+    font-weight: 500;
+    margin-top: 5px;
+    .standState{
+      height: auto;
+      padding-left: 10px;
+      line-height: 25px;
+    }
+    .standSubTime{
+      padding-left: 10px;
+      height: auto;
+      line-height: 25px;
+    }
+  }
+  .content-time{
+    font-size: 3.4vw;
+    width: 100%;
+    height: 35px;
+    margin-top: 5px;
+    border-top: 1px solid #cccccc;
+  }
+}
+.card-content:first-child{
+  margin-top: 0;
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index eebcda262..c4165e399 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -114,8 +114,11 @@ const routes = [
   {
     path: '/domesticStand',
     name: 'domesticStand',
+    component: () => import('@/pages/phone/domesticStand/index')
+    /*
     component: () =>
       import('@/pages/phone/domesticStand')
+     */
   },
   {
     path: '/domesticDetails',