diff --git a/src/components/AppNewsBox.vue b/src/components/AppNewsBox.vue index c3e4576..76c41d9 100755 --- a/src/components/AppNewsBox.vue +++ b/src/components/AppNewsBox.vue @@ -1,21 +1,27 @@ diff --git a/src/views/extermal/Article/Detaila.vue b/src/views/extermal/Article/Detaila.vue index 834b329..d61a17a 100755 --- a/src/views/extermal/Article/Detaila.vue +++ b/src/views/extermal/Article/Detaila.vue @@ -6,11 +6,11 @@ import DetailNews from './DetailNews.vue' import DetailNew from './DetailNew.vue' import DetailNew1 from './DetailNew1.vue' import { - getArticleDetail, - faqDetail, - demandDetail, - trendsDetail, - externalList + getArticleDetail, + faqDetail, + demandDetail, + trendsDetail, + externalList } from '@/api/daikin/base' import HomeHead from '@/views/home/components/HomeHead.vue' import { useDate } from '@/views/home/hooks/useDate' @@ -18,79 +18,79 @@ const { push } = useRouter() const route = useRoute() const { day, week } = useDate() const SideNews = [ - { key: 'IntelligenceOutside', name: '社外情报' }, - { key: 'IntelligenceWithin', name: '社内情报' } + { key: 'IntelligenceOutside', name: '社外情报' }, + { key: 'IntelligenceWithin', name: '社内情报' } ] const types = ref() const state = ref({}) async function getData() { - const { id, type } = route.params - if (!id || !type) return - types.value = type - // console.log(types.value) - if (type == 1) { - const { data } = await faqDetail({ id }) - state.value = data - } else if (type == 2) { - const { data } = await demandDetail({ id }) - state.value = data - } else { - const { data } = await trendsDetail({ id }) - data.tagColor = data.tag === '紧急' ? '#e60e0e' : '#2cba06' - data.content = unescapeHTML(data.content) - state.value = data - } + const { id, type } = route.params + if (!id || !type) return + types.value = type + // console.log(types.value) + if (type == 1) { + const { data } = await faqDetail({ id }) + state.value = data + } else if (type == 2) { + const { data } = await demandDetail({ id }) + state.value = data + } else { + const { data } = await trendsDetail({ id }) + data.tagColor = data.tag === '紧急' ? '#e60e0e' : '#2cba06' + data.content = unescapeHTML(data.content) + state.value = data + } } function unescapeHTML(html: string) { - const doc = new DOMParser().parseFromString(html, 'text/html') - return doc.documentElement.textContent + const doc = new DOMParser().parseFromString(html, 'text/html') + return doc.documentElement.textContent } getData() const goBack = () => { - history.back() + history.back() } diff --git a/src/views/home/components/New.vue b/src/views/home/components/New.vue index e9e32fc..45558bf 100755 --- a/src/views/home/components/New.vue +++ b/src/views/home/components/New.vue @@ -107,21 +107,21 @@ const codePath: any = { const toDetail2 = (n: any) => { console.log(n) if (n.id === 0) return - if (n.isSelect === 1) { - if (n.moduleCode === 'App_Database') { - return push('/DataBase?id=' + n.cateId) - } - if (n.moduleCode === 'App_Article') { - return push('/Home/intelligence/') - } - const { moduleCode, id, cateId } = n - const { modulePath, path } = codePath[moduleCode] - push(modulePath) - - // push(`/intelligence/${n.type == 2 ? 'within' : 'outside'}/` + n.id) - } else { - message.info('您没有权限查看!') + // if (n.isSelect === 1) { + if (n.moduleCode === 'App_Database') { + return push('/DataBase?id=' + n.cateId) } + if (n.moduleCode === 'App_Article') { + return push('/Home/intelligence/') + } + const { moduleCode, id, cateId } = n + const { modulePath, path } = codePath[moduleCode] + push(modulePath) + + // push(`/intelligence/${n.type == 2 ? 'within' : 'outside'}/` + n.id) + // } else { + // message.info('您没有权限查看!') + // } } const downloads = (data: any = {}) => { diff --git a/src/views/home/intelligence/Detail.vue b/src/views/home/intelligence/Detail.vue index 0061b2d..b600c4e 100755 --- a/src/views/home/intelligence/Detail.vue +++ b/src/views/home/intelligence/Detail.vue @@ -6,6 +6,7 @@ import Layout from './components/Layout.vue' import DetailNews from './DetailNews.vue' import { getArticleDetail, getArticlePage, getManagerDetail, report } from '@/api/daikin/base' import { message } from '@/utils/message' +import { isNotOneWeekAgo } from '@/utils' const { push } = useRouter() const route = useRoute() @@ -161,7 +162,12 @@ const handlewaiScoll = () => { size="h20px" /> -->
- + +
{{ i.title }} @@ -192,7 +198,12 @@ const handlewaiScoll = () => { /> -->
- + +
{{ i.title }} diff --git a/src/views/home/intelligence/DetailNews.vue b/src/views/home/intelligence/DetailNews.vue index 543bdc0..5558a66 100755 --- a/src/views/home/intelligence/DetailNews.vue +++ b/src/views/home/intelligence/DetailNews.vue @@ -8,14 +8,20 @@ const props = defineProps({ tag: String, tagColor: String, source: String, - publishTime: String, + publishTime: String }) diff --git a/src/views/home/intelligence/process/ProcessInfo.vue b/src/views/home/intelligence/process/ProcessInfo.vue index 9746bb6..071f044 100755 --- a/src/views/home/intelligence/process/ProcessInfo.vue +++ b/src/views/home/intelligence/process/ProcessInfo.vue @@ -6,76 +6,88 @@ import HomeHeadSearch from '@/views/home/components/HomeHeadSearch.vue' import UserPage from './UserPages.vue' import { useDate } from '@/views/home/hooks/useDate' import { getArticleDetail, review } from '@/api/daikin/base' -import { NModal, NCard, NForm, NButton, NFormItem, NInput, NRadio, NSelect, NSpace, NRadioGroup, useMessage, treeDark } from 'naive-ui' +import { + NModal, + NCard, + NForm, + NButton, + NFormItem, + NInput, + NRadio, + NSelect, + NSpace, + NRadioGroup, + useMessage, + treeDark +} from 'naive-ui' import { getImg } from '../images' import { useUserStore } from '@/stores/modules/user' -import {noticeld} from '@/stores/modules/noticeId' +import { noticeld } from '@/stores/modules/noticeId' import { Plus } from '@element-plus/icons-vue' import type { UploadProps, UploadUserFile } from 'element-plus' - const stores = noticeld() const store = useUserStore() const state = ref({}) async function getData() { - const { id } = route.params - if (!id) return - const { data} = await getArticleDetail(id as string) - state.value = data - dataList.value = data.userList - formValue.value = Object.assign(data,{ - type:data.type+'', - cate:data.cate+'', - }) - editorContent.value =data.content? unescapeHTML(data.content):'' - cate.value = data.cate - console.log(data.type) + const { id } = route.params + if (!id) return + const { data } = await getArticleDetail(id as string) + state.value = data + dataList.value = data.userList + formValue.value = Object.assign(data, { + type: data.type + '', + cate: data.cate + '' + }) + editorContent.value = data.content ? unescapeHTML(data.content) : '' + cate.value = data.cate + console.log(data.type) } const message = useMessage() const { day, week } = useDate() const { push } = useRouter() const route = useRoute() -let cate = ref(1); +let cate = ref(1) let formValue: any = ref({ - type: 1, - status:1, - cate: '', - title: '', - tag: '', - source: '', - content: '', - isTop:'N', - bannerImg:'', + type: 1, + status: 1, + cate: '', + title: '', + tag: '', + source: '', + content: '', + isTop: 'N', + bannerImg: '' }) let rules = { - cate: { - required: false, - message: '请选择类型', - trigger: 'blur' - }, - title: { - required: false, - message: '请输入标题', - trigger: 'blur' - }, - tag: { - required: true, - message: '请输入标题', - trigger: 'blur' - }, - source: { - required: true, - message: '请输入标题', - trigger: 'blur' - }, - content: { - required: false, - message: '请输入内容', - trigger: 'blur' - } + cate: { + required: false, + message: '请选择类型', + trigger: 'blur' + }, + title: { + required: false, + message: '请输入标题', + trigger: 'blur' + }, + tag: { + required: true, + message: '请输入标题', + trigger: 'blur' + }, + source: { + required: true, + message: '请输入标题', + trigger: 'blur' + }, + content: { + required: false, + message: '请输入内容', + trigger: 'blur' + } } // let options = [{ // label: '紧急', @@ -86,192 +98,201 @@ let rules = { // value: 'New' // },] function change(i: any) { - cate.value = i - formValue.cate = cate.value - // console.log( formValue.cate) + cate.value = i + formValue.cate = cate.value + // console.log( formValue.cate) } function unescapeHTML(html: string) { - const doc = new DOMParser().parseFromString(html, 'text/html'); - return doc.documentElement.textContent; + const doc = new DOMParser().parseFromString(html, 'text/html') + return doc.documentElement.textContent } function escapeHTML(html: string): string { - const tempElement = document.createElement('div'); - tempElement.textContent = html; - return tempElement.innerHTML; + const tempElement = document.createElement('div') + tempElement.textContent = html + return tempElement.innerHTML } // 获取子组件传过来的值 const handleChild2 = (data: string) => { editorContent.value = data } -const starts =ref(1) +const starts = ref(1) const fileList = ref<[]>() const editorContent = ref('') async function sure() { - const {id, title, source, type ,isTop,content:conts} = formValue.value - const cont = editorContent.value - const content = cont?escapeHTML(cont):conts + const { id, title, source, type, isTop, content: conts } = formValue.value + const cont = editorContent.value + const content = cont ? escapeHTML(cont) : conts - const noticeId = stores.article.noticeld - const cates = cate.value - const status = starts.value - console.log(content) - let userIdList: any[] =[] - // let filLists - // if(isTop==='Y'&&!fileList.value){ - // message.error("请选择图片") - // return - // } - // else if(isTop==='Y'&&fileList.value){ - // filLists = fileList.value.map(item => item.response.fileName).join(','); + const noticeId = stores.article.noticeld + const cates = cate.value + const status = starts.value + console.log(content) + let userIdList: any[] = [] + // let filLists + // if(isTop==='Y'&&!fileList.value){ + // message.error("请选择图片") + // return + // } + // else if(isTop==='Y'&&fileList.value){ + // filLists = fileList.value.map(item => item.response.fileName).join(','); - // } - + // } - if(!dataList.value){ - message.success("请选择要提醒的对象") - return - } - dataList.value.forEach((i: { userId: any })=>{ - console.log(dataList.value) - userIdList.push(i.userId) - }) - // console.log(formValue.value) - if(userIdList.length<0) return - const { msg, code } = await review({id,status,isTop, title, source, cate:cates,noticeId, type, content ,userIdList}) - if (code === 200) { - showModalRef2.value = true - } - else { message.success(msg); } + if (!dataList.value) { + message.success('请选择要提醒的对象') + return + } + dataList.value.forEach((i: { userId: any }) => { + console.log(dataList.value) + userIdList.push(i.userId) + }) + // console.log(formValue.value) + if (userIdList.length < 0) return + const { msg, code } = await review({ + id, + status, + isTop, + title, + source, + cate: cates, + noticeId, + type, + content, + userIdList + }) + if (code === 200) { + showModalRef2.value = true + } else { + message.success(msg) + } } - - const showModal = ref(false) const showModalRef = ref(false) const showModalRef2 = ref(false) const bodyStyle = ref({ - // 'background-color': '#236EED' + // 'background-color': '#236EED' }) function onNegativeClick() { - message.success('Cancel') - showModalRef.value = false + message.success('Cancel') + showModalRef.value = false } function onPositiveClick() { - showModalRef.value = false - sure() - + showModalRef.value = false + sure() } function onPositiveClicks() { - showModalRefs.value = false - sure() - + showModalRefs.value = false + sure() } const dataList = ref() // 获取子组件传过来的值 const handleChild = (data: any) => { - const { showModal: show, multipleSelection } = data - showModal.value = unref(show) - dataList.value = unref(multipleSelection) + const { showModal: show, multipleSelection } = data + showModal.value = unref(show) + dataList.value = unref(multipleSelection) } const handleClose = (tag: any) => { - - dataList.value.splice(dataList.value.indexOf(tag), 1) - // console.log( dataList.value) + dataList.value.splice(dataList.value.indexOf(tag), 1) + // console.log( dataList.value) } -const CloseThis = (data: boolean)=>{ - showModal.value = data +const CloseThis = (data: boolean) => { + showModal.value = data } -const ok =() =>{ - showModalRef2.value = false - push('/Home/Process') +const ok = () => { + showModalRef2.value = false + push('/Home/Process') } -const submitSave = (page: any)=>{ - console.log(page) - if(store.user.isReview === 1){ - if(page === 1){ - - showModalRef.value = true - }else{ - showModalRefs.value = true - } - starts.value = page - // console.log(page,showModalRef.value, showModalRefs.value) +const submitSave = (page: any) => { + console.log(page) + if (store.user.isReview === 1) { + if (page === 1) { + showModalRef.value = true + } else { + showModalRefs.value = true } - else{ - message.warning("您还未获得审核权限") - } - + starts.value = page + // console.log(page,showModalRef.value, showModalRefs.value) + } else { + message.warning('您还未获得审核权限') + } } getData() -const showModals =ref(false) -const header = {'token':store.user.token} +const showModals = ref(false) +const header = { 'token': store.user.token } // console.log(store.user.token) const dialogImageUrl = ref('') const dialogVisible = ref(false) const handleRemove: UploadProps['onRemove'] = (uploadFile: any, uploadFiles: any) => { -// console.log(dialogImageUrl,dialogVisible) + // console.log(dialogImageUrl,dialogVisible) } const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile: { url: string }) => { dialogImageUrl.value = uploadFile.url! dialogVisible.value = true -// console.log(dialogImageUrl.value) + // console.log(dialogImageUrl.value) } -const setUserList =ref() -const thisClick=()=>{ - showModal.value = true - setUserList.value = dataList.value - stores.article.reviewSource = formValue.value.reviewSource - console.log(stores.article.reviewSource) +const setUserList = ref() +const thisClick = () => { + showModal.value = true + setUserList.value = dataList.value + stores.article.reviewSource = formValue.value.reviewSource + console.log(stores.article.reviewSource) } const showModalRefs = ref(false) \ No newline at end of file +