diff --git a/src/App.vue b/src/App.vue index 82ca16efe..abf347695 100644 --- a/src/App.vue +++ b/src/App.vue @@ -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 { diff --git a/src/main.js b/src/main.js index c7e1e4eea..2473b7007 100644 --- a/src/main.js +++ b/src/main.js @@ -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') { diff --git a/src/pages/home2/components/releaseZL/index.vue b/src/pages/home2/components/releaseZL/index.vue new file mode 100644 index 000000000..93a53874d --- /dev/null +++ b/src/pages/home2/components/releaseZL/index.vue @@ -0,0 +1,179 @@ + + + + + + diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index 0b507b8e3..dd4ae132b 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -27,6 +27,10 @@ 企业标准发布 + + 标准化动态 + + 标准问答 @@ -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, diff --git a/src/pages/phone/standDynamics.vue b/src/pages/phone/standDynamics.vue index a718847e4..7bd9ad307 100644 --- a/src/pages/phone/standDynamics.vue +++ b/src/pages/phone/standDynamics.vue @@ -6,13 +6,13 @@ < 标准化动态 - +
加载中...
-
+
{{ item.standardName }}
@@ -43,7 +43,7 @@
加载中...
-
+
{{ item.standardName }}
@@ -69,6 +69,37 @@ 加载中...
+ +
+
+ 加载中... +
+
+
+
{{ item.dataTitle && item.dataTitle.length > 40 ?item.dataTitle.slice(0,39)+'...':item.dataTitle }}
+
+
+
类型: + + {{item.dataType && item.dataType.length > 30 ?item.dataType.slice(0,29)+'...':item.dataType }} +
+
上传时间: + + {{ $moment(item.dataUploadTime).format("YYYY-MM-DD HH:mm:ss") }} + +
+
+
+
+ +
+
+
+
没有更多数据了...
+
点击加载更多
+ 加载中... +
+
@@ -82,6 +113,7 @@ export default { active: "", messageType: "ZYBZFG", standList: [], + standardReleaseList: [], page: 1, standStateOptions: [], //存放文本状态 textStatusMap: {},// 文本状态id与name对应 @@ -92,15 +124,6 @@ export default { }; }, 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) @@ -131,6 +154,21 @@ export default { 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"); @@ -139,13 +177,78 @@ export default { this.moreFlag = false this.loadingFlag = true this.page++ - this.onDynamics() + 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.standardReleaseList = [] + if(this.messageType == 'ZLZX'){ + this.getAdvice() + }else { + this.onDynamics(); + } + }, + //获取数据 + 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 @@ -186,6 +289,7 @@ export default { }, mounted() { this.onDynamics(); + this.getAdvice(); //从数据库中查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this @@ -241,7 +345,7 @@ export default { font-weight: 600; } /deep/ .van-tabs__line { - width: 50%; + width: 30%; background-color: #3170A8; } /deep/ .van-tab__pane{ diff --git a/src/pages/phone/zlzxDetails.vue b/src/pages/phone/zlzxDetails.vue new file mode 100644 index 000000000..959e80f64 --- /dev/null +++ b/src/pages/phone/zlzxDetails.vue @@ -0,0 +1,2565 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index b9b5802cc..10ab0fb5b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -120,6 +120,12 @@ const routes = [ component: () => import('@/pages/phone/domesticDetails') }, + { + path: '/zlzxDetails', + name: 'zlzxDetails', + component: () => + import('@/pages/phone/zlzxDetails') + }, { path: '/loginVerify', name: 'LoginVerify', diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 6b14c8275..6f1f1a7b9 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -8,8 +8,10 @@ // const devInterfacePORT = '10005' // const devIp = '192.168.1.42' // const devInterfacePORT = '9999' -const devIp = '39.98.140.126' -const devInterfacePORT = '4202' +// const devIp = '39.98.140.126' +// const devInterfacePORT = '4202' +const devIp = '10.0.3.10' +const devInterfacePORT = '10086' // const devIp = '62.234.136.153' // const devInterfacePORT = '8033' // 配置 idm 认证 @@ -20,7 +22,8 @@ const devWebUrl = 'http://62.234.136.153:8038/#/' const webLoginType = 'dev' // 配置onlyOffice 前端服务 -const onlyOfficeUrl = 'http://127.0.0.1:8080' +// const onlyOfficeUrl = 'http://127.0.0.1:8080' +const onlyOfficeUrl = 'http://10.10.10.46:8103' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'