Skip to content

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

详情布局优化

parent 370a644d
Expand all 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>
......
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