diff --git a/src/forge/Information/Pages/custom/index.less b/src/forge/Information/Pages/custom/index.less index edb8b3b62..0781b893a 100644 --- a/src/forge/Information/Pages/custom/index.less +++ b/src/forge/Information/Pages/custom/index.less @@ -1,7 +1,4 @@ -.customvipBox{ - font-family: 'alibaba PuHuiTi'; - background-image: url(../../img/custom/bc.png); - background-size: 100%; +.customPublic{ .project-cate-title { font-family: "DouyinSans"; font-weight: 700; @@ -9,6 +6,11 @@ text-align: center; padding:80px 0 20px; } +} +.customvipBox{ + font-family: 'alibaba PuHuiTi'; + background-image: url(../../img/custom/bc.png); + background-size: 100%; .statistics-cards{ width: 80%; margin: 25px auto; diff --git a/src/forge/Information/Pages/custom/newsIndex.jsx b/src/forge/Information/Pages/custom/newsIndex.jsx new file mode 100644 index 000000000..fd4022a37 --- /dev/null +++ b/src/forge/Information/Pages/custom/newsIndex.jsx @@ -0,0 +1,133 @@ +import React , { useState , useEffect } from 'react'; +import {getUniqueIdentifier,getUserName,getBrowserPlatform,getBrowserBrand} from '../../utils'; +import { Menu , Spin , Skeleton, Button, Dropdown } from 'antd'; +import { getNewsAllList , getNewsHotList , setZoneVisits } from '../../api'; +import { tempConfig, tempEnum } from '../../tempInfo'; +import { Link } from 'react-router-dom'; +import "../../index.scss"; +import "./index.less"; + + + +function NewsIndex(props){ + const { id, temp, role, history, sectionCmsTitle } = props; + const [ mainList , setMainList ] = useState(undefined); + const [ menuH , setMenuH ] = useState(true); + const [ hotList , setHotList ] = useState(undefined); + const [ isSpin , setIsSpin ] = useState(true); + const [ newCateId , setNewCateId ] = useState(undefined); + const { deptId = "NSCC" , cateId } = props.match.params; + + useEffect(()=>{ + let uuid = getUniqueIdentifier() + let url = props.location.pathname + let platform = getBrowserPlatform() + let browser = getBrowserBrand() + let username = getUserName(props.current_user) + let remark = ` 操作系统：${platform};浏览器：${browser};` + setZoneVisits({url,username,uuid,remark}) + },[]) + + const menu = ( + + + {history.push(`/zone/${deptId}/news/add?type=richEditor`)}}>富文本编辑器 + + + {history.push(`/zone/${deptId}/news/add?type=mdEditor`)}}>MD编辑器 + + + ); + + useEffect(()=>{ + if(id) { + setIsSpin(true); + if (temp === tempEnum.zone) { + getMainList(); + } else { + getCateList(); + } + getHotList(); + } + },[id]) + + function getMainList(){ + getNewsAllList(id).then(result=>{ + if(result){ + let rows = result.data.rows; + setMainList(rows); + if (temp !== tempEnum.zone) { + selectCate(rows[0].id) + } + setTimeout(() => { + let ele = document.getElementById("menus"); + if(ele){ + let h = ele.clientHeight; + setMenuH(h>56); + } + setIsSpin(false); + }, 100); + } + }).catch(error=>{}) + } + + function getCateList() { + const url = `${httpUrl}/cms/doc/open/zone/${id}/dirList`; + axios.get(url).then(result=>{ + if(result){ + let rows = result.data.rows; + setMainList(rows); + // 隐藏判断原因：首页查看全部跳转过来后要默认选择指定的cateID而不是第一个 + // if (temp !== tempEnum.zone) { + selectCate(cateId || (rows[0] && rows[0].id)) + // } + setIsSpin(false); + } + }).catch(error=>{}) + } + + function getHotList(){ + getNewsHotList(id,{ + pageSize:15,pageNum:1 + }).then(result=>{ + if(result){ + setHotList(result.data.rows); + } + }).catch(error=>{}) + } + const nsccTitle = (title, delay=0.1, classname)=>
+ {title && title.split("").map((char, index) => ( + + {char} + + ))} +
+ return( +
+
+
+ { nsccTitle(`${sectionCmsTitle}` +" " + " 动态全揽") } + {role && role.role !== "None" && +
+ {role.role === "Member" ? :""} + +
+ } +
+ { + mainList && mainList.length>0 && + + 全部 + {mainList.map((i,k)=>{ + return {i.name} + }) + } + + } +
+
+ ) +} +export default NewsIndex; \ No newline at end of file diff --git a/src/forge/Information/Pages/custom/vip.jsx b/src/forge/Information/Pages/custom/vip.jsx index e6dbcb04a..c08a10397 100644 --- a/src/forge/Information/Pages/custom/vip.jsx +++ b/src/forge/Information/Pages/custom/vip.jsx @@ -86,15 +86,15 @@ function CustomVip(props){ } setApplyVisible(!applyVisible) } - const nsccTitle = (title, delay=0.1, classname)=>
- {title && title.split("").map((char, index) => ( - - {char} - - ))} -
+ const nsccTitle = (title, delay=0.1, classname)=>
+ {title && title.split("").map((char, index) => ( + + {char} + + ))} +
return( -
+
setApplyVisible(!applyVisible)} current_user={props.current_user}/>
{ nsccTitle(sectionMemberTitle) } diff --git a/src/forge/Information/Pages/selfList.jsx b/src/forge/Information/Pages/selfList.jsx index cbef91fff..3c983be81 100644 --- a/src/forge/Information/Pages/selfList.jsx +++ b/src/forge/Information/Pages/selfList.jsx @@ -1,5 +1,5 @@ import React,{ useState, useEffect } from 'react'; -import { Breadcrumb , Spin , Pagination , Modal, Button } from 'antd'; +import { Breadcrumb , Spin , Pagination , Modal, Button , Tag } from 'antd'; import { Link } from 'react-router-dom'; import { getNewsMyList , getSourceMyList , getSourceManage , delNewsMyList , delNews , delSourceMyList , delManageSource , getProjectMyList , removeProject , getManageProjectMyList , deleteMemberProject } from '../api'; import moment from 'moment'; @@ -169,6 +169,16 @@ function SelfList(props){ }, }); } + + const auditTypeEnom = { + create: '发布', + update: '编辑', + delete: '删除' + } + + const statueName =(auditType)=>{ + return auditType ? {auditTypeEnom[auditType]} : '' + } return(
-
+
{ source==="projects"?{i.name} : {i.name} } + { + source === "news" && status === 0 && i.auditType && {statueName(i.auditType.split('-')[0])} + }
{i.remark && status===2 &&
驳回理由:{i.remark}
}
diff --git a/src/forge/Information/fetch.js b/src/forge/Information/fetch.js index 10cb70c40..ff2779fb5 100644 --- a/src/forge/Information/fetch.js +++ b/src/forge/Information/fetch.js @@ -15,7 +15,7 @@ function beforeFetch(actionUrl){ service.interceptors.request.use(request => { let deptId = sessionStorage.getItem('deptId'); - // request.headers.Authorization = '6a4b63adc957f362ee53b81388a7a63c6e2ac2ef' + // request.headers.Authorization = '2a0eeb5fb55166b080faba4fbc153d104630630e' if (deptId) { // 用于权限区分 request.headers['Dept-Id'] = deptId diff --git a/src/forge/Information/img/create.png b/src/forge/Information/img/create.png new file mode 100644 index 000000000..bed3957ec Binary files /dev/null and b/src/forge/Information/img/create.png differ diff --git a/src/forge/Information/img/delete.png b/src/forge/Information/img/delete.png new file mode 100644 index 000000000..455bcf7dc Binary files /dev/null and b/src/forge/Information/img/delete.png differ diff --git a/src/forge/Information/img/update.png b/src/forge/Information/img/update.png new file mode 100644 index 000000000..c31960873 Binary files /dev/null and b/src/forge/Information/img/update.png differ diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx index 05ae3b255..834c18978 100644 --- a/src/forge/Information/index.jsx +++ b/src/forge/Information/index.jsx @@ -101,6 +101,10 @@ const Main = Loadable({ loader: () => import("./Pages/main"), loading: Loading, }); +const CustomNews = Loadable({ + loader: () => import("./Pages/custom/newsIndex"), + loading: Loading, +}); const Help = Loadable({ loader: () => import("./Pages/help"), @@ -234,6 +238,12 @@ function Index(props){ )} > + {/* ( + + )} + > */} ( @@ -323,6 +333,12 @@ function Index(props){ )} > + {/* ( + + )} + > */} ( diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index 814be598d..000c53f7d 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -1,5 +1,24 @@ @import './theme.scss'; - +.auditTag{ + margin-left: 10px; + background-image: url(./img/create.png); + background-size: 100% 100%; + font-family: "DouyinSans"; + height: 21px; + line-height: 20px; + padding: 0px 8px; + background-size: 100% 100%; + color: #fff; + text-align: center; + display: block; + font-size: 12px; + &.update{ + background-image: url(./img/update.png); + } + &.delete{ + background-image: url(./img/delete.png); + } +} // 按钮 .zone_apply_button { flex-grow: 0;