From c51bc97d413f6be22da96efe0c7fd331f05afa0f Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期三, 26 十月 2022 11:01:55 +0800
Subject: [PATCH] 默认更改列表

---
 src/views/doubleIndex/saftyScreen/fullScreen/index.vue                     |    0 
 src/views/specialWorkManage/workTicket/allApplys/components/heightLog.vue  |    9 ++--
 src/views/specialWorkManage/workTicket/allApplys/components/plateLog.vue   |    2 
 src/router/index.js                                                        |    2 
 src/views/specialWorkManage/workTicket/allApplys/components/hoistLog.vue   |    3 +
 src/views/specialWorkManage/workTicket/allApplys/components/spaceLog.vue   |    3 +
 src/views/doubleIndex/saftyScreen/index.vue                                |    0 
 src/views/specialWorkManage/workTicket/allApplys/components/fireLog.vue    |    3 +
 src/views/specialWorkManage/workTicket/myJobApply/components/heightLog.vue |    1 
 src/views/specialWorkManage/workTicket/allApplys/components/brokenLog.vue  |    9 +++-
 src/views/specialWorkManage/workTicket/allApplys/components/powerLog.vue   |    3 +
 src/views/doubleIndex/saftyScreen/components/screen.vue                    |    0 
 src/views/specialWorkManage/workTicket/myJobApply/index.vue                |   11 +++--
 src/views/specialWorkManage/workTicket/allApplys/components/groundLog.vue  |    9 +++-
 src/views/specialWorkManage/workTicket/allApplys/index.vue                 |   12 ++++--
 15 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 633213f..f96b465 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -59,7 +59,7 @@
     },
     {
         path: '/fullScreen',
-        component: () => import('@/views/doublePreventAction/doubleIndex/fullScreen/index'),
+        component: () => import('@/views/doubleIndex/saftyScreen/fullScreen/index'),
         hidden: true
     },
     {
diff --git a/src/views/doublePreventAction/doubleIndex/components/screen.vue b/src/views/doubleIndex/saftyScreen/components/screen.vue
similarity index 100%
rename from src/views/doublePreventAction/doubleIndex/components/screen.vue
rename to src/views/doubleIndex/saftyScreen/components/screen.vue
diff --git a/src/views/doublePreventAction/doubleIndex/fullScreen/index.vue b/src/views/doubleIndex/saftyScreen/fullScreen/index.vue
similarity index 100%
rename from src/views/doublePreventAction/doubleIndex/fullScreen/index.vue
rename to src/views/doubleIndex/saftyScreen/fullScreen/index.vue
diff --git a/src/views/doublePreventAction/doubleIndex/index.vue b/src/views/doubleIndex/saftyScreen/index.vue
similarity index 100%
rename from src/views/doublePreventAction/doubleIndex/index.vue
rename to src/views/doubleIndex/saftyScreen/index.vue
diff --git a/src/views/specialWorkManage/workTicket/allApplys/components/brokenLog.vue b/src/views/specialWorkManage/workTicket/allApplys/components/brokenLog.vue
index ec225ed..15eefe3 100644
--- a/src/views/specialWorkManage/workTicket/allApplys/components/brokenLog.vue
+++ b/src/views/specialWorkManage/workTicket/allApplys/components/brokenLog.vue
@@ -28,9 +28,9 @@
 			<el-form-item label="作业地址">
 				<el-input v-model="details.workLocation" readonly type="textarea" />
 			</el-form-item>
-			<el-form-item label="作业单位ID">
-				<el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />
-			</el-form-item>
+<!--			<el-form-item label="作业单位ID">-->
+<!--				<el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />-->
+<!--			</el-form-item>-->
 			<el-form-item label="断路原因">
 				<el-input v-model="details.workDetail.bcReason" readonly type="textarea" />
 			</el-form-item>
@@ -68,6 +68,9 @@
             return{
 
             }
+        },
+        created(){
+
         }
 	};
 </script>
diff --git a/src/views/specialWorkManage/workTicket/allApplys/components/fireLog.vue b/src/views/specialWorkManage/workTicket/allApplys/components/fireLog.vue
index 84f2670..58b6a6d 100644
--- a/src/views/specialWorkManage/workTicket/allApplys/components/fireLog.vue
+++ b/src/views/specialWorkManage/workTicket/allApplys/components/fireLog.vue
@@ -59,6 +59,9 @@
             return{
 
             }
+        },
+        created(){
+
         }
 	};
 </script>
