|
@@ -122,16 +122,27 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<el-container>
|
|
<el-container>
|
|
- <el-main style="padding: 0; border-right: 1px solid red; border-radius: 0;">
|
|
|
|
|
|
+ <el-main style="padding: 0;">
|
|
<schedule-list :id="requirementId" :type-list="taskScheduleEvent" :required-list="taskScheduleList" class-name="white" :all="true" :no-move="false" />
|
|
<schedule-list :id="requirementId" :type-list="taskScheduleEvent" :required-list="taskScheduleList" class-name="white" :all="true" :no-move="false" />
|
|
</el-main>
|
|
</el-main>
|
|
- <el-aside style="width: 200px;">
|
|
|
|
- <div align="center">排期变更记录</div>
|
|
|
|
- <div v-for="(item, val) in SchedulingContent" :key="val" class="Scheduling" @click="clickScheduling(item)">
|
|
|
|
- <div>{{ item.modifyTime }}</div>
|
|
|
|
- <div>{{ item.operatorObject.name !== null ? item.operatorObject.name : '' }}{{ item.operation }}</div>
|
|
|
|
- <div>{{ item.remark }}</div>
|
|
|
|
- </div>
|
|
|
|
|
|
+ <el-aside>
|
|
|
|
+ <div align="center" class="Scheduling">排期变更记录</div>
|
|
|
|
+ <el-timeline style=" padding: 10px 0 0 10px;width: 270px;border-radius: 0;margin: 0 20px 20px 0;box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04)">
|
|
|
|
+ <el-timeline-item
|
|
|
|
+ v-for="(item, index) in SchedulingContent"
|
|
|
|
+ :key="index"
|
|
|
|
+ icon="el-icon-goods"
|
|
|
|
+ type="primary"
|
|
|
|
+ color="#409EFF"
|
|
|
|
+ size="large"
|
|
|
|
+ :timestamp="item.timestamp"
|
|
|
|
+ style="padding: 2px"
|
|
|
|
+ >
|
|
|
|
+ <div>{{ item.modifyTime }}</div>
|
|
|
|
+ <div>{{ item.operatorObject.name !== null ? item.operatorObject.name : '' }}{{ item.operation }}</div>
|
|
|
|
+ <div>{{ item.remark }}</div>
|
|
|
|
+ </el-timeline-item>
|
|
|
|
+ </el-timeline>
|
|
</el-aside>
|
|
</el-aside>
|
|
</el-container>
|
|
</el-container>
|
|
</section>
|
|
</section>
|
|
@@ -280,6 +291,24 @@ export default {
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ activities: [{
|
|
|
|
+ content: '支持使用图标',
|
|
|
|
+ timestamp: '2018-04-12 20:46',
|
|
|
|
+ size: 'large',
|
|
|
|
+ type: 'primary',
|
|
|
|
+ icon: 'el-icon-more'
|
|
|
|
+ }, {
|
|
|
|
+ content: '支持自定义颜色',
|
|
|
|
+ timestamp: '2018-04-03 20:46',
|
|
|
|
+ color: '#0bbd87'
|
|
|
|
+ }, {
|
|
|
|
+ content: '支持自定义尺寸',
|
|
|
|
+ timestamp: '2018-04-03 20:46',
|
|
|
|
+ size: 'large'
|
|
|
|
+ }, {
|
|
|
|
+ content: '默认样式的节点',
|
|
|
|
+ timestamp: '2018-04-03 20:46'
|
|
|
|
+ }],
|
|
activeName: '1', // 顶部tab切换
|
|
activeName: '1', // 顶部tab切换
|
|
userInformation: localStorage.getItem('username'),
|
|
userInformation: localStorage.getItem('username'),
|
|
userNames: localStorage.getItem('realname'),
|
|
userNames: localStorage.getItem('realname'),
|
|
@@ -501,7 +530,7 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.Scheduling {
|
|
.Scheduling {
|
|
- margin:0 20px;
|
|
|
|
|
|
+ margin:0px 30px 20px 0px;
|
|
cursor: pointer;
|
|
cursor: pointer;
|
|
}
|
|
}
|
|
.Scheduling:hover {
|
|
.Scheduling:hover {
|