From 7cf21ab52e38632b9e4d174ca98a00941a8fe230 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 18 Dec 2023 14:43:01 +0800 Subject: [PATCH 1/9] =?UTF-8?q?feature:=20=E9=85=8D=E7=BD=AEeslint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/.eslintrc.js b/.eslintrc.js index 97b94c4b2..0f0a4b516 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -70,6 +70,7 @@ module.exports = { 'singleline': 'never', 'multiline': 'always', }], + 'vue/attribute-hyphenation': 'off', // 关闭 属性名必须使用连字符的规则 }, env: { browser: true, From 04877e3299b418a6981afa64291610968fdbb536 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 18 Dec 2023 15:02:39 +0800 Subject: [PATCH 2/9] =?UTF-8?q?feature(=E4=BC=81=E6=A0=87=E5=88=B6?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2):=20=E6=8A=80=E6=9C=AF/=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=A0=87=E5=87=86-=E5=8F=91=E5=B8=83=E9=A1=B5-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BD=93=E5=89=8D=E9=A1=BA=E5=BA=8F=E5=8F=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/components/CurrentOrder.vue | 80 +++++++++++++++++++ .../qbrk-product/common/formEditList.vue | 14 +++- .../qbrk/common/formEditListFb.vue | 15 +++- 3 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 src/pages/processCenter/pages/components/CurrentOrder.vue diff --git a/src/pages/processCenter/pages/components/CurrentOrder.vue b/src/pages/processCenter/pages/components/CurrentOrder.vue new file mode 100644 index 000000000..8db0688b9 --- /dev/null +++ b/src/pages/processCenter/pages/components/CurrentOrder.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index 7e3b31a42..c7a34d145 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -1,3 +1,4 @@ + diff --git a/src/pages/home2/components/release2/index.vue b/src/pages/home2/components/release2/index.vue index f4391dce5..41309e9de 100644 --- a/src/pages/home2/components/release2/index.vue +++ b/src/pages/home2/components/release2/index.vue @@ -1,62 +1,60 @@ @@ -65,48 +63,47 @@ export default { name: 'Release', components: {}, mixins: [], - data() { + data () { return { - loading: false, - pageVerify: false, - page: 1, - pageSize: this.$store.getters.userInfo.configContent, - total: 0, - putTime: '', - standardReleaseList: [], //标准发布数据 + loading: false, + pageVerify: false, + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + total: 0, + putTime: '', + standardReleaseList: [], // 标准发布数据 } }, computed: {}, watch: {}, - mounted() { + 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 () { - if(this.total && this.total > 10){ - this.pageVerify = true - this.pageSize = this.$store.getters.userInfo.configContent - }else { - this.pageVerify = false - } - this.getAdvice() - }, + 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 () { + if(this.total && this.total > 10) { + this.pageVerify = true + this.pageSize = this.$store.getters.userInfo.configContent + }else { + this.pageVerify = false + } + this.getAdvice() + }, // 点击查看 handlePreview (item) { - let routeUrl = this.$router.resolve({ + const routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { id: item.standardId, @@ -115,27 +112,27 @@ export default { }) window.open(routeUrl.href, '_blank') }, - //截取时间 + // 截取时间 getDate (date) { return date != null ? date.substring(0, date.indexOf(' ')) : '' }, - //获取数据 - getAdvice() { + // 获取数据 + getAdvice () { this.loading = true - this.$http.get("/lawss/NewsFeed/getNewsFeed", { - messageType: 'GNWBZFG', - page: this.page, - pageSize: this.pageSize - }, { - _this: this,loading: 'loading' - }, res => { - this.standardReleaseList = res.data.records - this.total = res.data.total - this.loading = false + this.$http.get('/lawss/NewsFeed/getNewsFeed', { + messageType: 'GNWBZFG', + page: this.page, + pageSize: this.pageSize + }, { + _this: this, loading: 'loading' + }, res => { + this.standardReleaseList = res.data.records + this.total = res.data.total + this.loading = false }, e => { - this.loading = false - this.standardReleaseList = [] - this.total = 0 + this.loading = false + this.standardReleaseList = [] + this.total = 0 }) }, }, diff --git a/src/pages/home2/components/releaseBuss/index.vue b/src/pages/home2/components/releaseBuss/index.vue index c666041e3..7abfaec7e 100644 --- a/src/pages/home2/components/releaseBuss/index.vue +++ b/src/pages/home2/components/releaseBuss/index.vue @@ -1,64 +1,62 @@ @@ -68,7 +66,7 @@ export default { name: 'ReleaseBuss', components: {}, mixins: [], - data() { + data () { return { loading: false, pageVerify: false, @@ -76,70 +74,69 @@ export default { pageSize: this.$store.getters.userInfo.configContent, total: 0, putTime: '', - standardReleaseList: [], //标准发布数据 + standardReleaseList: [], // 标准发布数据 } }, computed: {}, watch: {}, - mounted() { + mounted () { this.getDate() this.getAdvice() // this.addDate() }, methods: { - checkTime (time) { - return moment(time.slice(0,10)).diff(moment(), 'day') > -3 - }, - 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:'/releaseBuss2'}) - }, + checkTime (time) { + return moment(time.slice(0, 10)).diff(moment(), 'day') > -3 + }, + 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: '/releaseBuss2' }) + }, // 点击查看 handlePreview (item) { - let routeUrl = this.$router.resolve({ - name: 'OtherBussStandardDetails', - params: { - id: item.standardId, - pageType: 'BUSINESS_STAND' - } - }) - window.open(routeUrl.href, '_blank') + const 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 - this.$http.get("/lawss/NewsFeed/getNewsFeed", { - messageType: 'QYBZFB', - page: this.page, - pageSize: this.pageSize - }, { - _this: this,loading: 'loading' - }, res => { - this.standardReleaseList = res.data.records - this.total = res.data.total - this.loading = false - }, e => { - this.loading = false - this.standardReleaseList = [] - this.total = 0 - }) + // 获取数据 + getAdvice () { + this.loading = true + this.$http.get('/lawss/NewsFeed/getNewsFeed', { + messageType: 'QYBZFB', + page: this.page, + pageSize: this.pageSize + }, { + _this: this, loading: 'loading' + }, res => { + this.standardReleaseList = res.data.records + this.total = res.data.total + this.loading = false + }, e => { + this.loading = false + this.standardReleaseList = [] + this.total = 0 + }) }, }, - } diff --git a/src/pages/home2/components/releaseBuss2/index.vue b/src/pages/home2/components/releaseBuss2/index.vue index 4969e7507..784d54218 100644 --- a/src/pages/home2/components/releaseBuss2/index.vue +++ b/src/pages/home2/components/releaseBuss2/index.vue @@ -1,65 +1,71 @@ @@ -69,7 +75,7 @@ export default { name: 'ReleaseBuss2', components: {}, mixins: [], - data() { + data () { return { loading: false, pageVerify: false, @@ -77,73 +83,72 @@ export default { pageSize: this.$store.getters.userInfo.configContent, total: 0, putTime: '', - standardReleaseList: [], //标准发布数据 + standardReleaseList: [], // 标准发布数据 } }, computed: {}, watch: {}, - mounted() { + mounted () { this.getDate() this.getAdvice() - // this.addDate() }, methods: { - checkTime (time) { - return moment(time.slice(0,10)).diff(moment(), 'day') > -3 - }, - 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 () { - if(this.total && this.total > 10){ - this.pageVerify = true - this.pageSize = this.$store.getters.userInfo.configContent - }else { - this.pageVerify = false - } - this.getAdvice() - }, + checkTime (time) { + return moment(time.slice(0, 10)).diff(moment(), 'day') > -3 + }, + 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 () { + if(this.total && this.total > 10) { + this.pageVerify = true + this.pageSize = this.$store.getters.userInfo.configContent + }else { + this.pageVerify = false + } + this.getAdvice() + }, // 点击查看 handlePreview (item) { - let routeUrl = this.$router.resolve({ - name: 'OtherBussStandardDetails', - params: { - id: item.standardId, - pageType: 'BUSINESS_STAND' - } - }) - window.open(routeUrl.href, '_blank') + const 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 - this.$http.get("/lawss/NewsFeed/getNewsFeed", { - messageType: 'QYBZFB', - page: this.page, - pageSize: this.pageSize - }, { - _this: this,loading: 'loading' - }, res => { - this.standardReleaseList = res.data.records - this.total = res.data.total - this.loading = false - }, e => { - this.loading = false - this.standardReleaseList = [] - this.total = 0 - }) + // 获取数据 + getAdvice () { + this.loading = true + this.$http.get('/lawss/NewsFeed/getNewsFeed', { + messageType: 'QYBZFB', + page: this.page, + pageSize: this.pageSize + }, { + _this: this, loading: 'loading' + }, res => { + this.standardReleaseList = res.data.records + this.total = res.data.total + this.loading = false + }, e => { + this.loading = false + this.standardReleaseList = [] + this.total = 0 + }) }, }, diff --git a/src/pages/home2/components/releaseQA/index.vue b/src/pages/home2/components/releaseQA/index.vue index 07b1729ca..ee9184ddf 100644 --- a/src/pages/home2/components/releaseQA/index.vue +++ b/src/pages/home2/components/releaseQA/index.vue @@ -1,51 +1,54 @@ @@ -55,7 +58,7 @@ export default { name: 'ReleaseQA', components: {}, mixins: [], - data() { + data () { return { loading: false, pageVerify: false, @@ -63,36 +66,36 @@ export default { total: 0, currentPage: 1, data: [], - form:{ - classification:"", // 类型 - problemDescription: "", // 问题描述 + form: { + classification: '', // 类型 + problemDescription: '', // 问题描述 }, } }, computed: {}, watch: {}, - mounted() { + mounted () { this.getDate() }, methods: { togo () { - this.$router.push({path:'/releaseQA2'}) + this.$router.push({ path: '/releaseQA2' }) }, handleClick (id) { this.$router.push({ - path:'/standQA', + path: '/standQA', query: { id } }) }, - getDate(){ + getDate () { this.loading = true - let form = this.form + const form = this.form form.userId = this.$store.getters.userInfo.account form.pageSize = this.pageSize form.page = this.currentPage - return new Promise((resolve,reject)=>{ - this.$http.get('lawss/AskQuestions/getAskQuestionsPage', form, {_this: this }, res => { - if(res.data){ + return new Promise((resolve, reject) => { + this.$http.get('lawss/AskQuestions/getAskQuestionsPage', form, { _this: this }, res => { + if(res.data) { const data = res.data this.data = data.records this.total = data.total diff --git a/src/pages/home2/components/releaseUs/index.vue b/src/pages/home2/components/releaseUs/index.vue index 34c8e8525..e8912e5ae 100644 --- a/src/pages/home2/components/releaseUs/index.vue +++ b/src/pages/home2/components/releaseUs/index.vue @@ -1,62 +1,68 @@ @@ -65,7 +71,7 @@ export default { name: 'ReleaseUs', components: {}, mixins: [], - data() { + data () { return { loading: false, pageVerify: false, @@ -73,49 +79,49 @@ export default { pageSize: 10, total: 0, putTime: '', - standardReleaseList: [], //标准发布数据 + standardReleaseList: [], // 标准发布数据 textStatusMap: {} // 标准状态id与name对应 } }, computed: {}, watch: {}, - mounted() { - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - if (res.data.WBZTCLASS !== undefined && res.data.WBZTCLASS !== null){ - this.setMap(res.data.WBZTCLASS) // 标准状态 - } - }, e => { - }) + mounted () { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + if (res.data.WBZTCLASS !== undefined && res.data.WBZTCLASS !== null) { + this.setMap(res.data.WBZTCLASS) // 标准状态 + } + }, e => { + }) 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:'/releaseUs2'}) - }, - // 将标准状态的id与name对应 - setMap(data) { - data.forEach(item => { - this.$set(this.textStatusMap, item.value, item.label) - }) - }, + 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: '/releaseUs2' }) + }, + // 将标准状态的id与name对应 + setMap (data) { + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + }) + }, // 点击查看 handlePreview (item) { - let routeUrl = this.$router.resolve({ + const routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { id: item.standardId, @@ -124,28 +130,28 @@ export default { }) window.open(routeUrl.href, '_blank') }, - //截取时间 + // 截取时间 getDate (date) { return date != null ? date.substring(0, date.indexOf(' ')) : '' }, - //获取数据 - getAdvice() { - this.loading = true - this.$http.get("/lawss/NewsFeed/getNewsFeed", { - messageType: 'ZYBZFG', - page: this.page, - pageSize: this.pageSize - }, { - _this: this,loading: 'loading' - }, res => { - this.standardReleaseList = res.data.records - this.total = res.data.total - this.loading = false - }, e => { - this.loading = false - this.standardReleaseList = [] - this.total = 0 - }) + // 获取数据 + getAdvice () { + this.loading = true + this.$http.get('/lawss/NewsFeed/getNewsFeed', { + messageType: 'ZYBZFG', + page: this.page, + pageSize: this.pageSize + }, { + _this: this, loading: 'loading' + }, res => { + this.standardReleaseList = res.data.records + this.total = res.data.total + this.loading = false + }, e => { + this.loading = false + this.standardReleaseList = [] + this.total = 0 + }) }, }, diff --git a/src/pages/home2/components/releaseZL/index.vue b/src/pages/home2/components/releaseZL/index.vue index b2a380590..27fe49310 100644 --- a/src/pages/home2/components/releaseZL/index.vue +++ b/src/pages/home2/components/releaseZL/index.vue @@ -1,66 +1,71 @@ @@ -69,7 +74,7 @@ export default { name: 'ReleaseQA', components: {}, mixins: [], - data() { + data () { return { loading: false, pageVerify: false, @@ -77,76 +82,76 @@ export default { pageSize: this.$store.getters.userInfo.configContent, total: 0, putTime: '', - standardReleaseList: [], //标准问答数据 + standardReleaseList: [], // 标准问答数据 } }, computed: {}, watch: {}, - mounted() { + 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'}) - }, + 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') + // 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(' ')) : '' }, - toDetail(row){ + toDetail (row) { this.$router.push({ - name: "dataCenterDetail", + name: 'dataCenterDetail', query: { id: row.id } }); }, - //获取数据 - 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 - }) + // 获取数据 + getAdvice () { + this.loading = true + // 模拟加载 + const timer = setInterval(() => { + this.loading = false + }, 2000) + console.log(timer) + const 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 + }) }, }, diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue index 445ad0f5d..619263f72 100644 --- a/src/pages/home2/components/solicitopinions/index.vue +++ b/src/pages/home2/components/solicitopinions/index.vue @@ -1,32 +1,34 @@ @@ -71,7 +71,7 @@ export default { loading: false, pageVerify: false, page: 1, - pageSize: this.$store.getters.userInfo.configContent, + pageSize: 10, total: 0, putTime: '', standardReleaseList: [], // 标准发布数据 @@ -130,6 +130,10 @@ export default { this.standardReleaseList = res.data.records this.total = res.data.total this.loading = false + if (res.data && res.data.records && res.data.records.length > 0) { + const isNew = res.data.records[0].threeDaysNew || false + this.$emit('isNew', isNew) + } }, e => { this.loading = false this.standardReleaseList = [] diff --git a/src/pages/home2/components/releaseBuss2/index.vue b/src/pages/home2/components/releaseBuss2/index.vue index 784d54218..1e4812e53 100644 --- a/src/pages/home2/components/releaseBuss2/index.vue +++ b/src/pages/home2/components/releaseBuss2/index.vue @@ -1,14 +1,6 @@ diff --git a/src/pages/home2/components/releaseQA/index.vue b/src/pages/home2/components/releaseQA/index.vue index ee9184ddf..62addd67d 100644 --- a/src/pages/home2/components/releaseQA/index.vue +++ b/src/pages/home2/components/releaseQA/index.vue @@ -32,7 +32,10 @@ align="center" > 0) { + const isNew = res.data.records[0].threeDaysNew || false + this.$emit('isNew', isNew) + } }, e => { this.loading = false reject(e) diff --git a/src/pages/home2/components/releaseZL/index.vue b/src/pages/home2/components/releaseZL/index.vue index 27fe49310..43ef5b325 100644 --- a/src/pages/home2/components/releaseZL/index.vue +++ b/src/pages/home2/components/releaseZL/index.vue @@ -1,14 +1,6 @@