Skip to content

G
gassafety
Commit e1d1679a authored by yaqizhang's avatar yaqizhang
Browse files
Options

详情布局优化

parent 370a644d
Hide whitespace changes
Inline Side-by-side
Showing with 198 additions and 202 deletions
gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue
View file @ e1d1679a
...@@ -2,23 +2,29 @@ ...@@ -2,23 +2,29 @@
<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 style="width: 5%;height: 45px;margin-left: 20px;" @click="$router.go(-1)"> <el-row>
<el-button <el-col :span="24" style="padding-left: 15px;">
size="medium" <div style="height: 45px;" @click="$router.go(-1)">
type="text" <el-button size="medium" 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-col>
</el-row>
<el-divider></el-divider>
<div style="width: 100%;height: 440px;"> <el-row style="width: 100%;">
<el-divider></el-divider> <el-col :span="24">
<div style="color: #31EAEA;width: 30%;height: 30px;"> <div style="color: #31EAEA;height: 25px;">
<ul><li>详细信息</li></ul> <ul><li>详细信息</li></ul>
</div> </div>
<div > </el-col>
<div style="float: left;width: 50%;"> </el-row>
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;width: 50%;margin-bottom: 25px;">
<el-row style="width: 100%;padding: 10px;padding-left: 40px;">
<el-col :span="12">
<el-col :span="12">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;margin-left: 25px;margin-bottom: 25px;">
<el-form-item label="计划名称:" prop="planName"> <el-form-item label="计划名称:" prop="planName">
<font>{{form.planName}}</font> <font>{{form.planName}}</font>
</el-form-item> </el-form-item>
...@@ -31,7 +37,9 @@ ...@@ -31,7 +37,9 @@
</div> </div>
</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: 40%;"> </el-col>
<el-col :span="12">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;">
<el-form-item label="计划执行时间:" prop="startTime"> <el-form-item label="计划执行时间:" prop="startTime">
<font>{{form.startTime}}至{{form.endTime}}</font> <font>{{form.startTime}}至{{form.endTime}}</font>
</el-form-item> </el-form-item>
...@@ -39,7 +47,8 @@ ...@@ -39,7 +47,8 @@
<font>{{form.planStatus}}</font> <font>{{form.planStatus}}</font>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col>
<el-col :span="24">
<el-table max-height="175px" :data="form.inspectionDataList" style="width: 89%; margin-left: 50px;"> <el-table max-height="175px" :data="form.inspectionDataList" style="width: 89%; margin-left: 50px;">
<el-table-column label="设备名称" align="center" prop="deviceName" /> <el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备编号" align="center" prop="deviceCode" /> <el-table-column label="设备编号" align="center" prop="deviceCode" />
...@@ -60,30 +69,49 @@ ...@@ -60,30 +69,49 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </el-col>
</el-col>
<div id="marbox" style="width: 700px;height: 400px;float: left;margin-top: -25px; border: 1px solid rgb(218, 213, 213);"> <el-col :span="12">
<div id="marbox" style="width: 100%;height: 400px;margin-top: -25px; 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> </el-col>
</div> </el-row>
<!-- 接单信息 --> <!-- 接单信息 -->
<div> <el-row>
<el-divider></el-divider> <el-divider></el-divider>
<div style="color: #31EAEA;width: 100%;height: 40px;"> <el-col :span="24">
<ul><li>接单信息</li></ul> <div style="color: #31EAEA;width: 100%;height: 40px;">
</div> <ul><li>接单信息</li></ul>
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="margin-left: 50px;height: 30px;width: 100%;"> </div>
<el-form-item label="下发人员:" prop="appointInspectorName" style="float: left;width: 15%;"> </el-col>
<font>{{form.appointInspectorName}}</font> <el-col :span="5" style="margin-left: 50px;">
</el-form-item> <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="下发时间:" prop="allotTime" style="float: left;width: 20%;"> <el-form-item label="下发人员:" prop="appointInspectorName">
<font>{{form.allotTime}}</font> <font>{{form.appointInspectorName}}</font>
</el-form-item> </el-form-item>
<el-form-item label="工单编号:" prop="orderId" style="float: left;"> </el-form>
</el-col>
<el-col :span="6">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="下发时间:" prop="allotTime">
<font>{{form.allotTime}}</font>
</el-form-item>
</el-form>
</el-col>
<el-col :span="6">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="工单编号:" prop="orderId">
<font>{{form.orderId}}</font> <font>{{form.orderId}}</font>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col>
</el-row>
<div>
</div> </div>
<el-divider></el-divider> <el-divider></el-divider>
</div> </div>
...@@ -198,11 +226,6 @@ export default { ...@@ -198,11 +226,6 @@ export default {
} }
}); });
}, },
// 筛选节点
// filterNode(value, data) {
// if (!value) return true;
// return data.label.indexOf(value) !== -1;
// },
// 节点单击事件 // 节点单击事件
handleNodeClick(data) { handleNodeClick(data) {
...@@ -229,28 +252,8 @@ export default { ...@@ -229,28 +252,8 @@ export default {
}; };
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.orderId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加工单基础信息";
},
/** 归档按钮操作 */ /** 归档按钮操作 */
handleFinish(res) { handleFinish(res) {
// this.reset(); // this.reset();
......
gassafety-web/src/views/workOrder/detail/index.vue
View file @ e1d1679a
...@@ -181,18 +181,7 @@ ...@@ -181,18 +181,7 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<!-- <div style="width: 600px;float: left;">
<div style=" width: 600px;">
<div style="float: left;margin-left: 50px; width: 250px;">
</div>
<div style="float: left;margin-left: 50px; width: 250px;">
</div>
</div>
</div>
-->
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>
......
gassafety-web/src/views/workOrder/feedbackdetail/index.vue
View file @ e1d1679a
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
<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> <el-row>
<div style="width: 5%;height: 45px;margin-left: 20px;" @click="$router.go(-1)"> <el-col :span="24" style="padding-left: 15px;">
<el-button <div style="height: 45px;" @click="$router.go(-1)">
size="medium" <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
type="text" </el-button>
style="font-size: 18px; color: rgb(7, 63, 112);float: left;" <div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" style="width: 25px;" alt=""></div>
>返回</el-button> </div>
<div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" style="width: 25px;" alt=""></div> </el-col>
</div> </el-row>
<el-steps :active="active" finish-status="success" simple prop="orderStatus" style="margin-top: 5px"> <el-steps :active="active" finish-status="success" simple prop="orderStatus" style="margin-top: 5px">
<el-step title="未接收" ></el-step> <el-step title="未接收" ></el-step>
<el-step title="已接收" ></el-step> <el-step title="已接收" ></el-step>
...@@ -18,88 +18,112 @@ ...@@ -18,88 +18,112 @@
<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 style="width: 100%;height: 265px;">
<el-divider></el-divider> <el-divider></el-divider>
<div style="color: #31EAEA;width: 30%;height: 30px;"> <el-row style="width: 100%;">
<ul><li>详细信息</li></ul> <el-col :span="24">
</div> <div style="color: #31EAEA;height: 25px;">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;"> <ul><li>详细信息</li></ul>
<el-form-item label="工单类型:" prop="orderType"> </div>
<font v-if="form.orderType == 1">巡检信息</font> </el-col>
<font v-if="form.orderType == 2">隐患信息</font> </el-row>
<font v-if="form.orderType == 3">报警信息</font> <el-row style="width: 100%;padding: 10px;padding-left: 40px;">
</el-form-item> <el-col :span="6">
<el-form-item label="工单编号:" prop="orderId"> <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;">
<font>{{form.orderId}}</font> <el-form-item label="工单类型:" prop="orderType">
</el-form-item> <font v-if="form.orderType == 1">巡检信息</font>
<el-form-item label="工单名称:" prop="orderName"> <font v-if="form.orderType == 2">隐患信息</font>
<font>{{form.orderName}}</font> <font v-if="form.orderType == 3">报警信息</font>
</el-form-item> </el-form-item>
<el-form-item label="工单状态:" prop="orderStatus"> <el-form-item label="工单编号:" prop="orderId">
<font v-if="form.orderStatus == 0">未接收</font> <font>{{form.orderId}}</font>
<font v-if="form.orderStatus == 1">已接收</font> </el-form-item>
<font v-if="form.orderStatus == 2">已反馈</font> <el-form-item label="工单名称:" prop="orderName">
<font v-if="form.orderStatus == 3">已归档</font> <font>{{form.orderName}}</font>
</el-form-item> </el-form-item>
<el-form-item label="指定执行人员:" prop="appointInspectorName"> <el-form-item label="工单状态:" prop="orderStatus">
<font>{{form.appointInspectorName}}</font> <font v-if="form.orderStatus == 0">未接收</font>
</el-form-item> <font v-if="form.orderStatus == 1">已接收</font>
<el-form-item label="工单描述:" prop="remarks"> <font v-if="form.orderStatus == 2">已反馈</font>
<font>{{form.remarks}}</font> <font v-if="form.orderStatus == 3">已归档</font>
</el-form-item> </el-form-item>
</el-form> <el-form-item label="指定执行人员:" prop="appointInspectorName">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;width: 25%;"> <font>{{form.appointInspectorName}}</font>
<el-form-item label="设备类型:" prop="deviceType" v-if="form.orderType != 1"> </el-form-item>
<font v-if="form.deviceType == 0">管道</font> <el-form-item label="工单描述:" prop="remarks">
<font v-if="form.deviceType == 1">调压阀</font> <font>{{form.remarks}}</font>
<font v-if="form.deviceType == 2">阀门井</font> </el-form-item>
<font v-if="form.deviceType == 3">流量计</font> </el-form>
<font v-if="form.deviceType == 4">压力表</font> </el-col>
</el-form-item> <el-col :span="6">
<el-form-item label="设备名称:" prop="deviceName"> <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;">
<font v-if="form.orderType != 1">{{form.deviceName}}</font> <el-form-item label="设备类型:" prop="deviceType" v-if="form.orderType != 1">
<el-tree <font v-if="form.deviceType == 0">管道</font>
:data="deviceOptions" <font v-if="form.deviceType == 1">调压阀</font>
:props="defaultProps" <font v-if="form.deviceType == 2">阀门井</font>
:expand-on-click-node="false" <font v-if="form.deviceType == 3">流量计</font>
ref="tree" <font v-if="form.deviceType == 4">压力表</font>
@node-click="handleNodeClick" </el-form-item>
v-if="form.orderType == 1" <el-form-item label="设备名称:" prop="deviceName">
/> <font v-if="form.orderType != 1">{{form.deviceName}}</font>
</el-form-item> <el-tree
<el-form-item label="设备位置:" v-if="form.orderType != 1"> :data="deviceOptions"
<font>{{form.address}}</font> :props="defaultProps"
</el-form-item> :expand-on-click-node="false"
<el-form-item label="工单进度:" v-if="form.orderType == 1"> ref="tree"
<font>{{form.finishNum}}/{{form.deviceNum}}</font> @node-click="handleNodeClick"
</el-form-item> v-if="form.orderType == 1"
<el-form-item label="下发时间:" prop="allotTime"> />
<font>{{form.allotTime}}</font> </el-form-item>
</el-form-item> <el-form-item label="设备位置:" v-if="form.orderType != 1">
<!-- <el-form-item label="接收时间:" prop="actualTime"> <font>{{form.address}}</font>
<font>{{form.actualTime}}</font> </el-form-item>
</el-form-item> --> <el-form-item label="工单进度:" v-if="form.orderType == 1">
</el-form> <font>{{form.finishNum}}/{{form.deviceNum}}</font>
<div id="marbox" style="width: 700px;height: 250px;float: left;margin-top: -35px; border: 1px solid rgb(218, 213, 213);"> </el-form-item>
<div style="width: 100%;height: 100%" id="container"></div> <el-form-item label="下发时间:" prop="allotTime">
</div> <font>{{form.allotTime}}</font>
</div> </el-form-item>
</el-form>
</el-col>
<el-col :span="12">
<div id="marbox" style="width: 100%;height: 250px;margin-top: -35px; border: 1px solid rgb(218, 213, 213);">
<div style="width: 100%;height: 100%" id="container"></div>
</div>
</el-col>
</el-row>
<!-- <div style="width: 100%;height: 265px;">
</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;"> <el-row>
<ul><li>接单信息</li></ul> <el-col :span="24">
</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: 20%;"> </div>
<font>{{form.actualInspectorName}}</font> </el-col>
</el-form-item> </el-row>
<el-form-item label="接单时间:" prop="actualTime" style="float: left;"> <el-row>
<font>{{form.actualTime}}</font> <el-col :span="6">
</el-form-item> <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
</el-form> <el-form-item label="接单人:" prop="actualInspectorName">
<font>{{form.actualInspectorName}}</font>
</el-form-item>
</el-form>
</el-col>
<el-col :span="6">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="接单时间:" prop="actualTime">
<font>{{form.actualTime}}</font>
</el-form-item>
</el-form>
</el-col>
</el-row>
</div> </div>
<el-divider></el-divider> <el-divider></el-divider>
<!-- 反馈信息 --> <!-- 反馈信息 -->
...@@ -111,9 +135,8 @@ ...@@ -111,9 +135,8 @@
<el-timeline ref="timeline"> <el-timeline ref="timeline">
<el-timeline-item v-for="(activity, index) in form.feedbackList" v-show='index>1?false:true' :key="index" :timestamp="activity.feedbackTime"> <el-timeline-item v-for="(activity, index) in form.feedbackList" v-show='index>1?false:true' :key="index" :timestamp="activity.feedbackTime">
<el-card> <el-card>
<div style="width: 600px;float: left;"> <el-row>
<div style=" width: 600px;"> <el-col :span="6">
<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>
...@@ -136,53 +159,42 @@ ...@@ -136,53 +159,42 @@
<span>{{activity.contents}}</span> <span>{{activity.contents}}</span>
</p> </p>
</div> </div>
</div> </el-col>
<div style="float: left;margin-left: 50px; width: 250px;"> <el-col :span="6">
<p>设备名称：{{activity.deviceName}}</p> <p>设备名称：{{activity.deviceName}}</p>
<p>反馈时间：{{activity.feedbackTime}}</p> <p>反馈时间：{{activity.feedbackTime}}</p>
</el-col>
</div> <el-col :span="12">
</div> <div class="feedbackTime-div">
</div> <div class="feedbackTime">
<div class="feedbackTime-div"> <el-image :src="activity.pictureUrl1" :preview-src-list="[activity.pictureUrl1]" v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 90px;"></el-image>
<div class="feedbackTime"> </div>
<el-image :src="activity.pictureUrl1" :preview-src-list="[activity.pictureUrl1]" v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 90px;"></el-image> <div class="feedbackTime">
</div> <el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]" v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 90px;"></el-image>
<div class="feedbackTime"> </div>
<el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]" v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 90px;"></el-image> <div class="feedbackTime">
</div> <el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]" v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 90px;"></el-image>
<div class="feedbackTime"> </div>
<el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]" v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 90px;"></el-image> </div>
</div> </el-col>
</div> </el-row>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>
</div> </div>
<div style="width: 95%;position: relative;" @click="changeDisplay(scope)"> <div style="width: 95%;position: relative;" @click="changeDisplay(scope)">
<!-- <el-button type="primary"> -->
<i class="el-icon-arrow-down" v-if="isDisplay==false" style="margin-left: 100px;color: #909399;font-size: 14px;"> <i class="el-icon-arrow-down" v-if="isDisplay==false" style="margin-left: 100px;color: #909399;font-size: 14px;">
<span style="text-decoration:underline">显示全部</span> <span style="text-decoration:underline">显示全部</span>
</i> </i>
<i class="el-icon-arrow-up" v-else style="color: #909399;font-size: 14px;margin-left: 100px;"> <i class="el-icon-arrow-up" v-else style="color: #909399;font-size: 14px;margin-left: 100px;">
<span style="text-decoration:underline">收起</span> <span style="text-decoration:underline">收起</span>
</i> </i>
<!-- </el-button> -->
</div> </div>
</div> </div>
<!-- 归档 --> <!-- 归档 -->
<div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;"> <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;">
<!-- <el-button
type="primary"
size="normal"
icon="el-icon-edit"
@click="handleUpdate(form.orderId)"
v-hasPermi="['workOrder:basicsInfo:edit']"
v-if="form.orderStatus == 0"
>修改</el-button> -->
<el-button <el-button
type="primary" type="primary"
size="normal" size="normal"
...@@ -191,15 +203,6 @@ ...@@ -191,15 +203,6 @@
v-hasPermi="['workOrder:basicsInfo:editStatus']" v-hasPermi="['workOrder:basicsInfo:editStatus']"
v-if="form.orderStatus == 1 || form.orderStatus == 2" v-if="form.orderStatus == 1 || form.orderStatus == 2"
>反馈</el-button> >反馈</el-button>
<!-- <el-button
type="primary"
size="normal"
icon="el-icon-edit"
@click="handleFinish(form.orderId)"
v-hasPermi="['workOrder:basicsInfo:editStatus']"
v-if="form.orderStatus == 2"
>归档</el-button> -->
<!-- 工单反馈对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="cancel"> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="cancel">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="工单名称" prop="orderName"> <el-form-item label="工单名称" prop="orderName">
...@@ -257,6 +260,7 @@ ...@@ -257,6 +260,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
......
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