Merge branch 'develop' into FOTON

# Conflicts: # src/sysConfig/index.js
2022-11-15 21:42:23 +08:00
parent f5a9c9f19b baff61abed
commit e7c0a13eb9
11 changed files with 7116 additions and 77 deletions
@@ -253,6 +253,7 @@ export default {
        && this.$route.name !== 'phoneHome'&& this.$route.name !== 'databaseSearch'
        && this.$route.name !== 'standDynamics' && this.$route.name !== 'domesticStand'
        && this.$route.name !== 'domesticDetails' && this.$route.name !== 'LoginVerifyPhone'
+        && this.$route.name !== 'zlzxDetails' && this.$route.name !== 'LoginVerifyPhone'
        && this.$route.name !== 'OtherStandardExternalDetails' && this.$route.name !== 'OtherStandardExternalDetails') {
        this.isBoolean = true
      } else {
@@ -184,7 +184,7 @@ router.beforeEach(function (to, from, next) {
            localStorage.setItem("routerName","phoneHome")
            next('/loginVerifyPhone')
          }else if(toName === 'databaseSearch' || toName === 'standDynamics' ||
-              toName === 'domesticStand' || toName === 'domesticDetails'){
+              toName === 'domesticStand' || toName === 'domesticDetails' || toName === 'zlzxDetails'){
            localStorage.setItem("routerName",toName)
            next('/loginVerifyPhone')
          }else {
@@ -199,7 +199,7 @@ router.beforeEach(function (to, from, next) {
        }else {
          // 区分手机端首页 单独逻辑处理 token 为空 跳回验证页面重新验证
          if(fromName === 'databaseSearch' || fromName === 'standDynamics' ||
-             fromName === 'domesticStand' || fromName === 'domesticDetails'){
+             fromName === 'domesticStand' || fromName === 'domesticDetails' || toName === 'zlzxDetails'){
            localStorage.setItem("routerName",toName)
            next('/loginVerifyPhone')
          }else {
@@ -207,7 +207,7 @@ router.beforeEach(function (to, from, next) {
          }
        }
      } else {
-        if(toName === 'databaseSearch' || toName === 'standDynamics' ||
+        if(toName === 'databaseSearch' || toName === 'standDynamics' || toName === 'zlzxDetails' ||
            toName === 'domesticStand' || toName === 'domesticDetails'){
          next()
        }else if (toName.slice(0,5) !== 'phone') {
@@ -0,0 +1,179 @@
+<!-- 企标发布 -->
+<template>
+  <div class="release">
+<!--    <ul>-->
+<!--      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >-->
+<!--          <div style="height: 18px;">-->
+<!--            <a @click="handlePreview(item)" style="color: #333333" class="table-jump">{{ item.standName }}</a>-->
+<!--              <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>-->
+<!--          </div>-->
+<!--      </li>-->
+<!--    </ul>-->
+      <el-table
+              ref="selection"
+              :data="standardReleaseList"
+              tooltip-effect="dark"
+              border
+              style="cursor:pointer;"
+              :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+        <el-table-column
+          type="index"
+          width="55"
+          label="序号"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="dataType"
+          width="250"
+          label="类型"
+          :show-overflow-tooltip="true"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="dataTitle"
+          min-width="250"
+          label="资料标题"
+          :show-overflow-tooltip="true"
+          align="center">
+<!--          <template slot-scope="scope">-->
+<!--            <span @click.stop="toDetail(scope.row)" style="cursor:pointer;color: #409eff">{{ scope.row.dataTitle }}</span>-->
+<!--          </template>-->
+        </el-table-column>
+        <el-table-column
+          prop="dataUploadTime"
+          width="250"
+          label="上传时间"
+          align="center">
+        </el-table-column>
+      </el-table>
+      <div class="more" v-if="!pageVerify" @click="togo">更多 ⋙</div>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+              v-if="pageVerify"
+              style="position: static;"
+              :page="page"
+              :total="total"
+              @pageChange="pageChange"
+              @pageSizeChange="pageSizeChange"></pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReleaseQA',
+  components: {},
+  mixins: [],
+  data() {
+    return {
+      loading: false,
+      pageVerify: false,
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      putTime: '',
+      standardReleaseList: [],  //标准问答数据
+    }
+  },
+  computed: {},
+  watch: {},
+  mounted() {
+    this.getDate()
+    this.getAdvice()
+    // this.addDate()
+  },
+  methods: {
+      pageChange(page) {
+          this.page = page
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+      },
+      // 分页每页显示数改变后方法
+      pageSizeChange(pageSize) {
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+          // 此处需要调用接口，修改个人配置
+      },
+      togo () {
+          this.$router.push({path:'/dataCenter'})
+      },
+    // 点击查看
+    handlePreview (item) {
+        // let routeUrl = this.$router.resolve({
+        //     name: 'OtherBussStandardDetails',
+        //     params: {
+        //         id: item.standardId,
+        //         pageType: 'BUSINESS_STAND'
+        //     }
+        // })
+        // window.open(routeUrl.href, '_blank')
+    },
+    //截取时间
+    getDate (date) {
+      return date != null ? date.substring(0, date.indexOf(' ')) : ''
+    },
+    //获取数据
+    getAdvice() {
+        this.loading = true
+        // 模拟加载
+        const timer = setInterval(() => {
+            this.loading = false
+        }, 2000)
+        console.log(timer)
+      let userInfo = JSON.parse(localStorage.getItem('userInfo'));
+        this.$http.get("fileMaterialCenter/file-material/getFileMaterialIndex", {
+            userId: userInfo.userId,
+        }, {
+            _this: this,loading: 'loading'
+        }, res => {
+            this.standardReleaseList = res.data
+            this.total = res.data.total
+            this.loading = false
+        }, e => {
+            this.loading = false
+            this.standardReleaseList = []
+            this.total = 0
+        })
+    },
+  },
+
+}
+</script>
+
+<style lang="less" scoped>
+.release {
+  /deep/.el-table th > .cell {
+    font-size: 15px;
+  }
+  /deep/.el-table td > .cell{
+    font-size: 13px;
+  }
+    /deep/.more {
+        position: absolute;
+        right: 0;
+        bottom: 2px;
+        font-size: 15px;
+        float: right;
+        color: #4788c0;
+        &:hover {
+            color: #3a8ee6;
+            cursor: pointer;
+        }
+    }
+    width: 100%;
+  .time-title {
+    margin: 15px;
+    .time {
+      float: right;
+      color:#333333;
+    }
+    a {
+      color: #ffffff;
+      &:hover {
+        color: #e9c851;
+        cursor:pointer;
+        text-decoration: underline;
+      }
+    }
+  }
+}
+</style>
@@ -27,6 +27,10 @@
               <span slot="label"><i class="el-icon-s-promotion"></i> 企业标准发布</span>
               <releaseBuss></releaseBuss>
           </el-tab-pane>
+             <el-tab-pane name="releaseZL" style="overflow-y: auto;height: 100%">
+               <span slot="label"><i class="el-icon-chat-line-round"></i> 标准化动态</span>
+               <releaseZL></releaseZL>
+             </el-tab-pane>
           <el-tab-pane name="releaseQA" style="overflow-y: auto;height: 100%">
                   <span slot="label"><i class="el-icon-chat-line-round"></i> 标准问答</span>
                   <releaseQA></releaseQA>
@@ -52,6 +56,7 @@ import release from './components/release'
 import releaseUs from './components/releaseUs'
 import releaseBuss from './components/releaseBuss'
 import releaseQA from './components/releaseQA'
+import releaseZL from './components/releaseZL'
 import solicitOpinions from './components/solicitopinions'
 import navMenu from './components/navMenu'
 import todoList from './components/todoList'
@@ -65,6 +70,7 @@ export default {
    releaseUs,
    releaseBuss,
    releaseQA,
+    releaseZL,
    navMenu,
    todoList,
    Empennage,
@@ -109,13 +109,13 @@ export default {
      },{
        _this: this,
      }, res => {
+        this.loading = false
        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.listFlag = true
        }
@@ -139,8 +139,8 @@ export default {
      },{
        _this: this,
      }, res => {
-        this.standList = res.data.list
        this.loading = false
+        this.standList = res.data.list || []
      }, e => {
          console.log(e)
      })
@@ -6,13 +6,14 @@
        <span class="left-title" @click="back"> < </span>
        <span class="right-title">标准化动态</span>
      </div>
-      <van-tabs active="active"  @change="onChange" >
+      <van-tabs active="active" @change="onChange">
        <van-tab name="ZYBZFG" title="在研标准入库">
-          <div class="card-box" ref="cardBoxOne" @scroll="scroolOne" >
+          <div class="card-box" ref="cardBoxOne" @scroll="scroolOne">
            <div v-if="loading">
              <van-loading size="24px" color="#3170A8">加载中...</van-loading>
            </div>
-            <div v-else-if="!loading && standList.length" class="card-content" v-for="item in standList" :key="item.id" >
+            <div v-else-if="!loading && standList.length" class="card-content" @click="jumpDetails(item)"
+                 v-for="item in standList" :key="item.id">
              <div class="standTitle">
                <div class="title">{{ item.standardName }}</div>
              </div>
@@ -34,16 +35,17 @@
          </div>
          <div v-if="moreFlag" class="bottom-box">
            <div v-if="listFlag && !loading" class="list-box">没有更多数据了...</div>
-            <div v-else-if="!listFlag && moreFlag"  @click="moreList" >点击加载更多</div>
+            <div v-else-if="!listFlag && moreFlag" @click="moreList">点击加载更多</div>
            <van-loading v-else size="24px" color="#3170A8">加载中...</van-loading>
          </div>
        </van-tab>
        <van-tab name="GNWBZFG" title="标准法规入库">
-          <div class="card-box"  ref="cardBoxTwo" @scroll="scroolTwo" >
+          <div class="card-box" ref="cardBoxTwo" @scroll="scroolTwo">
            <div v-if="loading">
              <van-loading size="24px" color="#3170A8">加载中...</van-loading>
            </div>
-            <div v-else-if="!loading && standList.length" class="card-content" v-for="item in standList" :key="item.id">
+            <div v-else-if="!loading && standList.length" class="card-content" @click="jumpDetails(item)"
+                 v-for="item in standList" :key="item.id">
              <div class="standTitle">
                <div class="title">{{ item.standardName }}</div>
              </div>
@@ -65,7 +67,43 @@
          </div>
          <div v-if="moreFlag" class="bottom-box">
            <div v-if="listFlag && !loading" class="list-box">没有更多数据了...</div>
-            <div v-else-if="!listFlag && moreFlag"  @click="moreList" >点击加载更多</div>
+            <div v-else-if="!listFlag && moreFlag" @click="moreList">点击加载更多</div>
+            <van-loading v-else size="24px" color="#3170A8">加载中...</van-loading>
+          </div>
+        </van-tab>
+        <van-tab name="ZLZX" title="资料中心">
+          <div class="card-box" ref="cardBoxTwo" @scroll="scroolThree">
+            <div v-if="loading">
+              <van-loading size="24px" color="#3170A8">加载中...</van-loading>
+            </div>
+            <div v-else-if="!loading && standardReleaseList.length" class="card-content" @click="jumpDetails(item)"
+                 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>
+            <div v-else-if="!loading  && !standardReleaseList.length">
+              <van-empty description="暂无数据" />
+            </div>
+          </div>
+          <div v-if="moreFlag" class="bottom-box">
+            <div v-if="listFlag && !loading" class="list-box">没有更多数据了...</div>
+            <div v-else-if="!listFlag && moreFlag" @click="moreList">点击加载更多</div>
            <van-loading v-else size="24px" color="#3170A8">加载中...</van-loading>
          </div>
        </van-tab>
@@ -82,73 +120,145 @@ export default {
      active: "",
      messageType: "ZYBZFG",
      standList: [],
+      standardReleaseList: [],
      page: 1,
      standStateOptions: [], //存放文本状态
      textStatusMap: {},// 文本状态id与name对应
      loading: true,
-      scrolled: '',
+      scrolled: "",
      moreFlag: false,
      listFlag: false
    };
  },
  methods: {
-    jumpDetails(item){
-      this.$router.push({
-        name: 'domesticDetails',
-        query: {
-          id: item.id,
-          pageType: 'FOREIGN_STAND'
-        }
-      })
-    },
-    scroolOne(){
-      this.scrolled = this.$refs.cardBoxOne.scrollTop
-      console.log(this.$refs.cardBoxOne.scrollTop)
+    scroolOne() {
+      this.scrolled = this.$refs.cardBoxOne.scrollTop;
+      console.log(this.$refs.cardBoxOne.scrollTop);
      //获得可视区的高度
-      const windowHeight = this.$refs.cardBoxOne.clientHeight
+      const windowHeight = this.$refs.cardBoxOne.clientHeight;
      //获取滚动条的总高度
-      const scrollHeight = this.$refs.cardBoxOne.scrollHeight
-      let windowScrolled  = this.scrolled + windowHeight
-      if(scrollHeight - windowScrolled < 100 && this.scrolled !== 0){
+      const scrollHeight = this.$refs.cardBoxOne.scrollHeight;
+      let windowScrolled = this.scrolled + windowHeight;
+      if (scrollHeight - windowScrolled < 100 && this.scrolled !== 0) {
        //把距离顶部的距离加上可视区域的高度
-        this.moreFlag = true
-      }else{
-        this.moreFlag = false
+        this.moreFlag = true;
+      } else {
+        this.moreFlag = false;
      }
    },
-    scroolTwo(){
-      this.scrolled = this.$refs.cardBoxTwo.scrollTop
-      console.log(this.$refs.cardBoxTwo.scrollTop)
+    scroolTwo() {
+      this.scrolled = this.$refs.cardBoxTwo.scrollTop;
+      console.log(this.$refs.cardBoxTwo.scrollTop);
      //获得可视区的高度
-      const windowHeight = this.$refs.cardBoxTwo.clientHeight
+      const windowHeight = this.$refs.cardBoxTwo.clientHeight;
      //获取滚动条的总高度
-      const scrollHeight = this.$refs.cardBoxTwo.scrollHeight
-      let windowScrolled  = this.scrolled + windowHeight
-      if(scrollHeight - windowScrolled < 100 && this.scrolled !== 0){
+      const scrollHeight = this.$refs.cardBoxTwo.scrollHeight;
+      let windowScrolled = this.scrolled + windowHeight;
+      if (scrollHeight - windowScrolled < 100 && this.scrolled !== 0) {
        //把距离顶部的距离加上可视区域的高度
-        this.moreFlag = true
-      }else{
-        this.moreFlag = false
+        this.moreFlag = true;
+      } else {
+        this.moreFlag = false;
+      }
+    },
+    scroolThree() {
+      this.scrolled = this.$refs.cardBoxTwo.scrollTop;
+      console.log(this.$refs.cardBoxTwo.scrollTop);
+      //获得可视区的高度
+      const windowHeight = this.$refs.cardBoxTwo.clientHeight;
+      //获取滚动条的总高度
+      const scrollHeight = this.$refs.cardBoxTwo.scrollHeight;
+      let windowScrolled = this.scrolled + windowHeight;
+      if (scrollHeight - windowScrolled < 100 && this.scrolled !== 0) {
+        //把距离顶部的距离加上可视区域的高度
+        this.moreFlag = true;
+      } else {
+        this.moreFlag = false;
      }
    },
    //返回上一个页面
    back() {
      this.$router.push("/phoneHome");
    },
-    moreList(){
-      this.moreFlag = false
-      this.loadingFlag = true
-      this.page++
-      this.onDynamics()
+    moreList() {
+      this.moreFlag = false;
+      this.loadingFlag = true;
+      this.page++;
+      if (this.messageType == "ZLZX") {
+        this.getAdvice();
+      } else {
+        this.onDynamics();
+      }
+    },
+    jumpDetails(item) {
+      if (this.messageType == "ZYBZFG") {
+        this.$router.push({
+          name: "domesticDetails",
+          query: {
+            id: item.standardId,
+            pageType: "INLAND_STAND"
+          }
+        });
+      } else if (this.messageType == "GNWBZFG") {
+        this.$router.push({
+          name: "domesticDetails",
+          query: {
+            id: item.standardId,
+            pageType: "INLAND_STAND"
+          }
+        });
+      } else {
+        this.$router.push({
+          name: "zlzxDetails",
+          query: {
+            id: item.id
+          }
+        });
+      }
    },
    onChange(name) {
      this.messageType = name;
      this.page = 1;
-      this.standList = []
-      this.onDynamics();
+      this.standList = [];
+      this.standardReleaseList = [];
+      if (this.messageType == "ZLZX") {
+        this.getAdvice();
+      } else {
+        this.onDynamics();
+      }
    },
-    onDynamics(){
-      this.loading = true
+    //获取数据
+    getAdvice() {
+      this.$http.get("fileMaterialCenter/file-material/getFileMaterialIndex", {
+        page: this.page,
+        pageSize: 10
+      }, {
+        _this: this, loading: "loading"
+      }, res => {
+        if (res.ok) {
+          let mList = res.data;
+          if (mList.length) {
+            if (this.standardReleaseList.length) {
+              this.standardReleaseList = this.standardReleaseList.concat(mList);
+            } else {
+              this.standardReleaseList = mList;
+            }
+            this.loading = false;
+          } else {
+            this.loading = false;
+            this.listFlag = true;
+          }
+        } else {
+          this.standardReleaseList = [];
+          this.loading = false;
+        }
+      }, e => {
+        this.standardReleaseList = [];
+        this.total = 0;
+      });
+    },
+    onDynamics() {
+      this.loading = true;
      this.$http.get("/lawss/NewsFeed/getNewsFeed", {
        messageType: this.messageType,
        page: this.page,
@@ -156,21 +266,21 @@ export default {
      }, {
        _this: this
      }, res => {
-        if(res.ok){
-          let msgList= res.data.records
-          if(msgList.length){
-            if(this.standList.length){
-              this.standList = this.standList.concat(msgList)
-            }else{
-              this.standList = msgList
+        if (res.ok) {
+          let msgList = res.data.records;
+          if (msgList.length) {
+            if (this.standList.length) {
+              this.standList = this.standList.concat(msgList);
+            } else {
+              this.standList = msgList;
            }
-            this.loading = false
-          }else{
-            this.loading = false
-            this.listFlag = true
+            this.loading = false;
+          } else {
+            this.loading = false;
+            this.listFlag = true;
          }
-        }else{
-          this.standList = []
+        } else {
+          this.standList = [];
          this.loading = false;
        }
      }, e => {
@@ -186,6 +296,7 @@ export default {
  },
  mounted() {
    this.onDynamics();
+    this.getAdvice();
    //从数据库中查询下拉框数据
    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
      _this: this
@@ -204,6 +315,7 @@ export default {
  margin: 0;
  padding: 0;
  background: #F6F6F6;
+
  .search-head {
    width: 100%;
    height: 100px;
@@ -228,10 +340,12 @@ export default {
  .van-tabs {
    margin-top: 17px;
  }
-  /deep/ .van-tabs__content{
+
+  /deep/ .van-tabs__content {
    width: 100%;
    height: 95%;
  }
+
  .van-tab {
    color: #3170A8;
  }
@@ -240,17 +354,19 @@ export default {
    color: #3170A8;
    font-weight: 600;
  }
+
  /deep/ .van-tabs__line {
-    width: 50%;
+    width: 30%;
    background-color: #3170A8;
  }
-  /deep/ .van-tab__pane{
+
+  /deep/ .van-tab__pane {
    height: 95%;
    position: fixed;
    width: 100%;
  }

-  .card-box{
+  .card-box {
    height: 85%;
    position: relative;
    overflow-x: hidden;
@@ -258,6 +374,7 @@ export default {
    top: 10px;

  }
+
  .card-content {
    width: 95%;
    height: auto;
@@ -299,21 +416,25 @@ export default {
      }
    }
  }
-  .bottom-box{
+
+  .bottom-box {
    height: 40px;
    bottom: 0;
-    padding:40px;
+    padding: 40px;
    text-align: center;
    color: #3170A8;
-    .list-box{
+
+    .list-box {
      color: #3170A8;
      text-align: center;
    }
+
    .van-loading {
      position: absolute;
      left: 37%;
    }
  }
+
  .van-loading {
    position: absolute;
    top: 350px;
@@ -3705,7 +3705,8 @@
                            // 流程提交之后，应该流转至待办任务页面
                            this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
                          } else {
-                            this.isSubmit = false
+                            this.$message.warning(res.message)
+                            this.isSubmit = true
                          }
                        })
                      } else {
@@ -244,9 +244,9 @@
              label="适用车型"
              width="90"
            >
-              <template slot-scope="scope">
-                {{JSON.parse(scope.row.applyArctic).join(',')}}
-              </template>
+<!--              <template slot-scope="scope">-->
+<!--                {{JSON.parse(scope.row.applyArctic).join(',')}}-->
+<!--              </template>-->
            </el-table-column>
            <!--          <el-table-column-->
            <!--              prop="responsibleUnit"-->
@@ -663,6 +663,7 @@
        this.sarProStateEO.standNumber = ''
        this.sarProStateEO.standName = ''
        this.sarProStateEO.specificItem = ''
+        this.sarProStateTotalPage = 1
        this.showSarProStateModal = false
      }, // 关闭查看事件
      pageProStateChange (page) {
@@ -120,6 +120,12 @@ const routes = [
    component: () =>
      import('@/pages/phone/domesticDetails')
  },
+  {
+    path: '/zlzxDetails',
+    name: 'zlzxDetails',
+    component: () =>
+      import('@/pages/phone/zlzxDetails')
+  },
  {
    path: '/loginVerify',
    name: 'LoginVerify',