diff --git a/public/css/largeScreenStyle.css b/public/css/largeScreenStyle.css index 005268c..521753e 100644 --- a/public/css/largeScreenStyle.css +++ b/public/css/largeScreenStyle.css @@ -3394,6 +3394,9 @@ table{ .quality-table .el-table td, .el-table th.is-leaf{ border: 0; } +.quality-table .el-table .el-table__body-wrapper tr:hover{ + background-color: #409eff52; +} .quality-table .el-table .el-table__row:nth-child(odd){ background: url("../images/long_tr_bgd.png") no-repeat center/100% 55px; } @@ -6286,65 +6289,18 @@ option { border-radius: 0px !important; } +.el-select .el-input__inner{ + background: transparent; + color: #fff; + border:solid 1px #409eff66; + line-height: 30px; + height: 30px; + border-radius: 4px !important; +} +.el-select .el-input__icon{ + line-height: 30px; +} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +.el-select:hover .el-input__inner, .el-select .el-input__inner:focus{ + border:solid 1px #409effaa; +} \ No newline at end of file diff --git a/public/index.html b/public/index.html index f9723c0..d0bd3ba 100644 --- a/public/index.html +++ b/public/index.html @@ -7,8 +7,8 @@ 产发工程数字管理平台-大屏 - - + + diff --git a/src/api/engin.js b/src/api/engin.js new file mode 100644 index 0000000..fa64ab7 --- /dev/null +++ b/src/api/engin.js @@ -0,0 +1,125 @@ +import request from '@/utils/request' +import dayjs from 'dayjs' +const magList=()=>{ + return request({ + url:`base/mag/list?pageSize=1000&pageNum=1`, + method:'get' + }) +} +const magGroupByTopic=()=>{ + return new Promise((resolve) => { + request({ + url: `base/magDetail/groupByTopic`, + method: 'get' + }).then(d=>{ + let total=0; + let tmps=(d.data||[]).map(it=>{ + total+=it.id||0; + return { + mag:it.title, + magOrd:it.ord, + magDate:+dayjs(it.createTime).$d, + topicId:it.topic, + topic:it.authorName, + cnt:it.id + }; + }); + let datas=[]; + tmps.forEach(it=>{ + let objs=datas.filter(item=>item.mag==it.mag); + let obj={}; + if(objs.length==0){ + obj={ + mag:it.mag, + ord:it.magOrd, + date:it.magDate, + list:[] + } + datas.push(obj); + }else{ + obj=objs[0]; + } + obj.list.push({id:it.topicId,topic:it.topic,cnt:it.cnt}) + }); + datas.sort((a,b)=>{ + if(a.ord==b.ord){ + return b.date-a.date; + } + return b.ord-a.ord; + }) + datas.forEach(item=>{ + item.list.sort((a,b)=>a.id-b.id); + }) + let titles=datas.length>0?datas[0].list.map(it=>it.topic):[]; + + resolve({ + titles:titles, + datas:datas, + total:total, + }) + }) + }); +} + +const groupByMag=(magId)=>{ + return new Promise((resolve) => { + request({ + url:'base/magDetail/groupByMag', + data:{ + magid:magId + }, + method: 'post', + }).then(d=>{ + let tmps=d.data||[]; + let max=0; + tmps.forEach(it=>{ + max=it.id>max?it.id:max; + }); + tmps.forEach(it=>{ + let t=(max-(it.id||0))*100.0/max+"%"; + it.ord=`width:calc((100% - ${t}) - 40px)`; + }); + resolve(tmps); + }) + }); +} +const committeeList=()=>{ + return request({ + url:`base/committee/list?pageSize=1000&pageNum=1`, + method:'get' + }) +} +const committeeSumGroupByType=(data)=>{ + return new Promise((resolve) => { + request({ + url:'project/projectCommittee/sumGroupByType', + data:data, + method: 'post', + }).then(d=>{ + let tmps=d.data||[]; + let sum=0; + tmps.forEach(it=>{ + sum+=it.id||0; + }) + resolve({ + total:sum, + data:tmps + }) + }) + }); +} +const selectByWorkingType=(data)=>{ + return request({ + url:'project/projectCommittee/selectByWorkingType', + method:"post", + data:data + }) +} +export default { + magGroupByTopic, + magList, + groupByMag, + committeeList, + committeeSumGroupByType, + selectByWorkingType +} \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js index b518ec5..18e85fb 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -22,6 +22,7 @@ import video from './video/index' import aiBoxVideo from './video/aiBoxVideo' import plan from './plan/index' import periodical from './periodical/index' +import engin from './engin' import {axios,download} from '@/utils/request' export default { project, @@ -49,5 +50,6 @@ export default { standard, flow, plan, - downFile:download + downFile:download, + engin } \ No newline at end of file diff --git a/src/pages/init.js b/src/pages/init.js index 4177035..8407d6f 100644 --- a/src/pages/init.js +++ b/src/pages/init.js @@ -4,7 +4,7 @@ import dayjs from 'dayjs' import './style/index.less' import dayfilter from '@/utils/dayfilter' import {tryToJson} from '../utils/tools' -import H265Player from '../components/h265-player/index' +//import H265Player from '../components/h265-player/index' import { Loading } from 'element-ui'; import BorderBox6 from './components/BorderBox6.vue' import BorderBox1 from './components/BorderBox1.vue' @@ -13,7 +13,7 @@ import projectOverviewChart from '../components/project-overview-chart.vue' import peopleNumber from '../components/people-number.vue' import header from '../components/header.vue' Loading.install(Vue); -H265Player.install(Vue); +//H265Player.install(Vue); dayfilter(Vue); const vue=new Vue(); Vue.component("screen-header",header) diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue index 3385d53..3c79c35 100644 --- a/src/pages/projectEngin.vue +++ b/src/pages/projectEngin.vue @@ -5,9 +5,46 @@ - +
+ +
+
+ + + + + + + + + + + + + +
+
+
+ {{ it.value }}条 +
+

{{ it.text }}

+
+
+ +
@@ -29,63 +66,121 @@ - - - + +
+ + + + + + + + +
- -
- - - - - - - - - - - - + + + + + +
+
+ +
暂无数据
+
+
排名申请项目申请数量申请占比
{{ it.no }}{{ it.name }}{{ it.value }}{{ it.percent }}%
+ + +
{{ it.title }} +
+
+ {{it.id }}篇
+
- - - - -
- -
暂无数据
-
- + + - - - - - - - + + + + + +
+ + 合计 + + +
+
+ +
+
+ + + +
+
+
+ {{numberWithCommas((it.id * 1.0 || 0).toFixed(2)) || '0.00' }} +
+

{{ it.costName}}(万元)

+
+
+ +
+ + +
+
+ + 付款明细 +
+
+
+
+
{{it.text }}
+ + +
+
+ + + + + + + + + + +
+
+
- - @@ -93,6 +188,7 @@