Skip to content

G
gassafety
Commit 9bdbfdcb authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

parents 52bc4206 7c019c38
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 42 deletions
gassafety-web/src/views/workOrder/basicsInfo/detail.vue
View file @ 9bdbfdcb
<template> <template>
<div class="app-container detail" style="background-color: rgb(238, 241, 245);"> <div class="app-container detail" style="background-color: rgb(238, 241, 245);">
<div style="background-color: rgb(252, 252, 252);padding-top: 10px;"> <!-- 工单信息 -->
<span style="color: #31EAEA;font-weight: 900;margin-left: 15px;">工单信息</span> <div style="padding-top: 10px;background: #fff;">
<el-steps :active="active" finish-status="success" simple prop="orderStatus" style="margin-top: 20px"> <div>
<el-step title="未接收" ></el-step> <span style="color: #31EAEA;font-weight: 900;margin-left: 15px;">工单信息</span>
<el-step title="已接收" ></el-step> <el-steps :active="active" finish-status="success" simple prop="orderStatus" style="margin-top: 20px">
<el-step title="进行中" ></el-step> <el-step title="未接收" ></el-step>
<el-step title="已反馈" ></el-step> <el-step title="已接收" ></el-step>
<el-step title="已归档" ></el-step> <el-step title="进行中" ></el-step>
</el-steps> <el-step title="已反馈" ></el-step>
<el-divider></el-divider> <el-step title="已归档" ></el-step>
<div style="width: 100%;height: 200px;margin-bottom: 40px;"> </el-steps>
</div>
<div style="width: 100%;height: 280px;">
<el-divider></el-divider>
<div style="color: #31EAEA;width: 100%;height: 40px;"> <div style="color: #31EAEA;width: 100%;height: 40px;">
<ul><li>详细信息</li></ul> <ul><li>详细信息</li></ul>
</div> </div>
...@@ -29,14 +34,21 @@ ...@@ -29,14 +34,21 @@
<el-form-item label="工单名称:" prop="orderName"> <el-form-item label="工单名称:" prop="orderName">
<font>{{form.orderName}}</font> <font>{{form.orderName}}</font>
</el-form-item> </el-form-item>
<el-form-item label="工单状态:" prop="orderStatus">
<font v-if="form.orderStatus == 0">未接收</font>
<font v-if="form.orderStatus == 1">已接收</font>
<font v-if="form.orderStatus == 2">进行中</font>
<font v-if="form.orderStatus == 3">已反馈</font>
<font v-if="form.orderStatus == 4">已归档</font>
</el-form-item>
<el-form-item label="指定执行人员:" prop="appointInspectorName"> <el-form-item label="指定执行人员:" prop="appointInspectorName">
<font>{{form.appointInspectorName}}</font> <font>{{form.appointInspectorName}}</font>
</el-form-item> </el-form-item>
<el-form-item label="工单描述:" prop="actualTime"> <el-form-item label="工单描述:" prop="remarks">
<font>{{form.actualTime}}</font> <font>{{form.remarks}}</font>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;"> <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;width: 25%;">
<el-form-item label="设备类型:" prop="deviceType" v-if="form.orderType != 1"> <el-form-item label="设备类型:" prop="deviceType" v-if="form.orderType != 1">
<font v-if="form.deviceType == 0">管道</font> <font v-if="form.deviceType == 0">管道</font>
<font v-if="form.deviceType == 1">调压阀</font> <font v-if="form.deviceType == 1">调压阀</font>
...@@ -48,11 +60,10 @@ ...@@ -48,11 +60,10 @@
<font>{{form.deviceCodes}}</font> <font>{{form.deviceCodes}}</font>
</el-form-item> </el-form-item>
<el-form-item label="设备位置:" v-if="form.orderType != 1"> <el-form-item label="设备位置:" v-if="form.orderType != 1">
<font v-if="form.deviceType == 0">{{form.coordinates}}</font> <font>{{form.address}}</font>
<font v-if="form.deviceType != 0">{{form.longitude}},{{form.longitude}}</font>
</el-form-item> </el-form-item>
<el-form-item label="工单进度:" v-if="form.orderType == 1"> <el-form-item label="工单进度:" v-if="form.orderType == 1">
<font>{{form.deviceNum}}/{{form.deviceNum}}</font> <font>{{form.finishNum}}/{{form.deviceNum}}</font>
</el-form-item> </el-form-item>
<el-form-item label="下发时间:" prop="allotTime"> <el-form-item label="下发时间:" prop="allotTime">
<font>{{form.allotTime}}</font> <font>{{form.allotTime}}</font>
...@@ -61,25 +72,29 @@ ...@@ -61,25 +72,29 @@
<font>{{form.actualTime}}</font> <font>{{form.actualTime}}</font>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div id="marbox" style="width: 700px;height: 180px;float: left;border: 1px solid rgb(218, 213, 213);"> <div id="marbox" style="width: 700px;height: 200px;float: left;border: 1px solid rgb(218, 213, 213);">
<div style="width: 100%;height: 100%" id="container"></div> <div style="width: 100%;height: 100%" id="container"></div>
</div> </div>
</div> </div>
<!-- 接单信息 -->
<el-divider></el-divider>
<div style="color: #31EAEA;width: 100%;height: 40px;"> <div v-if="form.actualInspectorName != null && form.actualTime != null">
<ul><li>接单信息</li></ul> <el-divider></el-divider>
</div> <div style="color: #31EAEA;width: 100%;height: 40px;">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="margin-left: 50px;height: 30px;width: 100%;"> <ul><li>接单信息</li></ul>
<el-form-item label="接单人:" prop="actualInspectorName" style="float: left;width: 250px;"> </div>
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="margin-left: 50px;height: 30px;width: 100%;">
<el-form-item label="接单人:" prop="actualInspectorName" style="float: left;width: 20%;">
<font>{{form.actualInspectorName}}</font> <font>{{form.actualInspectorName}}</font>
</el-form-item> </el-form-item>
<el-form-item label="接单时间:" prop="actualTime" style="float: left;"> <el-form-item label="接单时间:" prop="actualTime" style="float: left;">
<font>{{form.actualTime}}</font> <font>{{form.actualTime}}</font>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-divider></el-divider> </div>
<div style="width: 100%;font-weight: 600;height: 250px;"> <!-- 反馈信息 -->
<div style="width: 100%;font-weight: 600;height: 250px;" v-if="form.contents != null && form.feedbackTime != null && form.dealStatus != null">
<el-divider></el-divider>
<div style="color: #31EAEA;width: 100%;height: 40px;"> <div style="color: #31EAEA;width: 100%;height: 40px;">
<ul><li>反馈信息</li></ul> <ul><li>反馈信息</li></ul>
</div> </div>
...@@ -118,7 +133,7 @@ ...@@ -118,7 +133,7 @@
</span> </span>
</div> </div>
</el-upload> </el-upload>
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;width: 50%;"> <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;" >
<el-form-item label="反馈信息:" prop="contents"> <el-form-item label="反馈信息:" prop="contents">
<font>{{form.contents}}</font> <font>{{form.contents}}</font>
</el-form-item> </el-form-item>
...@@ -127,24 +142,24 @@ ...@@ -127,24 +142,24 @@
</el-form-item> </el-form-item>
<el-form-item label="是否解决:" prop="dealStatus"> <el-form-item label="是否解决:" prop="dealStatus">
<font v-if="form.dealStatus == 3">未解决</font> <font v-if="form.dealStatus == 3">未解决</font>
<font v-if="form.dealStatus != 3">已解决</font> <font v-if="form.dealStatus != 3 && form.dealStatus != null">已解决</font>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</div> </div>
<!-- 返回按钮 -->
<div style="width: 5%;height: 50px;margin-left: 20px;" @click="$router.go(-1)"> <div style="width: 5%;height: 50px;margin-left: 20px;" @click="$router.go(-1)">
<el-button <el-button
size="medium" size="medium"
type="text" type="text"
style="font-size: 18px; color: rgb(7, 63, 112);float: left;" style="font-size: 18px; color: rgb(7, 63, 112);float: left;"
>返回</el-button> >返回</el-button>
<div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" style="width: 25px;" alt=""></div> <div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" style="width: 25px;" alt=""></div>
</div>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
...@@ -224,10 +239,12 @@ export default { ...@@ -224,10 +239,12 @@ export default {
this.getBasicsInfo(); this.getBasicsInfo();
}, },
mounted(){ mounted(){
let map = new gaodeMap("平山"); let gaoMap = new gaodeMap("石家庄");
let data = {longitude:"114.208371",latitude:"38.267036"} // let data = {longitude:"114.208371",latitude:"38.267036"}
map.addMarker(DEVICE_TYPE,data) // map.addMarker(DEVICE_TYPE,data)
// map.addMarker(DEVICE_TYPE.WORKORDER,data) // map.addMarker(DEVICE_TYPE.WORKORDER,data)
this.gaoMap = gaoMap;
this.getBasicsInfo();
}, },
methods: { methods: {
handleRemove(file) { handleRemove(file) {
...@@ -253,6 +270,10 @@ export default { ...@@ -253,6 +270,10 @@ export default {
getBasicsInfo(this.orderId).then(response =>{ getBasicsInfo(this.orderId).then(response =>{
this.form = response.data; this.form = response.data;
this.active = parseInt(response.data.orderStatus) + 1; this.active = parseInt(response.data.orderStatus) + 1;
for(var i = 0; i < this.form.deviceInfoList.length; i++){
let obj = this.form.deviceInfoList[i];
this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
}
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment