Browse Source

提交项目处理

master
lihenian 6 years ago
parent
commit
81bbf03c59
  1. 2
      public/index.html
  2. 2
      src/views/main-sidebar.vue
  3. 54
      src/views/modules/events/item-close-detail-view.vue
  4. 11
      src/views/modules/events/item-close.vue
  5. 65
      src/views/modules/events/item-deal-detail-view.vue
  6. 5
      src/views/modules/events/item-end.vue

2
public/index.html

@ -33,7 +33,7 @@
<!-- 开发环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
<script>
window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
window.SITE_CONFIG['apiURL'] = 'http://10.10.10.118:9094/epdc-api'
</script>
<% } %>
<!-- 集成测试环境 -->

2
src/views/main-sidebar.vue

@ -101,7 +101,7 @@ export default {
},
connection () {
//
this.socket = new SockJS('http://219.146.91.110:9094/epdc-api/ws/menuNoticeEndpoint')// 广httpWebSocketws
this.socket = new SockJS('http://10.10.10.118:9094/epdc-api/ws/menuNoticeEndpoint')// 广httpWebSocketws
// STOMP
this.stompClient = Stomp.over(this.socket)

54
src/views/modules/events/item-close-detail-view.vue

@ -2,6 +2,7 @@
<div class="project-handle">
<el-form :model="dataForm" ref="dataForm" style="width: 100%; height: 100%;">
<div class="project-detail">
<div class="project-detail-tip">议题详情</div>
<el-form label-position="right" label-width="120px">
<el-form-item label="议题内容:">
<div>{{dataForm.itemContent}}</div>
@ -31,7 +32,7 @@
<span>反对 {{dataForm.opposeNum}}</span>
</el-form-item>
<el-form-item label="项目评论:">
<el-button type="primary" @click="innerVisible = true">查看评论</el-button>
<el-button type="text" @click="innerVisible = true">查看评论</el-button>
</el-form-item>
<el-form-item label="用户满意度评价:" v-if="dataForm.itemState === 10">
<div>{{dataForm.evaluationScore}}</div>
@ -47,26 +48,30 @@
<div class="location">上报位置: {{dataForm.issueAddress}}</div>
<div id="map"></div>
</div>
<div style="position: absolute; bottom: 0; right: 0;">
<el-button type="primary" size="small" @click="back">返回</el-button>
</div>
</div>
<div class="project-progress">
<div class="project-progress-tip">处理进展</div>
<el-timeline>
<el-timeline-item
v-for="(activity, index) in this.dataForm.handleProgressResultDTOS"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:color="index === 0 ? 'green' : activity.itemDeptDTOS.length > 0 ? 'red' : '#ccc'"
:size="activity.size">
<div style="line-height: 25px;">
<div v-if="activity.itemDeptDTOS.length > 0">{{activity.createdTime}} {{ '吹哨' }}</div>
<div v-else-if="activity.itemDeptDTOS.length <= 0 && activity.progressName !== '审核通过' && activity.progressName !== '已关闭' && activity.progressName !== '已结案'">{{activity.createdTime}} {{ '【回应】' }}</div>
<div v-else>{{activity.createdTime}} {{activity.progressName}}</div>
<div>处理部门 {{activity.handlerDept}}</div>
<div v-if="activity.itemDeptDTOS.length > 0">
吹哨部门<span v-for="(csDept, index1) in activity.itemDeptDTOS" :key="index1" :size="csDept.size">
{{ csDept.deptName }}
</span>
吹哨部门<span v-for="(csDept, index1) in activity.itemDeptDTOS" :key="index1" :size="csDept.size">{{ csDept.deptName }}</span>
</div>
<div>处理意见 {{activity.advice}}</div>
</div>
</el-timeline-item>
</el-timeline>
</div>
@ -129,8 +134,9 @@ export default {
this.init()
},
methods: {
backToItemDeal () {
this.$parent.selectComponent = 'ItemClose'
back () {
this.$parent.init()
// this.$router.push({ path: this.$route.path })
},
initBmap (latitude, longitude) {
this.map = new BMap.Map('map')
@ -213,18 +219,31 @@ export default {
<style lang="scss" scoped>
.project-handle {
width: 100%;
height: calc(100vh - 50px - 38px - 15px);
height: calc(100vh - 120px);
background: #ffffff;
box-sizing: border-box;
padding: 10px;
.project-detail {
width: 79%;
height: 60%;
height: 80%;
border: 2px solid #ccc;
box-sizing: border-box;
padding: 10px;
float:left;
margin-bottom: 1%;
position: relative;
padding-top: 20px;
.project-detail-tip {
position: absolute;
top: 0;
left:0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #4ac38b;
text-align:center;
}
.el-form {
width: 58%;
height: 100%;
@ -245,7 +264,7 @@ export default {
}
.container {
width: 40%;
height: 100%;
height: 80%;
float: right;
.location {
height: 30px;
@ -259,13 +278,26 @@ export default {
}
.project-progress {
width: 20%;
height: 100%;
height: 80%;
float: right;
border: 2px solid #ccc;
box-sizing: border-box;
margin-left: 1%;
padding-top: 20px;
overflow-y:auto;
position: relative;
padding-top: 40px;
.project-progress-tip {
position: absolute;
top: 0;
left:0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #0098ff;
text-align:center;
}
&::-webkit-scrollbar {
width: 5px;
height: 1px;

11
src/views/modules/events/item-close.vue

@ -5,17 +5,22 @@
</template>
<script>
import ItemClose from './item-close-list'
import ItemCloseList from './item-close-list'
import ItemCloseDetailView from './item-close-detail-view'
export default {
data () {
return {
selectComponent: ItemClose
selectComponent: ItemCloseList
}
},
components: {
ItemClose,
ItemCloseList,
ItemCloseDetailView
},
methods: {
init () {
this.selectComponent = ItemCloseList
}
}
}
</script>

65
src/views/modules/events/item-deal-detail-view.vue

@ -2,6 +2,7 @@
<div class="project-handle">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" style="width: 100%; height: 100%;">
<div class="project-detail">
<div class="project-detail-tip">议题详情</div>
<el-form label-position="right" label-width="120px">
<el-form-item label="议题内容:" prop="eventContent">
<div>{{dataForm.itemContent}}</div>
@ -31,7 +32,7 @@
<span>反对 {{dataForm.opposeNum}}</span>
</el-form-item>
<el-form-item label="项目评论:">
<el-button type="primary" @click="innerVisible = true">查看评论</el-button>
<el-button type="text" @click="innerVisible = true">查看评论</el-button>
</el-form-item>
</el-form>
<div class="container">
@ -40,14 +41,16 @@
</div>
</div>
<div class="project-progress">
<div class="project-progress-tip">处理进展</div>
<el-timeline>
<el-timeline-item
v-for="(activity, index) in this.dataForm.handleProgressResultDTOS"
v-for="(activity, index) in dataForm.handleProgressResultDTOS"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:color="index === 0 ? 'green' : activity.itemDeptDTOS.length > 0 ? 'red' : '#ccc'"
:size="activity.size">
<div style="line-height: 25px;">
<div v-if="activity.itemDeptDTOS.length > 0">{{activity.createdTime}} {{ '吹哨' }}</div>
<div v-else-if="activity.itemDeptDTOS.length <= 0 && activity.progressName !== '审核通过'">{{activity.createdTime}} {{ '【回应】' }}</div>
<div v-else>{{activity.createdTime}} {{activity.progressName}}</div>
@ -58,10 +61,12 @@
</span>
</div>
<div>处理意见 {{activity.advice}}</div>
</div>
</el-timeline-item>
</el-timeline>
</div>
<div class="handle-operation">
<div class="handle-operation-tip">处理操作</div>
<el-form label-width="120px" label-position="right" style="width: 720px;" :rules="dataRule">
<el-form-item label="处理:" prop="handleCategory">
<el-select v-model="postDataForm.handleCategory" placeholder="请选择">
@ -389,7 +394,7 @@ export default {
<style lang="scss" scoped>
.project-handle {
width: 100%;
height: calc(100vh - 50px - 38px - 15px);
height: calc(100vh - 120px);
background: #ffffff;
box-sizing: border-box;
padding: 10px;
@ -399,8 +404,21 @@ export default {
border: 2px solid #ccc;
box-sizing: border-box;
padding: 10px;
padding-top: 20px;
float:left;
margin-bottom: 1%;
position:relative;
.project-detail-tip {
position: absolute;
top: 0;
left:0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #4ac38b;
text-align:center;
}
.el-form {
width: 58%;
height: 100%;
@ -440,8 +458,20 @@ export default {
border: 2px solid #ccc;
box-sizing: border-box;
margin-left: 1%;
padding-top: 20px;
padding-top: 40px;
overflow-y:auto;
position: relative;
.project-progress-tip {
position: absolute;
top: 0;
left:0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #0098ff;
text-align:center;
}
&::-webkit-scrollbar {
width: 5px;
height: 1px;
@ -463,6 +493,31 @@ export default {
box-sizing: border-box;
border: 2px solid #ccc;
float:left;
overflow-y: auto;
position: relative;
.handle-operation-tip {
position: absolute;
top: 0;
left:0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #ff7600;
text-align:center;
}
&::-webkit-scrollbar {
width: 5px;
height: 1px;
}
&::-webkit-scrollbar-thumb {
border-radius: 5px;
background: #aaa;
}
&::-webkit-scrollbar-track {
border-radius: 10px;
background: #ccc;
}
}
}
</style>

5
src/views/modules/events/item-end.vue

@ -16,6 +16,11 @@ export default {
components: {
ItemEndList,
ItemCloseDetailView
},
methods: {
init () {
this.selectComponent = ItemEndList
}
}
}
</script>

Loading…
Cancel
Save