diff --git a/src/views/specialWorkManage/workTicket/allApplys/components/groundLog.vue b/src/views/specialWorkManage/workTicket/allApplys/components/groundLog.vue
index f04758d..17eb025 100644
--- a/src/views/specialWorkManage/workTicket/allApplys/components/groundLog.vue
+++ b/src/views/specialWorkManage/workTicket/allApplys/components/groundLog.vue
@@ -28,9 +28,9 @@
 			<el-form-item label="作业地址">
 				<el-input v-model="details.workLocation" readonly type="textarea" />
 			</el-form-item>
-			<el-form-item label="作业单位ID">
-				<el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />
-			</el-form-item>
+<!--			<el-form-item label="作业单位ID">-->
+<!--				<el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />-->
+<!--			</el-form-item>-->
 			<el-form-item label="范围">
 				<el-input v-model="details.workDetail.gbScope" readonly type="textarea" />
 			</el-form-item>
@@ -69,6 +69,9 @@
             return{
 
             }
+        },
+        created(){
+
         }
 	};
 </script>
diff --git a/src/views/specialWorkManage/workTicket/allApplys/components/heightLog.vue b/src/views/specialWorkManage/workTicket/allApplys/components/heightLog.vue
index 46ddc7f..169c1a4 100644
--- a/src/views/specialWorkManage/workTicket/allApplys/components/heightLog.vue
+++ b/src/views/specialWorkManage/workTicket/allApplys/components/heightLog.vue
@@ -28,9 +28,9 @@
 			<el-form-item label="作业地址">
 				<el-input v-model="details.workLocation" readonly type="textarea" />
 			</el-form-item>
-			<el-form-item label="作业单位ID">
-				<el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />
-			</el-form-item>
+<!--			<el-form-item label="作业单位ID">-->
+<!--				<el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />-->
+<!--			</el-form-item>-->
 			<el-form-item label="作业高度">
 				<el-input v-model="details.workDetail.operationHeight" readonly type="textarea"><template #append>米(m)</template></el-input>
 			</el-form-item>
@@ -64,8 +64,7 @@
             }
         },
         created(){
-            debugger
-            console.log(this.details);
+
         }
 	};
 </script>
diff --git a/src/views/specialWorkManage/workTicket/allApplys/components/hoistLog.vue b/src/views/specialWorkManage/workTicket/allApplys/components/hoistLog.vue
index 5295771..b28f8f1 100644
--- a/src/views/specialWorkManage/workTicket/allApplys/components/hoistLog.vue
+++ b/src/views/specialWorkManage/workTicket/allApplys/components/hoistLog.vue
@@ -62,6 +62,9 @@
             return{
 
             }
+        },
+        created(){
+
         }
 	};
 </script>
diff --git a/src/views/specialWorkManage/workTicket/allApplys/components/plateLog.vue b/src/views/specialWorkManage/workTicket/allApplys/components/plateLog.vue
index df06a86..b5fe91b 100644
--- a/src/views/specialWorkManage/workTicket/allApplys/components/plateLog.vue
+++ b/src/views/specialWorkManage/workTicket/allApplys/components/plateLog.vue
@@ -88,7 +88,7 @@
             }
         },
         created(){
-            console.log(this.details);
+
         }
 	};
 </script>
diff --git a/src/views/specialWorkManage/workTicket/allApplys/components/powerLog.vue b/src/views/specialWorkManage/workTicket/allApplys/components/powerLog.vue
index fa15a72..261a54a 100644
--- a/src/views/specialWorkManage/workTicket/allApplys/components/powerLog.vue
+++ b/src/views/specialWorkManage/workTicket/allApplys/components/powerLog.vue
@@ -65,6 +65,9 @@
             return{
 
             }
+        },
+        created(){
+
         }
 	};
 </script>
diff --git a/src/views/specialWorkManage/workTicket/allApplys/components/spaceLog.vue b/src/views/specialWorkManage/workTicket/allApplys/components/spaceLog.vue
index ff0a352..abf67fb 100644
--- a/src/views/specialWorkManage/workTicket/allApplys/components/spaceLog.vue
+++ b/src/views/specialWorkManage/workTicket/allApplys/components/spaceLog.vue
@@ -66,6 +66,9 @@
 
             }
         },
+        created(){
+
+        },
         methods:{
         }
 	};
diff --git a/src/views/specialWorkManage/workTicket/allApplys/index.vue b/src/views/specialWorkManage/workTicket/allApplys/index.vue
index cd8e963..8668440 100644
--- a/src/views/specialWorkManage/workTicket/allApplys/index.vue
+++ b/src/views/specialWorkManage/workTicket/allApplys/index.vue
@@ -75,8 +75,11 @@
                 </el-dialog>
                 <el-dialog :visible.sync="dialogStatus" title="作业申请进度" width="60%">
                     <el-form style="margin-bottom: 40px">
-                        <el-form-item label="申请作业人">
+                        <el-form-item label="作业人" v-if="approveInfo.operatorUnames">
                             <el-input v-model="approveInfo.operatorUnames" readonly type="textarea" />
