Skip to content

G
gassafety
Commit 30f5947b authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

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

parents 90a85e41 e9b87d05
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 59 deletions
gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue
View file @ 30f5947b
......@@ -33,11 +33,11 @@
</el-col>
</el-row>
<el-row style="width: 100%;padding: 10px;padding-left: 40px;">
<el-row style="width: 100%;padding: 10px;">
<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;">
style="width: 100%;margin-bottom: 25px;">
<el-form-item label="计划名称:" prop="planName">
<font>{{form.planName}}</font>
</el-form-item>
......@@ -63,7 +63,7 @@
</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: 30px;">
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备编号" align="center" prop="deviceCode" />
<el-table-column label="设备类型" align="center" prop="deviceType" />
......@@ -86,7 +86,7 @@
</el-col>
</el-col>
<el-col :span="12">
<div id="marbox" style="width: 100%;height: 400px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);">
<div id="marbox" style="width: 100%;height: 250px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);">
<div style="width: 100%;height: 100%" id="container"></div>
</div>
</el-col>
......@@ -103,30 +103,32 @@
</ul>
</div>
</el-col>
<el-col :span="5" style="margin-left: 50px;">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="下发人员:" prop="appointInspectorName">
<font>{{form.appointInspectorName}}</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="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> -->
<template slot-scope="scope">
<el-button type="text" @click="showDetail(form.orderId)">{{form.orderId}}</el-button>
</template>
</el-form-item>
</el-form>
</el-col>
<el-row style="width: 100%;padding: 10px;">
<el-col :span="5" style="">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="下发人员:" prop="appointInspectorName">
<font>{{form.appointInspectorName}}</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="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> -->
<template slot-scope="scope">
<el-button type="text" @click="showDetail(form.orderId)">{{form.orderId}}</el-button>
</template>
</el-form-item>
</el-form>
</el-col>
</el-row>
</el-row>
<div>
......
gassafety-web/src/views/riskManagement/hiddenTroubleDetail/index.vue
View file @ 30f5947b
......@@ -28,10 +28,10 @@
</el-col>
</el-row>
<el-row style="width: 100%;padding: 10px;padding-left: 40px;">
<el-row style="width: 100%;padding: 10px;">
<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 ref="form" v-model="form" label-width="100px" style="width: 100%;margin-bottom: 25px;">
<el-form-item label="隐患名称:" prop="troubleName">
<font>{{form.troubleName}}</font>
</el-form-item>
......@@ -44,15 +44,13 @@
<font v-if="form.troubleLevel == 2">Ⅱ级</font>
<font v-if="form.troubleLevel == 3">Ⅲ级</font>
</el-form-item>
<el-form-item label="隐患描述:" prop="remarks">
<div style="height: 90px;width: 200%; border: 1px solid rgb(187, 183, 183);margin-top: 10px;overflow-y: auto;padding: 5px;border-radius: 5px;">
<el-form-item label="隐患描述:" prop="remarks" style="width: 170%;">
<font>{{form.remarks}}</font>
</div>
</el-form-item>
</el-form>
</el-col>
<el-col :span="12">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;">
<el-form ref="form" v-model="form" label-width="100px" style="width: 100%;">
<el-form-item label="上报人:" prop="reportManName">
<font>{{form.reportManName}}</font>
</el-form-item>
......@@ -80,36 +78,38 @@
</el-row>
<!-- 接单信息 -->
<el-row v-if="form.orderId != null && form.orderId != ''">
<el-row v-if="form.orderId != null && form.orderId != ''" style="width: 100%;">
<el-divider></el-divider>
<el-col :span="24">
<div style="color: #31EAEA;width: 100%;height: 40px;">
<ul><li>接单信息</li></ul>
</div>
</el-col>
<el-col :span="5" style="margin-left: 50px;">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="下发人员:" prop="appointInspectorName">
<font>{{form.appointInspectorName}}</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="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">
<template slot-scope="scope">
<el-button type="text" @click="showDetail(form.orderId)">{{form.orderId}}</el-button>
</template>
</el-form-item>
</el-form>
</el-col>
<el-row style="width: 100%;padding-left: 10px;">
<el-col :span="5">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="下发人员:" prop="appointInspectorName">
<font>{{form.appointInspectorName}}</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="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">
<template slot-scope="scope">
<el-button type="text" @click="showDetail(form.orderId)">{{form.orderId}}</el-button>
</template>
</el-form-item>
</el-form>
</el-col>
</el-row>
</el-row>
<el-divider></el-divider>
<!-- 处置信息 -->
......@@ -117,7 +117,7 @@
<div style="color: #31EAEA;width: 100%;height: 40px;">
<ul><li>处置信息</li></ul>
</div>
<div class="block" style="width: 95%;margin-left: 2%;">
<div class="block" style="width: 95%;">
<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-card>
......
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