diff --git a/src/js/store/index.js b/src/js/store/index.js index a803ca87..7dfbb567 100644 --- a/src/js/store/index.js +++ b/src/js/store/index.js @@ -4,6 +4,7 @@ import cloneDeep from "lodash/cloneDeep"; import user from "./modules/user"; import app from "./modules/app"; import tagsView from "./modules/tagsView"; +import { requestPost } from "@/js/dai/request"; Vue.use(Vuex); @@ -38,6 +39,7 @@ export default new Vuex.Store({ activeName: "", }, tipsList: [], + tipsTime: [], inIframe: window.self !== window.top, }, modules: { @@ -52,5 +54,38 @@ export default new Vuex.Store({ state[key] = cloneDeep(window.SITE_CONFIG["storeState"][key]); }); }, + SET_TIPS_LIST(state, tipsList) { + let _list = state.tipsList + state.tipsList = _list.concat(tipsList) + }, + SET_TIPS_TIME(state, time) { + state.tipsTime = time + } }, + actions: { + setTipsList({ commit }, time) { + return new Promise(async (resolve, reject) => { + const url = '/gov/project/memoAttr/memosToRemind' + const params = { + remindTime: time || '' + } + const { data, code, msg } = await requestPost(url, params) + if (code === 0) { + commit('SET_TIPS_LIST', data) + resolve() + } else reject(msg) + }) + }, + setTipsTime({ commit }) { + return new Promise(async (resolve, reject) => { + const url = '/gov/project/memoAttr/memoTime' + + const { data, code, msg } = await requestPost(url) + if (code === 0) { + commit('SET_TIPS_TIME', data) + resolve() + } else reject(msg) + }) + } + } }); diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 5ce37b09..c691d133 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -70,9 +70,13 @@ - + - + @@ -96,6 +100,7 @@ import { isURL } from "@/utils/validate"; import Cookie from "js-cookie"; import Tips from './tips.vue' +import { requestPost } from "@/js/dai/request"; export default { components: { Tips @@ -120,7 +125,7 @@ export default { this.token = localStorage.getItem("token"); this.customerId = localStorage.getItem("customerId"); - // this.loopTips() + this.loopTips() }, methods: { changeCustomerName(customerName) { @@ -207,17 +212,49 @@ export default { iframe.postMessage({ name: "lalalal" }, "*"); }, loopTips() { - let id = 1 - this.timer = setInterval(() => { - id = id + 1 - if (id == 5) clearInterval(this.timer) - this.tipsList.push(id) - console.log('id------0', id) - }, 1000) + this.$store.dispatch('setTipsList') + this.$store.dispatch('setTipsTime') + // let id = 1 + // this.timer = setInterval(() => { + // id = id + 1 + // if (id == 5) clearInterval(this.timer) + // this.tipsList.push(id) + // console.log('id------0', id) + // }, 1000) + }, + async closeTips(memoId) { + const url = '/gov/project/memoAttr/setReaded' + const params = { + memoId + } + const { data, code, msg } = await requestPost(url, params) + if (code != 0) this.$message.error(msg) + }, + async getInfo(item) { + const urls = { + work_diary: '/gov/project/memoWorkDiary', + concern: '/gov/project/memoConcern', + difficulty: '/gov/project/memoDifficulty/detail' + } + const params = { + id: item.memoId, + readFlag: 0 + } + const { data, code, msg } = await requestPost(urls[item.type], params) + if (code == 0) { + this.form = { ...data } + } else this.$message.error(msg) + }, + handleClose(item, index) { + console.log('close-----', item) + this.$store.state.tipsList.splice(index, 1) + this.closeTips(item.memoId) }, - handleLook(id) { - console.log('look-----', id) + async handleLook(item) { + console.log('look-----', item) + await this.getInfo(item) this.dialogFormVisible = true + } }, }; diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 2d9d49cf..63dce11e 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -12,11 +12,12 @@ @click="handleAdd">新增 下载人口模板 + @click="handleExportModule('room')">下载模板 + > +