|
|
@@ -9,10 +9,15 @@
|
|
|
<div class="demo-drawer__content" style="padding: 0 20px">
|
|
|
<el-form :model="form" label-position="left">
|
|
|
<el-row :gutter="24">
|
|
|
+<<<<<<< Updated upstream
|
|
|
<el-col :span="24">
|
|
|
+=======
|
|
|
+ <el-col :span="24">
|
|
|
+>>>>>>> Stashed changes
|
|
|
<el-form-item label="作业内容">
|
|
|
- {{form.opContent}}
|
|
|
+ {{ form.opContent }}
|
|
|
</el-form-item>
|
|
|
+<<<<<<< Updated upstream
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row :gutter="24">
|
|
|
@@ -22,87 +27,98 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+=======
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24">
|
|
|
+ <el-col :span="24">
|
|
|
+ <el-form-item label="作业地址">
|
|
|
+ {{ form.opAddr }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+>>>>>>> Stashed changes
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="线路/变电站">
|
|
|
- {{form.subsOrLineNm}}
|
|
|
+ {{ form.subsOrLineNm }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="电压等级">
|
|
|
- {{form.voltLvlCd}}
|
|
|
+ {{ form.voltLvlCd }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="作业类型">
|
|
|
- {{form.opTypDsc}}
|
|
|
+ {{ form.opTypDsc }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="管理单位">
|
|
|
- {{form.mgmtOrgNm}}
|
|
|
+ {{ form.mgmtOrgNm }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row :gutter="30">
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="作业单位">
|
|
|
- {{form.submitOrgNm}}
|
|
|
+ {{ form.submitOrgNm }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="工作负责人">
|
|
|
- {{form.workPrincipNm}}
|
|
|
+ {{ form.workPrincipNm }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row :gutter="30">
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="作业班组">
|
|
|
- {{form.workTeamNm}}
|
|
|
+ {{ form.workTeamNm }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="作业风险">
|
|
|
- {{form.opRiskLvlDsc}}
|
|
|
+ {{ form.opRiskLvlDsc }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row :gutter="30">
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="作业人数">
|
|
|
- {{form.mainBusiOrgOpNum}}
|
|
|
+ {{ form.mainBusiOrgOpNum }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="作业开始时间">
|
|
|
- {{form.planStartWkTm}}
|
|
|
+ {{ form.planStartWkTm }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="作业结束时间">
|
|
|
- {{form.planEndTm}}
|
|
|
+ {{ form.planEndTm }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="专业类型">
|
|
|
- {{form.majorTypDsc}}
|
|
|
+ {{ form.majorTypDsc }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="24" v-if="type == 1">
|
|
|
<el-form-item label="取消原因">
|
|
|
- {{form.cancelReason}}
|
|
|
+ {{ form.cancelReason }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24" v-if="type == 2">
|
|
|
<el-form-item label="临时计划原因">
|
|
|
- {{form.planReason}}
|
|
|
+ {{ form.planReason }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
cfofpp