From f0485bd74d1a986ebdf0f6b5ac4050e7d18ee320 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期六, 20 八月 2022 16:26:18 +0800
Subject: [PATCH] Default Changelist
---
src/views/specialWorkSystem/workTicket/workApply/index.vue | 22 +-
src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue | 10 -
src/views/specialWorkSystem/workTicket/myJobApply/components/fireLog.vue | 10 -
src/views/specialWorkSystem/workTicket/myJobApply/components/plateLog.vue | 10 -
src/views/specialWorkSystem/workTicket/workApply/components/broken.vue | 26 ---
src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue | 10 -
src/views/specialWorkSystem/workTicket/myJobApply/components/powerLog.vue | 10 -
src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue | 26 ---
src/views/specialWorkSystem/workTicket/workApply/components/plate.vue | 26 ---
src/views/specialWorkSystem/workTicket/workApply/components/space.vue | 26 ---
src/views/specialWorkSystem/workTicket/myJobApply/index.vue | 2
src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue | 10 -
src/views/specialWorkSystem/workTicket/workApply/components/power.vue | 26 ---
src/views/specialWorkSystem/workTicket/workApply/components/height.vue | 26 ---
src/views/specialWorkSystem/workTicket/workApply/components/fire.vue | 26 ---
src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue | 10 -
src/views/specialWorkSystem/workTicket/workApply/components/ground.vue | 26 ---
src/views/specialWorkSystem/workTicket/myJobApply/components/hoistLog.vue | 10 -
18 files changed, 68 insertions(+), 244 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue
index 08ab0df..ff78b92 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue
@@ -75,16 +75,12 @@
export default defineComponent({
name: 'space',
components: {},
- props:{
- details: Object
- },
- setup(props) {
+ props:['details'],
+ setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
- const details1 = props.details
return {
- Search,
- details1
+ Search
};
},
});
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/fireLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/fireLog.vue
index 6c45e0b..5bf55f2 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/fireLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/fireLog.vue
@@ -69,16 +69,12 @@
export default defineComponent({
name: 'fire',
components: {},
- props:{
- details: Object
- },
- setup(props) {
+ props:['details'],
+ setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
- const details1 = props.details
return {
- Search,
- details1
+ Search
};
},
});
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue
index 3819fda..f1aba23 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue
@@ -75,16 +75,12 @@
export default defineComponent({
name: 'space',
components: {},
- props:{
- details: Object
- },
- setup(props) {
+ props:['details'],
+ setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
- const details1 = props.details
return {
- Search,
- details1
+ Search
};
},
});
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue
index 581bfac..04d38f9 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue
@@ -72,16 +72,12 @@
export default defineComponent({
name: 'space',
components: {},
- props:{
- details: Object
- },
- setup(props) {
+ props:['details'],
+ setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
- const details1 = props.details
return {
- Search,
- details1
+ Search
};
},
});
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/hoistLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/hoistLog.vue
index a0836c4..0e4e53b 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/hoistLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/hoistLog.vue
@@ -72,16 +72,12 @@
export default defineComponent({
name: 'space',
components: {},
- props:{
- details: Object
- },
- setup(props) {
+ props:['details'],
+ setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
- const details1 = props.details
return {
- Search,
- details1
+ Search
};
},
});
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/plateLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/plateLog.vue
index 293abd0..7aac31b 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/plateLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/plateLog.vue
@@ -93,16 +93,12 @@
export default defineComponent({
name: 'space',
components: {},
- props:{
- details: Object
- },
- setup(props) {
+ props:['details'],
+ setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
- const details1 = props.details
return {
- Search,
- details1
+ Search
};
},
});
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/powerLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/powerLog.vue
index f26f432..7c3b754 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/powerLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/powerLog.vue
@@ -75,16 +75,12 @@
export default defineComponent({
name: 'space',
components: {},
- props:{
- details: Object
- },
- setup(props) {
+ props:['details'],
+ setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
- const details1 = props.details
return {
- Search,
- details1
+ Search
};
},
});
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
index e104833..c2f512b 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
@@ -75,16 +75,12 @@
export default defineComponent({
name: 'space',
components: {},
- props:{
- details: Object
- },
- setup(props) {
+ props:['details'],
+ setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
- const details1 = props.details
return {
- Search,
- details1
+ Search
};
},
});
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
index c1cb634..1a502f1 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
@@ -64,7 +64,7 @@
<broken v-if="dialogType == 5" :details = details></broken>
<height v-if="dialogType == 6" :details = details></height>
<power v-if="dialogType == 7" :details = details></power>
- <plate v-if="dialogType == 8" :details = details></plate>
+ <plate v-else :details = details></plate>
<template #footer>
<span class="dialog-footer">
<el-button type="primary" @click="dialogDetails = false"
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue b/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
index b5b8437..54cbca4 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
@@ -9,9 +9,9 @@
<el-select v-model="form.operatorUids" multiple>
<el-option
v-for="item in workerList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ :key="item.uid"
+ :label="item.username"
+ :value="item.uid"
/>
</el-select>
</el-form-item>
@@ -122,13 +122,13 @@
interface stateType {
form: Object,
- workerList: Array<any>,
csDepList: Array<any>,
otherWorkList: Array<any>
}
export default defineComponent({
name: 'brokenForm',
components: {},
+ props:['workerList'],
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -150,24 +150,6 @@
expStartTime: '',
expEndTime: ''
},
- workerList:[
- {
- label: "张三",
- value: 53
- },
- {
- label: "李四",
- value: 54
- },
- {
- label: "测试一",
- value: 55
- },
- {
- label: "测试二",
- value: 56
- }
- ],
csDepList: [
{
label: "单位一",
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue b/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
index 6dde930..9732afb 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
@@ -9,9 +9,9 @@
<el-select v-model="form.operatorUids" multiple>
<el-option
v-for="item in workerList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ :key="item.uid"
+ :label="item.username"
+ :value="item.uid"
/>
</el-select>
</el-form-item>
@@ -113,7 +113,6 @@
interface stateType {
form: Object,
- workerList: Array<any>,
workTypeList: Array<any>,
workLevelList: Array<any>,
otherWorkList: Array<any>
@@ -121,6 +120,7 @@
export default defineComponent({
name: 'fireForm',
components: {},
+ props:['workerList'],
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -139,24 +139,6 @@
expStartTime: '',
expEndTime: ''
},
- workerList:[
- {
- label: "张三",
- value: 53
- },
- {
- label: "李四",
- value: 54
- },
- {
- label: "测试一",
- value: 55
- },
- {
- label: "测试二",
- value: 56
- }
- ],
workTypeList: [
{
label: "类型一",
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue b/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
index c047db6..9871118 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
@@ -9,9 +9,9 @@
<el-select v-model="form.operatorUids" multiple>
<el-option
v-for="item in workerList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ :key="item.uid"
+ :label="item.username"
+ :value="item.uid"
/>
</el-select>
</el-form-item>
@@ -120,13 +120,13 @@
interface stateType {
form: Object,
- workerList: Array<any>,
csDepList: Array<any>,
otherWorkList: Array<any>
}
export default defineComponent({
name: 'groundForm',
components: {},
+ props:['workerList'],
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -148,24 +148,6 @@
expStartTime: '',
expEndTime: ''
},
- workerList:[
- {
- label: "张三",
- value: 53
- },
- {
- label: "李四",
- value: 54
- },
- {
- label: "测试一",
- value: 55
- },
- {
- label: "测试二",
- value: 56
- }
- ],
csDepList: [
{
label: "单位一",
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue b/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
index be8d619..d0dc61f 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
@@ -9,9 +9,9 @@
<el-select v-model="form.operatorUids" multiple>
<el-option
v-for="item in workerList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ :key="item.uid"
+ :label="item.username"
+ :value="item.uid"
/>
</el-select>
</el-form-item>
@@ -128,7 +128,6 @@
interface stateType {
form: Object,
- workerList: Array<any>,
workTypeList: Array<any>,
workLevelList: Array<any>,
heDepList: Array<any>,
@@ -137,6 +136,7 @@
export default defineComponent({
name: 'heightForm',
components: {},
+ props:['workerList'],
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -156,24 +156,6 @@
expStartTime: '',
expEndTime: ''
},
- workerList:[
- {
- label: "张三",
- value: 53
- },
- {
- label: "李四",
- value: 54
- },
- {
- label: "测试一",
- value: 55
- },
- {
- label: "测试二",
- value: 56
- }
- ],
heDepList: [
{
label: "单位一",
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue b/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
index 8cf60e1..ca95264 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
@@ -9,9 +9,9 @@
<el-select v-model="form.operatorUids" multiple>
<el-option
v-for="item in workerList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ :key="item.uid"
+ :label="item.username"
+ :value="item.uid"
/>
</el-select>
</el-form-item>
@@ -112,12 +112,12 @@
interface stateType {
form: Object,
- workerList: Array<any>,
workLevelList: Array<any>
}
export default defineComponent({
name: 'hoistForm',
components: {},
+ props:['workerList'],
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -136,24 +136,6 @@
expStartTime: '',
expEndTime: ''
},
- workerList:[
- {
- label: "张三",
- value: 53
- },
- {
- label: "李四",
- value: 54
- },
- {
- label: "测试一",
- value: 55
- },
- {
- label: "测试二",
- value: 56
- }
- ],
workLevelList: [
{
label: "一级吊装作业",
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue b/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue
index 446765d..2011795 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue
@@ -9,9 +9,9 @@
<el-select v-model="form.operatorUids" multiple>
<el-option
v-for="item in workerList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ :key="item.uid"
+ :label="item.username"
+ :value="item.uid"
/>
</el-select>
</el-form-item>
@@ -198,7 +198,6 @@
interface stateType {
form: Object,
- workerList: Array<any>,
csDepList: Array<any>,
otherWorkList: Array<any>,
workLevelList: Array<any>
@@ -206,6 +205,7 @@
export default defineComponent({
name: 'brokenForm',
components: {},
+ props:['workerList'],
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -234,24 +234,6 @@
expStartTime: '',
expEndTime: ''
},
- workerList:[
- {
- label: "张三",
- value: 53
- },
- {
- label: "李四",
- value: 54
- },
- {
- label: "测试一",
- value: 55
- },
- {
- label: "测试二",
- value: 56
- }
- ],
workLevelList: [
{
label: "抽盲板作业",
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/power.vue b/src/views/specialWorkSystem/workTicket/workApply/components/power.vue
index de34ed6..0d52888 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/power.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/power.vue
@@ -9,9 +9,9 @@
<el-select v-model="form.operatorUids" multiple>
<el-option
v-for="item in workerList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ :key="item.uid"
+ :label="item.username"
+ :value="item.uid"
/>
</el-select>
</el-form-item>
@@ -114,12 +114,12 @@
interface stateType {
form: Object,
- workerList: Array<any>,
workLevelList: Array<any>
}
export default defineComponent({
name: 'hoistForm',
components: {},
+ props:['workerList'],
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -139,24 +139,6 @@
expStartTime: '',
expEndTime: ''
},
- workerList:[
- {
- label: "张三",
- value: 53
- },
- {
- label: "李四",
- value: 54
- },
- {
- label: "测试一",
- value: 55
- },
- {
- label: "测试二",
- value: 56
- }
- ],
workLevelList: [
{
label: "一级吊装作业",
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/space.vue b/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
index 7064fbf..afe6404 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
@@ -9,9 +9,9 @@
<el-select v-model="form.operatorUids" multiple>
<el-option
v-for="item in workerList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ :key="item.uid"
+ :label="item.username"
+ :value="item.uid"
/>
</el-select>
</el-form-item>
@@ -120,13 +120,13 @@
interface stateType {
form: Object,
- workerList: Array<any>,
csDepList: Array<any>,
otherWorkList: Array<any>
}
export default defineComponent({
name: 'spaceForm',
components: {},
+ props:['workerList'],
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
@@ -147,24 +147,6 @@
expStartTime: '',
expEndTime: ''
},
- workerList:[
- {
- label: "张三",
- value: 53
- },
- {
- label: "李四",
- value: 54
- },
- {
- label: "测试一",
- value: 55
- },
- {
- label: "测试二",
- value: 56
- }
- ],
csDepList: [
{
label: "单位一",
diff --git a/src/views/specialWorkSystem/workTicket/workApply/index.vue b/src/views/specialWorkSystem/workTicket/workApply/index.vue
index dee3dcc..181b250 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/index.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/index.vue
@@ -2,28 +2,28 @@
<div class="home-container">
<el-tabs type="border-card">
<el-tab-pane label="动火作业">
- <fire-form></fire-form>
+ <fire-form :workerList = allWorkers></fire-form>
</el-tab-pane>
<el-tab-pane label="受限空间作业">
- <space-form></space-form>
+ <space-form :workerList = allWorkers></space-form>
</el-tab-pane>
<el-tab-pane label="吊装作业">
- <hoist-form></hoist-form>
+ <hoist-form :workerList = allWorkers></hoist-form>
</el-tab-pane>
<el-tab-pane label="动土作业">
- <ground-form></ground-form>
+ <ground-form :workerList = allWorkers></ground-form>
</el-tab-pane>
<el-tab-pane label="断路作业">
- <broken-form></broken-form>
+ <broken-form :workerList = allWorkers></broken-form>
</el-tab-pane>
<el-tab-pane label="高处作业">
- <height-form></height-form>
+ <height-form :workerList = allWorkers></height-form>
</el-tab-pane>
<el-tab-pane label="临时用电作业">
- <power-form></power-form>
+ <power-form :workerList = allWorkers></power-form>
</el-tab-pane>
<el-tab-pane label="盲板抽堵作业">
- <plate-form></plate-form>
+ <plate-form :workerList = allWorkers></plate-form>
</el-tab-pane>
</el-tabs>
</div>
@@ -42,7 +42,7 @@
interface stateType {
-
+ allWorkers: Array<any>
}
export default defineComponent({
name: 'workTicket',
@@ -60,12 +60,12 @@
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({
-
+ allWorkers: []
});
const getAll = async ()=>{
const res = await workApplyApi().getAllUsers()
if (res.data.code === '200') {
- console.log(res.data.data)
+ state.allWorkers = JSON.parse(JSON.stringify(res.data.data))
} else {
ElMessage({
type: 'warning',
--
Gitblit v1.9.2