+                        </el-form-item>
+                        <el-form-item label="作业人" v-else>
+                            <el-input placeholder="无" readonly type="textarea" />
                         </el-form-item>
                     </el-form>
                     <div style="display: flex; flex-direction: column-reverse">
@@ -103,7 +106,7 @@
                                             ><span>{{ i.resultDesc }}</span>
                                         </div>
                                     </div>
-                                    <div class="approveItem">
+                                    <div class="approveItem" v-if="item.stepItems && item.stepItems.length>0">
                                         <div class="item-tit">
                                             <span>审批项目</span>
 <!--                                            <span>类型</span>-->
@@ -112,7 +115,7 @@
                                         <div class="item-cont" v-for="i in item.stepItems">
                                             <span>{{ i.itemName }}</span>
 <!--                                            <span>{{ i.typeDesc }}</span>-->
-                                            <div v-if="i.measure !== null">
+                                            <div v-if="i.measure">
                                                 <div>
                                                     <span>作业类型:</span><span>{{ i.measure.workTypeDesc }}</span>
                                                 </div>
@@ -120,7 +123,7 @@
                                                     <span>措施内容:</span><span>{{ i.measure.context }}</span>
                                                 </div>
                                             </div>
-                                            <div v-if="i.stand !== null">
+                                            <div v-if="i.stand">
                                                 <div>
                                                     <span>标题名称:</span><span>{{ i.stand.title }}</span>
                                                 </div>
@@ -370,6 +373,7 @@
             let res = await workApplyApi().getAllStatus(data);
             if (res.data.code === '200') {
                 this.approveInfo = JSON.parse(JSON.stringify(res.data.data));
+                console.log(this.approveInfo,'this.approveInfo')
                 // this.approveInfo.operators = this.approveInfo.operators.map(item => {
                 //     return item.operatorUname
                 // }).join('、')
diff --git a/src/views/specialWorkManage/workTicket/myJobApply/components/heightLog.vue b/src/views/specialWorkManage/workTicket/myJobApply/components/heightLog.vue
index 46ddc7f..c2414b2 100644
--- a/src/views/specialWorkManage/workTicket/myJobApply/components/heightLog.vue
+++ b/src/views/specialWorkManage/workTicket/myJobApply/components/heightLog.vue
@@ -64,7 +64,6 @@
             }
         },
         created(){
-            debugger
             console.log(this.details);
         }
 	};
diff --git a/src/views/specialWorkManage/workTicket/myJobApply/index.vue b/src/views/specialWorkManage/workTicket/myJobApply/index.vue
index 392a136..e1c7b58 100644
--- a/src/views/specialWorkManage/workTicket/myJobApply/index.vue
+++ b/src/views/specialWorkManage/workTicket/myJobApply/index.vue
@@ -76,8 +76,11 @@
                 </el-dialog>
                 <el-dialog :visible.sync="dialogStatus" title="作业申请进度" width="60%">
                     <el-form style="margin-bottom: 40px">
-                        <el-form-item label="申请作业人">
+                        <el-form-item label="作业人" v-if="approveInfo.operatorUnames">
                             <el-input v-model="approveInfo.operatorUnames" readonly type="textarea" />
+                        </el-form-item>
+                        <el-form-item label="作业人" v-else>
+                            <el-input placeholder="无" readonly type="textarea" />
                         </el-form-item>
                     </el-form>
                     <div style="display: flex; flex-direction: column-reverse">
@@ -104,7 +107,7 @@
                                             ><span>{{ i.resultDesc }}</span>
                                         </div>
                                     </div>
-                                    <div class="approveItem">
+                                    <div class="approveItem" v-if="item.stepItems && item.stepItems.length>0">
                                         <div class="item-tit">
                                             <span>审批项目</span>
 <!--                                            <span>类型</span>-->
@@ -113,7 +116,7 @@
                                         <div class="item-cont" v-for="i in item.stepItems">
                                             <span>{{ i.itemName }}</span>
 <!--                                            <span>{{ i.typeDesc }}</span>-->
-                                            <div v-if="i.measure !== null">
+                                            <div v-if="i.measure">
                                                 <div>
                                                     <span>作业类型:</span><span>{{ i.measure.workTypeDesc }}</span>
                                                 </div>
@@ -121,7 +124,7 @@
                                                     <span>措施内容:</span><span>{{ i.measure.context }}</span>
                                                 </div>
                                             </div>
-                                            <div v-if="i.stand !== null">
+                                            <div v-if="i.stand">
                                                 <div>
                                                     <span>标题名称:</span><span>{{ i.stand.title }}</span>
                                                 </div>

--
Gitblit v1.9.2