Skip to content

9
912project
提交 68fcef04 authored 作者: CRS's avatar CRS
浏览文件
操作

合并分支 'crs' 到 'master'

new 查看合并请求 !43
上级 23f5f998 566f6cc8
隐藏空白字符变更
内嵌 并排
正在显示 包含 92 行增加 和 34 行删除
src/components/complaint/complaint/complaint.vue
浏览文件 @ 68fcef04
......@@ -122,7 +122,11 @@ export default {
this.totleLength = res.data.data.total;
for (let item of this.allData) {
item.time1 = this.time1(item.time);
item.replyTime1 = this.time1(item.replyTime);
if (item.replyTime === null) {
item.replyTime1 = '暂无回复'
} else {
item.replyTime1 = this.time1(item.replyTime)
}
item.type = item.type === 1 ? '服务质量' : item.type === 2 ? '服务态度' : item.type === 3 ? '响应速度' : '其他';
item.target = item.target === 1 ? '集成商' : item.target === 2 ? '监理商' : item.target === 3 ? '开发商' : item.target === 4 ? '硬件产品' : item.target === 5 ? '软件产品' : '其他';
}
......
src/components/complaint/complaintManagement/complaintManagement.vue
浏览文件 @ 68fcef04
......@@ -123,7 +123,11 @@ export default {
this.totleLength = res.data.data.total;
for (let item of this.allData) {
item.time1 = this.time1(item.time);
item.replyTime1 = this.time1(item.replyTime);
if (item.replyTime === null) {
item.replyTime1 = '暂无回复'
} else {
item.replyTime1 = this.time1(item.replyTime)
}
item.type = item.type === 1 ? '服务质量' : item.type === 2 ? '服务态度' : item.type === 3 ? '响应速度' : '其他';
item.target = item.target === 1 ? '集成商' : item.target === 2 ? '监理商' : item.target === 3 ? '开发商' : item.target === 4 ? '硬件产品' : item.target === 5 ? '软件产品' : '其他';
}
......
src/components/header/header.vue
浏览文件 @ 68fcef04
......@@ -5,13 +5,13 @@
<p style="text-align: center;font-size: 28px;font-weight: bold;color: #fff;line-height: 98px;">XXX</p>
</span>
<span class="center">
<span class="title">XX工作台</span>
<span class="title" @click="jump('firstHome')" style="cursor: pointer;">XX工作台</span>
<span class="time">当前时间：&nbsp;&nbsp;{{this.time}}</span>
</span>
<span class="right">
<span class="tohome" @click="jump('firstHome')">
<span class="tohome">
<img src="./img/toHome.png">
<span class="font">首页</span>
<span class="font">综合展现</span>
</span>
<span class="user" v-if="this.$store.getters.getUserData.name !== undefined">
<span class="admin">
......
src/components/projectManagement/projectInformation/projectInformation.vue
浏览文件 @ 68fcef04
......@@ -66,32 +66,19 @@
<span>需求调研阶段</span>
<span>开发阶段</span>
<span>试运行阶段</span>
<p class="trasLine">
<img src="./img/forecast.png">
<span>预计位置</span>
</p>
</div>
<p class="blueLine">
<img src="./img/nowbg.png">
<span>当前所处位置</span>
</p>
<div class="processAll">
<p class="process">
<span>新建</span>
<span>3030-02-01</span>
<span class="processList"></span>
<span></span>
</p>
<p class="process">
<span>需求确认</span>
<span>3030-02-01</span>
<span class="processList"></span>
<span></span>
</p>
<p class="process">
<span>初验</span>
<span>3030-02-01</span>
<span class="processList"></span>
<span></span>
</p>
<p class="process">
<span>终验</span>
<span>3030-02-01</span>
<p class="process" v-for="item of marker">
<span>{{item.name}}</span>
<span>{{item.time}}</span>
<span class="processList"></span>
<span></span>
</p>
......@@ -105,7 +92,7 @@
<div class="new">
<el-scrollbar style="height: 100%">
<p v-for="(item,index) of newList" v-show="newList !== ''" :key="index" class="newAll">
<span>{{index + 1}}、{{item.content}}</span>
<span>{{index + 1}}、{{item.content}}<i>{{item.message}}</i></span>
<span><img src="./img/time.png">{{item.time}}</span>
</p>
</el-scrollbar>
......@@ -132,20 +119,63 @@ export default {
develop: 'XXX公司', // 开发商
supervision: 'XX公司' // 监理方
},
newList: [
marker: [
{
name: '新建',
time: '2020-01-01'
},
{
name: '需求确认',
time: '2022-01-01'
},
{
name: '初验',
time: '2023-01-01'
},
{
name: '终验',
time: '2024-01-01'
}
],
newList: [ // 最新动态
{
content: 'test',
message: '成功',
time: '2020-02-02'
},
{
content: 'new test',
message: '成功',
time: '2020-03-02'
}
],
now: 40
now: 23, // 当前进度
forecase: 77 // 预计进度
}
},
created() {
},
mounted(){
if (this.now > 0) {
$('.processAll>p:nth-child(1) .processList').addClass('blue')
if (this.now >= 93) {
$('.blueLine').css('width', '')
} else {
$('.blueLine').css('width', this.now + '%');
$('.trasLine').css('left', this.forecase + '%')
}
if (this.now > 0 && this.now < 31) {
$('.processAll>p:nth-child(1) .processList').addClass('blue');
} else if (this.now >= 31 && this.now < 62) {
$('.processAll>p:nth-child(1) .processList').addClass('blue');
$('.processAll>p:nth-child(2) .processList').addClass('blue');
} else if (this.now >= 62 && this.now < 93) {
$('.processAll>p:nth-child(1) .processList').addClass('blue');
$('.processAll>p:nth-child(2) .processList').addClass('blue');
$('.processAll>p:nth-child(3) .processList').addClass('blue')
} else if (this.now >= 93) {
$('.processAll>p:nth-child(1) .processList').addClass('blue');
$('.processAll>p:nth-child(2) .processList').addClass('blue');
$('.processAll>p:nth-child(3) .processList').addClass('blue');
$('.processAll>p:nth-child(4) .processList').addClass('blue')
}
},
methods: {
......@@ -227,6 +257,11 @@ export default {
margin-right: 5px;
vertical-align: top;
}
.projectInformation .content .newAll i{
color: #4877e6;
display: inline-block;
margin-left: 10px;
}
.projectInformation>>>.el-scrollbar__wrap {
overflow-x: hidden;
}
......@@ -255,7 +290,7 @@ export default {
color: #666;
margin-bottom: 10px;
}
.projectInformation .process>span:nth-child(3){
.projectInformation .processList{
display: inline-block;
width: 30px;
height: 30px;
......@@ -291,9 +326,18 @@ export default {
position: relative;
top: -35px;
}
.projectInformation .milestone .line .trasLine{
position: absolute;
top: 11px;
}
.projectInformation .milestone .line .trasLine>span{
position: absolute;
left: 14px;
top: 18px;
font-size: 16px;
}
.projectInformation .milestone .blueLine{
height: 6px;
width: 20%;
margin: 0 45px 0 45px;
background-image: linear-gradient(to right, #005cff,#00ceff);
position: relative;
......@@ -306,7 +350,13 @@ export default {
right: -66px;
top: 10px;
}
.projectInformation .bule{
.projectInformation .milestone .blueLine>span{
position: absolute;
right: -50px;
top: 48px;
color: #fff;
}
.projectInformation .blue{
background: #4877e6;
}
</style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论