From 0e11714f01de9fe1756d6896f67bcd07ff50a148 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Wed, 10 Aug 2022 18:34:52 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/specialWorkSystem/workApplyManage/workApplyForm/index.vue | 45 +++++++++++++++++++++------------------------
1 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/index.vue b/src/views/specialWorkSystem/workApplyManage/workApplyForm/index.vue
similarity index 93%
rename from src/views/specialWorkSystem/workApplyManagement/workApplyForm/index.vue
rename to src/views/specialWorkSystem/workApplyManage/workApplyForm/index.vue
index 272e899..466fa00 100644
--- a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/index.vue
+++ b/src/views/specialWorkSystem/workApplyManage/workApplyForm/index.vue
@@ -1,11 +1,11 @@
<template>
<div class="home-container">
- <el-scrollbar height="100%">
+ <div style="height: 100%">
<el-form :model="form" label-width="150px" :rules="applyRules" ref="ruleFormRef2">
- <blind-panel-form :bpForm="form.addForm" ref="additionalForm"></blind-panel-form>
+<!-- <blind-panel-form :bpForm="form.addForm" ref="additionalForm"></blind-panel-form>-->
<!-- <cut-line-form :clForm="form.addForm" ref="additionalForm"></cut-line-form>-->
<!-- <dirt-work-form :dwForm="form.addForm" ref="additionalForm"></dirt-work-form>-->
-<!-- <fire-work-form :fwForm="form.addForm" ref="additionalForm"></fire-work-form>-->
+ <fire-work-form :fwForm="form.addForm" ref="additionalForm"></fire-work-form>
<!-- <hang-load-form :hlForm="form.addForm" ref="additionalForm"></hang-load-form>-->
<!-- <high-work-form :hwForm="form.addForm" ref="additionalForm"></high-work-form>-->
<!-- <limited-space-form :lsForm="form.addForm" ref="additionalForm"></limited-space-form>-->
@@ -85,7 +85,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="作业负责人" prop="responsor">
<el-input
v-model="form.responsor"
@@ -98,7 +98,7 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="监护人" prop="monitor">
<el-input
v-model="form.monitor"
@@ -111,7 +111,7 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="监护人岗位" prop="monitorStation">
<el-input
v-model="form.monitorStation"
@@ -217,14 +217,12 @@
</el-row>
</div>
</div>
- <div class="applyBtn">
- <el-row>
- <el-col :span="24" class="submitBtn">
- <el-button type="primary" size="large" plain @click="handleApply(ruleFormRef2)">发起申请</el-button>
- </el-col>
- </el-row>
- </div>
</el-form>
+ <div class="applyBtn">
+ <el-col :span="24" class="submitBtn">
+ <el-button type="primary" size="large" plain @click="handleApply(ruleFormRef2)">发起申请</el-button>
+ </el-col>
+ </div>
<el-dialog v-model="dialogAddWorker" title="添加作业人">
<el-form :model="addWorkerForm" label-width="120px" :rules="addWorkerRules" ref='ruleFormRef3'>
<el-form-item label="作业人" prop="worker">
@@ -341,7 +339,7 @@
</el-form-item>
</el-form>
</el-dialog>
- </el-scrollbar>
+ </div>
</div>
</template>
@@ -370,20 +368,20 @@
export default defineComponent({
name: 'workApplyForm',
components: {
- fireWorkForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/fireWorkForm.vue')),
- limitedSpaceForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/limitedSpaceForm.vue')),
- hangLoadForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/hangLoadForm.vue')),
- dirtWorkForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/dirtWorkForm.vue')),
- cutLineForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/cutLineForm.vue')),
- highWorkForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/highWorkForm.vue')),
- tempElectForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/tempElectForm.vue')),
- blindPanelForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/blindPanelForm.vue'))
+ fireWorkForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/fireWorkForm.vue')),
+ limitedSpaceForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/limitedSpaceForm.vue')),
+ hangLoadForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/hangLoadForm.vue')),
+ dirtWorkForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/dirtWorkForm.vue')),
+ cutLineForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/cutLineForm.vue')),
+ highWorkForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/highWorkForm.vue')),
+ tempElectForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/tempElectForm.vue')),
+ blindPanelForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/blindPanelForm.vue'))
},
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({
- homeOne:[{id:1,name:'基础数据权限管理系统'},{id:2,name:'双重预防系统'},{id:3,name:'系统2'},{id:4,name:'系统3'},{id:5,name:'系统4'}],
+ homeOne:[{id:1,name:'安全基础信息系统'},{id:2,name:'双重预防系统'},{id:3,name:'系统2'},{id:4,name:'系统3'},{id:5,name:'系统4'}],
});
const form = reactive({
addForm: {},
@@ -622,7 +620,6 @@
.home-container {
height: 100%;
overflow: hidden;
- padding: 20px;
position: relative;
.homeCard{
width: 100%;
--
Gitblit v1.9.2