Skip to content

G
gassafety
Commit e0bc00a6 authored by 纪泽龙's avatar 纪泽龙
Browse files
Options

优化上传图片预览

parent 7227c3b9
Show whitespace changes
Inline Side-by-side
Showing with 609 additions and 457 deletions
gassafety-web/src/assets/styles/gassafety.scss
View file @ e0bc00a6
...@@ -291,4 +291,6 @@ ...@@ -291,4 +291,6 @@
} }
} }
// background-color: ; // background-color: ;
} }
// 图片预览
gassafety-web/src/components/MyFileUpload/index.vue
View file @ e0bc00a6
...@@ -32,15 +32,24 @@ ...@@ -32,15 +32,24 @@
</template> </template>
的文件 的文件
</div> </div>
</el-upload> </el-upload>
<el-dialog <el-image v-show="false"
id="img"
ref="previewImg"
:src="dialogImageUrl"
:preview-src-list="bigImageArr"
:z-index="9999999"
></el-image>
<!-- <el-dialog
:center="true" :center="true"
width="50%" width="50%"
:modal="modal" :modal="modal"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
> >
<img :src="dialogImageUrl" alt="" /> <img :src="dialogImageUrl" alt="" />
</el-dialog> </el-dialog> -->
<!-- 文件列表 --> <!-- 文件列表 -->
<!-- <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul"> <!-- <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
<li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in list"> <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in list">
...@@ -123,6 +132,9 @@ export default { ...@@ -123,6 +132,9 @@ export default {
return []; return [];
} }
}, },
bigImageArr() {
return [this.dialogImageUrl]
},
}, },
methods: { methods: {
// 上传前校检格式和大小 // 上传前校检格式和大小
...@@ -197,7 +209,9 @@ export default { ...@@ -197,7 +209,9 @@ export default {
this.dialogImageUrl = file.response ? file.response.url : file.url; this.dialogImageUrl = file.response ? file.response.url : file.url;
// this.dialogImageUrl =if(this.fileArr) this.fileArr[0].url; // this.dialogImageUrl =if(this.fileArr) this.fileArr[0].url;
this.dialogVisible = true; // this.dialogVisible = true;
this.$refs.previewImg.showViewer = true;
console.log(file); console.log(file);
// console.log(file.response.url) // console.log(file.response.url)
}, },
......
gassafety-web/src/utils/gaodeMapView.js
View file @ e0bc00a6
...@@ -159,7 +159,10 @@ class gaodeMap { ...@@ -159,7 +159,10 @@ class gaodeMap {
offset: new AMap.Pixel(0, 5) offset: new AMap.Pixel(0, 5)
}); });
this.setMarkerIcon(marker); this.setMarkerIcon(marker);
if (DEVICE_TYPE.WORKORDER != markerType && DEVICE_TYPE.INSPECTOR != markerType) { if (
DEVICE_TYPE.WORKORDER != markerType &&
DEVICE_TYPE.INSPECTOR != markerType
) {
marker.content = this.getMarketContent(data); marker.content = this.getMarketContent(data);
marker.on("mouseover", infoOpen); marker.on("mouseover", infoOpen);
marker.on("mouseout", infoClose); marker.on("mouseout", infoClose);
...@@ -238,16 +241,29 @@ class gaodeMap { ...@@ -238,16 +241,29 @@ class gaodeMap {
} }
function infoOpen(e) { function infoOpen(e) {
// 如果有cloneDom就删了 // 删除克隆出来的线的clonedom
console.log(that.cloneDom);
// 删除克隆出来的clonedom
that.removeCloneDom();
let options = map.getStatus(); let options = map.getStatus();
options.scrollWheel = false; options.scrollWheel = false;
map.setStatus(options); map.setStatus(options);
infoWindow.setContent(e.target.content); infoWindow.setContent(e.target.content);
infoWindow.open(map, e.target.getPosition()); infoWindow.open(map, e.target.getPosition());
console.log(infoWindow.dom);
// 这个是为了盖住vue里的东西
e.target.cloneDom = infoWindow.dom.cloneNode(true);
// console.log(infoWindow.dom.offsetLeft);
// console.log(infoWindow.dom);
e.target.cloneDom.style.top = infoWindow.dom.offsetTop + 80 + "px";
e.target.cloneDom.style.left = infoWindow.dom.offsetLeft + 100 + "px";
// 先删除之前的，后增加现在的
// this.removeCloneDom();
that.removeCloneDom();
document.body.appendChild(e.target.cloneDom);
that.markerCloneDom = e.target.cloneDom;
infoWindow.close();
that.markerInfoWindow = infoWindow; that.markerInfoWindow = infoWindow;
} }
} }
...@@ -539,7 +555,9 @@ class gaodeMap { ...@@ -539,7 +555,9 @@ class gaodeMap {
removeCloneDom() { removeCloneDom() {
this.cloneDom && document.body.removeChild(this.cloneDom); this.cloneDom && document.body.removeChild(this.cloneDom);
this.markerCloneDom && document.body.removeChild(this.markerCloneDom);
this.cloneDom = null; this.cloneDom = null;
this.markerCloneDom=null;
} }
// 创建一条新的线 // 创建一条新的线
......
gassafety-web/src/views/enterprise/mapView/components/RightBototmData.vue
View file @ e0bc00a6
...@@ -10,14 +10,16 @@ ...@@ -10,14 +10,16 @@
</div> </div>
<div class="right"> <div class="right">
<template v-for="item in list" > <template v-for="item in list">
<div class="right-content" :key="item.type"> <div class="right-content" :key="item.type">
<div class="text-icon"> <div class="text-icon">
<i class="iconfont icon-gdcd"></i> <i class="iconfont" :class="iconClass(item)"></i>
</div> </div>
<div class="text"> <div class="text">
<div class="top">{{typeName[item.type]}}</div> <div class="top">{{ typeName[item.type] }}</div>
<div class="bottom">{{item.number}}{{item.type==99?"KM":"个" }}</div> <div class="bottom">
{{ item.number }}{{ item.type == 99 ? "KM" : "个" }}
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -32,21 +34,32 @@ export default { ...@@ -32,21 +34,32 @@ export default {
type: Array, type: Array,
}, },
}, },
data(){ data() {
return { return {
typeName:{ typeName: {
"1":"调压箱", 1: "调压箱",
"2":"阀门井", 2: "阀门井",
"3":"流量计", 3: "流量计",
"4":"压力表", 4: "压力表",
"99":"管道", 99: "管道",
}, },
// type iconList: {
} 1: "icon-tyx",
2: "icon-fmj",
3: "icon-llj",
4: "icon-ylb",
99: "icon-gdcd",
},
};
}, },
created() { created() {
console.log("list", this.list); console.log("list", this.list);
}, },
methods: {
iconClass(item) {
return this.iconList[item.type]
},
},
}; };
</script> </script>
......
gassafety-web/src/views/enterprise/mapView/index.vue
View file @ e0bc00a6
...@@ -375,7 +375,6 @@ export default { ...@@ -375,7 +375,6 @@ export default {
}); });
}, },
getInspectionDataByInspector(){ getInspectionDataByInspector(){
this.gaoMap.addMarker( this.gaoMap.addMarker(
DEVICE_TYPE.INSPECTOR, DEVICE_TYPE.INSPECTOR,
{longitude:114.525243,latitude:38.035002} {longitude:114.525243,latitude:38.035002}
......
gassafety-web/src/views/workOrder/basicsInfo/detail.vue
View file @ e0bc00a6
<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="padding-top: 10px;background: #fff;height: 100%;"> <div style="padding-top: 10px; background: #fff; height: 100%">
<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>
<el-steps :active="active" finish-status="success" simple prop="orderStatus" style="margin-top: 5px"> <el-steps
<el-step title="未接收" ></el-step> :active="active"
<el-step title="已接收" ></el-step> finish-status="success"
<!-- <el-step title="进行中" ></el-step>--> simple
<el-step title="已反馈" ></el-step> prop="orderStatus"
<el-step title="已归档" ></el-step> style="margin-top: 5px"
>
<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-steps>
</div> </div>
<div style="width: 100%;height: 280px;"> <div style="width: 100%; height: 280px">
<el-divider></el-divider> <el-divider></el-divider>
<div style="color: #31EAEA;width: 30%;height: 40px;"> <div style="color: #31eaea; width: 30%; height: 40px">
<ul><li>详细信息</li></ul> <ul>
<li>详细信息</li>
</ul>
</div> </div>
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;"> <el-form
ref="form"
v-model="form"
:rules="rules"
label-width="100px"
style="float: left; margin-left: 50px"
>
<el-form-item label="工单类型:" prop="orderType"> <el-form-item label="工单类型:" prop="orderType">
<font v-if="form.orderType == 1">巡检信息</font> <font v-if="form.orderType == 1">巡检信息</font>
<font v-if="form.orderType == 2">隐患信息</font> <font v-if="form.orderType == 2">隐患信息</font>
<font v-if="form.orderType == 3">报警信息</font> <font v-if="form.orderType == 3">报警信息</font>
</el-form-item> </el-form-item>
<el-form-item label="工单编号:" prop="orderId"> <el-form-item label="工单编号:" prop="orderId">
<font>{{form.orderId}}</font> <font>{{ form.orderId }}</font>
</el-form-item> </el-form-item>
<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"> <el-form-item label="工单状态:" prop="orderStatus">
<font v-if="form.orderStatus == 0">未接收</font> <font v-if="form.orderStatus == 0">未接收</font>
...@@ -44,14 +71,24 @@ ...@@ -44,14 +71,24 @@
<font v-if="form.orderStatus == 3">已归档</font> <font v-if="form.orderStatus == 3">已归档</font>
</el-form-item> </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="remarks"> <el-form-item label="工单描述:" prop="remarks">
<font>{{form.remarks}}</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;width: 25%;"> <el-form
<el-form-item label="设备类型:" prop="deviceType" v-if="form.orderType != 1"> 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"
>
<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>
<font v-if="form.deviceType == 2">阀门井</font> <font v-if="form.deviceType == 2">阀门井</font>
...@@ -59,7 +96,7 @@ ...@@ -59,7 +96,7 @@
<font v-if="form.deviceType == 4">压力表</font> <font v-if="form.deviceType == 4">压力表</font>
</el-form-item> </el-form-item>
<el-form-item label="设备名称:" prop="deviceName"> <el-form-item label="设备名称:" prop="deviceName">
<font v-if="form.orderType != 1">{{form.deviceName}}</font> <font v-if="form.orderType != 1">{{ form.deviceName }}</font>
<el-tree <el-tree
:data="deviceOptions" :data="deviceOptions"
:props="defaultProps" :props="defaultProps"
...@@ -70,74 +107,105 @@ ...@@ -70,74 +107,105 @@
/> />
</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.address}}</font> <font>{{ form.address }}</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.finishNum}}/{{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>
</el-form-item> </el-form-item>
<!-- <el-form-item label="接收时间:" prop="actualTime"> <!-- <el-form-item label="接收时间:" prop="actualTime">
<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: 250px;float: left;margin-top: -35px; border: 1px solid rgb(218, 213, 213);"> <div
<div style="width: 100%;height: 100%" id="container"></div> id="marbox"
style="
width: 700px;
height: 250px;
float: left;
margin-top: -35px;
border: 1px solid rgb(218, 213, 213);
"
>
<div style="width: 100%; height: 100%" id="container"></div>
</div> </div>
</div> </div>
<!-- 接单信息 --> <!-- 接单信息 -->
<div v-if="form.actualTime != '' && form.actualTime != null"> <div v-if="form.actualTime != '' && form.actualTime != null">
<el-divider></el-divider> <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>
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="margin-left: 50px;height: 30px;width: 100%;"> <el-form
<el-form-item label="接单人:" prop="actualInspectorName" style="float: left;width: 20%;"> ref="form"
<font>{{form.actualInspectorName}}</font> 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>
</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>
</div> </div>
<!-- 反馈信息 --> <!-- 反馈信息 -->
<!-- <div style="width: 100%;font-weight: 600;height: 200px;" v-if="form.dealStatus != '' && form.dealStatus != null"> --> <!-- <div style="width: 100%;font-weight: 600;height: 200px;" v-if="form.dealStatus != '' && form.dealStatus != null"> -->
<div style="width: 100%;font-weight: 600;"> <div style="width: 100%; font-weight: 600">
<el-divider></el-divider> <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>
<div class="block" style="width: 95%;margin-left: 2%;"> <div class="block" style="width: 95%; margin-left: 2%">
<el-timeline> <el-timeline>
<el-timeline-item v-for="(activity, index) in form.feedbackList" :key="index" :timestamp="activity.feedbackTime"> <el-timeline-item
v-for="(activity, index) in form.feedbackList"
:key="index"
:timestamp="activity.feedbackTime"
>
<el-card> <el-card>
<div style="width: 600px;float: left;"> <div style="width: 600px; float: left">
<div style=" width: 600px;"> <div style="width: 600px">
<div style="float: left;margin-left: 50px; width: 250px;"> <div style="float: left; margin-left: 50px; width: 250px">
<p>设备类型： <p>
设备类型：
<span v-if="activity.deviceType == 0">管道</span> <span v-if="activity.deviceType == 0">管道</span>
<span v-if="activity.deviceType == 1">调压箱</span> <span v-if="activity.deviceType == 1">调压箱</span>
<span v-if="activity.deviceType == 2">阀门井</span> <span v-if="activity.deviceType == 2">阀门井</span>
<span v-if="activity.deviceType == 3">流量计</span> <span v-if="activity.deviceType == 3">流量计</span>
<span v-if="activity.deviceType == 4">压力表</span> <span v-if="activity.deviceType == 4">压力表</span>
</p> </p>
<p>设备名称：{{activity.deviceName}}</p> <p>设备名称：{{ activity.deviceName }}</p>
<p>是否有隐患： <p>
是否有隐患：
<span v-if="activity.isHiddenDanger == 1">是</span> <span v-if="activity.isHiddenDanger == 1">是</span>
<span v-if="activity.isHiddenDanger == 2">否</span> <span v-if="activity.isHiddenDanger == 2">否</span>
</p> </p>
<div style="width: 600px;"> <div style="width: 600px">
<p>反馈信息： <p>
<span>{{activity.contents}}</span> 反馈信息：
<span>{{ activity.contents }}</span>
</p> </p>
</div> </div>
</div> </div>
<div style="float: left;margin-left: 50px; width: 250px;"> <div style="float: left; margin-left: 50px; width: 250px">
<p v-if="activity.dealStatus == 3">是否解决：未解决</p> <p v-if="activity.dealStatus == 3">是否解决：未解决</p>
<p v-if="activity.dealStatus != 3">是否解决：已解决</p> <p v-if="activity.dealStatus != 3">是否解决：已解决</p>
<p>反馈时间：{{activity.feedbackTime}}</p> <p>反馈时间：{{ activity.feedbackTime }}</p>
<p v-if="activity.isHiddenDanger == 1">处理状态： <p v-if="activity.isHiddenDanger == 1">
处理状态：
<span v-if="activity.dealStatus == 1">不需要处理</span> <span v-if="activity.dealStatus == 1">不需要处理</span>
<span v-if="activity.dealStatus == 2">已处理完成</span> <span v-if="activity.dealStatus == 2">已处理完成</span>
<span v-if="activity.dealStatus == 3">未处理完成</span> <span v-if="activity.dealStatus == 3">未处理完成</span>
...@@ -147,13 +215,37 @@ ...@@ -147,13 +215,37 @@
</div> </div>
<div class="feedbackTime-div"> <div class="feedbackTime-div">
<div class="feedbackTime"> <div class="feedbackTime">
<el-image :src="activity.pictureUrl1" :preview-src-list="[activity.pictureUrl1]" v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 90px;"></el-image> <el-image
:src="activity.pictureUrl1"
:preview-src-list="[activity.pictureUrl1]"
v-if="
activity.pictureUrl1 != null &&
activity.pictureUrl1 != ''
"
style="width: 90px"
></el-image>
</div> </div>
<div class="feedbackTime"> <div class="feedbackTime">
<el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]" v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 9s0px;"></el-image> <el-image
:src="activity.pictureUrl2"
:preview-src-list="[activity.pictureUrl2]"
v-if="
activity.pictureUrl2 != null &&
activity.pictureUrl2 != ''
"
style="width: 9s0px"
></el-image>
</div> </div>
<div class="feedbackTime"> <div class="feedbackTime">
<el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]" v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 90px;"></el-image> <el-image
:src="activity.pictureUrl3"
:preview-src-list="[activity.pictureUrl3]"
v-if="
activity.pictureUrl3 != null &&
activity.pictureUrl3 != ''
"
style="width: 90px"
></el-image>
</div> </div>
</div> </div>
</el-card> </el-card>
...@@ -161,31 +253,33 @@ ...@@ -161,31 +253,33 @@
</el-timeline> </el-timeline>
</div> </div>
</div> </div>
<!-- 返回按钮 --> <!-- 返回按钮 -->
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import {
import { listBasicsInfo, getBasicsInfo, delBasicsInfo, addBasicsInfo, updateBasicsInfo, exportBasicsInfo } from "@/api/workOrder/basicsInfo"; listBasicsInfo,
import { deviceTree } from "@/api/device/deviceInfo"; getBasicsInfo,
import gaodeMap from "utils/gaodeMap.js"; delBasicsInfo,
import {map, DEVICE_TYPE} from "utils/gaodeMap.js"; addBasicsInfo,
updateBasicsInfo,
exportBasicsInfo,
} from "@/api/workOrder/basicsInfo";
import { deviceTree } from "@/api/device/deviceInfo";
import gaodeMap from "utils/gaodeMap.js";
import { map, DEVICE_TYPE } from "utils/gaodeMap.js";
export default { export default {
name: "BasicsInfo", name: "BasicsInfo",
components: { components: {},
},
data() { data() {
return { return {
dialogImageUrl: '', dialogImageUrl: "",
dialogVisible: false, dialogVisible: false,
disabled: false, disabled: false,
imageUrl: '', imageUrl: "",
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 导出遮罩层 // 导出遮罩层
...@@ -209,19 +303,19 @@ export default { ...@@ -209,19 +303,19 @@ export default {
open: false, open: false,
// 工单状态字典 // 工单状态字典
typeOptions: [], typeOptions: [],
pickerOptions:[], pickerOptions: [],
// 工单类型字典 // 工单类型字典
ordertypeOptions: [], ordertypeOptions: [],
// 设备树选项 // 设备树选项
deviceOptions: [ deviceOptions: [
{ {
label: "设备列表", label: "设备列表",
childList: [] childList: [],
} },
], ],
defaultProps: { defaultProps: {
children: "childList", children: "childList",
label: "label" label: "label",
}, },
// 查询参数 // 查询参数
queryParams: { queryParams: {
...@@ -234,15 +328,14 @@ export default { ...@@ -234,15 +328,14 @@ export default {
allotTime: null, allotTime: null,
actualInspector: null, actualInspector: null,
actualTime: null, actualTime: null,
remarks: null remarks: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {},
}, active: 0,
active : 0, orderId: "",
orderId : ""
}; };
}, },
created() { created() {
...@@ -250,15 +343,15 @@ export default { ...@@ -250,15 +343,15 @@ export default {
// this.user_id = this.$route.query.id; //详细信息页接收参数 // this.user_id = this.$route.query.id; //详细信息页接收参数
this.orderId = this.$route.query.orderId; this.orderId = this.$route.query.orderId;
this.getList(); this.getList();
this.getDicts("t_order_status").then(response => { this.getDicts("t_order_status").then((response) => {
this.typeOptions = response.data; this.typeOptions = response.data;
}); });
this.getDicts("t_order_type").then(response => { this.getDicts("t_order_type").then((response) => {
this.ordertypeOptions = response.data; this.ordertypeOptions = response.data;
}); });
this.getBasicsInfo(); this.getBasicsInfo();
}, },
mounted(){ mounted() {
let gaoMap = new gaodeMap("石家庄"); let gaoMap = new gaodeMap("石家庄");
this.gaoMap = gaoMap; this.gaoMap = gaoMap;
this.getBasicsInfo(); this.getBasicsInfo();
...@@ -277,30 +370,33 @@ export default { ...@@ -277,30 +370,33 @@ export default {
/** 查询工单基础信息列表 */ /** 查询工单基础信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listBasicsInfo(this.queryParams).then(response => { listBasicsInfo(this.queryParams).then((response) => {
this.basicsInfoList = response.rows; this.basicsInfoList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },
getBasicsInfo (){ getBasicsInfo() {
getBasicsInfo(this.orderId).then(response =>{ getBasicsInfo(this.orderId).then((response) => {
this.form = response.data; this.form = response.data;
console.log(this.form.feedbackList,"00000000000") console.log(this.form.feedbackList, "00000000000");
this.active = parseInt(response.data.orderStatus) + 1; this.active = parseInt(response.data.orderStatus) + 1;
if(this.form.deviceInfoList.length>0){ if (this.form.deviceInfoList.length > 0) {
this.gaoMap.resetMapCenter([this.form.deviceInfoList[0].longitude,this.form.deviceInfoList[0].latitude]); this.gaoMap.resetMapCenter([
this.form.deviceInfoList[0].longitude,
this.form.deviceInfoList[0].latitude,
]);
} }
for(var i = 0; i < this.form.deviceInfoList.length; i++){ for (var i = 0; i < this.form.deviceInfoList.length; i++) {
let obj = this.form.deviceInfoList[i]; let obj = this.form.deviceInfoList[i];
this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj) this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj);
} }
if(this.form.orderType == '1') { if (this.form.orderType == "1") {
// 获取设备列表树 // 获取设备列表树
let data = this.form.deviceInfoList; let data = this.form.deviceInfoList;
console.log(data, "===="); console.log(data, "====");
deviceTree(data).then(response => { deviceTree(data).then((response) => {
this.deviceOptions[0].childList = response.data; this.deviceOptions[0].childList = response.data;
}); });
} }
...@@ -312,9 +408,7 @@ export default { ...@@ -312,9 +408,7 @@ export default {
// return data.label.indexOf(value) !== -1; // return data.label.indexOf(value) !== -1;
// }, // },
// 节点单击事件 // 节点单击事件
handleNodeClick(data) { handleNodeClick(data) {},
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
...@@ -332,7 +426,7 @@ export default { ...@@ -332,7 +426,7 @@ export default {
allotTime: null, allotTime: null,
actualInspector: null, actualInspector: null,
actualTime: null, actualTime: null,
remarks: null remarks: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -348,9 +442,9 @@ export default { ...@@ -348,9 +442,9 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.orderId) this.ids = selection.map((item) => item.orderId);
this.single = selection.length!==1 this.single = selection.length !== 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
...@@ -361,8 +455,8 @@ export default { ...@@ -361,8 +455,8 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const orderId = row.orderId || this.ids const orderId = row.orderId || this.ids;
getBasicsInfo(orderId).then(response => { getBasicsInfo(orderId).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改工单基础信息"; this.title = "修改工单基础信息";
...@@ -370,16 +464,16 @@ export default { ...@@ -370,16 +464,16 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.orderId != null) { if (this.form.orderId != null) {
updateBasicsInfo(this.form).then(response => { updateBasicsInfo(this.form).then((response) => {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addBasicsInfo(this.form).then(response => { addBasicsInfo(this.form).then((response) => {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
...@@ -391,40 +485,52 @@ export default { ...@@ -391,40 +485,52 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const orderIds = row.orderId || this.ids; const orderIds = row.orderId || this.ids;
this.$confirm('是否确认删除工单基础信息编号为"' + orderIds + '"的数据项?', "警告", { this.$confirm(
'是否确认删除工单基础信息编号为"' + orderIds + '"的数据项?',
"警告",
{
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}).then(function() { }
)
.then(function () {
return delBasicsInfo(orderIds); return delBasicsInfo(orderIds);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}).catch(() => {}); })
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有工单基础信息数据项?', "警告", { this.$confirm("是否确认导出所有工单基础信息数据项?", "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}).then(() => { })
.then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportBasicsInfo(queryParams); return exportBasicsInfo(queryParams);
}).then(response => { })
.then((response) => {
this.download(response.msg); this.download(response.msg);
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); })
} .catch(() => {});
} },
} },
</script> };
</script>
<style> <style>
.feedbackTime-div{ .feedbackTime-div {
float: left;margin-left: 150px;margin-top: 10px; float: left;
} margin-left: 150px;
.feedbackTime{ margin-top: 10px;
}
.feedbackTime {
height: 120px; height: 120px;
width: 120px; width: 120px;
float: left; float: left;
...@@ -434,48 +540,48 @@ export default { ...@@ -434,48 +540,48 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.el-card__body { .el-card__body {
padding: 5px 20px 20px 20px; padding: 5px 20px 20px 20px;
} }
.detail .el-form{ .detail .el-form {
width: 20%; width: 20%;
} }
.detail .el-form-item{ .detail .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
.el-tree{ .el-tree {
margin-top: 5px; margin-top: 5px;
} }
.avatar-uploader{ .avatar-uploader {
width: 25%; width: 25%;
float: left; float: left;
} }
.avatar-uploader .el-upload { .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9; border: 1px dashed #d9d9d9;
border-radius: 6px; border-radius: 6px;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.avatar-uploader .el-upload:hover { .avatar-uploader .el-upload:hover {
border-color: #409EFF; border-color: #409eff;
} }
.avatar-uploader-icon { .avatar-uploader-icon {
font-size: 28px; font-size: 28px;
color: #8c939d; color: #8c939d;
width: 178px; width: 178px;
height: 178px; height: 178px;
line-height: 178px; line-height: 178px;
text-align: center; text-align: center;
} }
.avatar { .avatar {
width: 178px; width: 178px;
height: 178px; height: 178px;
display: block; display: block;
} }
li{ li {
font-size: 15px; font-size: 15px;
font-weight: 900; font-weight: 900;
} }
</style> </style>
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