From 2a2e5d86a44fb0da2046103bc2396699b86f6910 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Fri, 17 May 2024 20:13:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.js                            |  6 ++--
 .../materialManage/materialEntryManage.vue    | 11 ++++++--
 .../materialManage/materialExitManage.vue     | 11 ++++++--
 .../safetyEducation/securityRiskAnalysis.vue  |  8 +++---
 .../specialWork/blindPlugWork.vue             |  8 +++---
 .../specialWork/confinedSpaceWork.vue         |  6 ++--
 src/views/projectFront/specialWork/detail.vue | 28 +++++++++++--------
 .../specialWork/disconnectionWork.vue         |  6 ++--
 .../projectFront/specialWork/fireWork.vue     |  6 ++--
 .../specialWork/riggingOutWork.vue            |  6 ++--
 .../specialWork/startBuildingWork.vue         |  6 ++--
 .../specialWork/temporaryPowerWork.vue        |  6 ++--
 .../specialWork/towerOverWork.vue             |  6 ++--
 13 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index ecbe29f7..64b4ef6a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -50,8 +50,10 @@ export default new Vuex.Store({
     // FILEURL:' http://101.43.164.214:11111/image/',// 百色
     // UPLOADURL:'http://182.90.224.237:51234/upload/image/',
     // FILEURL:'http://182.90.224.237:51234/image/',
-    UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
-    FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
+     FILEURL:'http://42.180.188.17:11211/image/', // 测试
+    UPLOADURL:'http://42.180.188.17:11211/upload/image/',// 测试
+    // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
+    // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
     WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
     // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
     // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
diff --git a/src/views/projectFront/materialManage/materialEntryManage.vue b/src/views/projectFront/materialManage/materialEntryManage.vue
index 9b68130e..16b9700a 100644
--- a/src/views/projectFront/materialManage/materialEntryManage.vue
+++ b/src/views/projectFront/materialManage/materialEntryManage.vue
@@ -37,7 +37,7 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="入场时间" prop="materialName">
+        <el-form-item label="材料入场有效时间" prop="materialName">
           <el-date-picker
             size="medium"
             v-model="queryInfo.timeRange"
@@ -80,8 +80,13 @@
           <el-table-column
             prop="entryTime"
             align="center"
-            label="入场时间"
-          ></el-table-column>
+            label="入场有效时间"
+          >
+          <template slot-scope="scope">
+              开始：{{scope.row.entryTime}} <br/>
+              结束：{{scope.row.entryTime}}
+            </template>
+        </el-table-column>
           <el-table-column align="center" label="操作" width="280">
             <template slot-scope="scope">
               <div
diff --git a/src/views/projectFront/materialManage/materialExitManage.vue b/src/views/projectFront/materialManage/materialExitManage.vue
index 057d5a87..77152efa 100644
--- a/src/views/projectFront/materialManage/materialExitManage.vue
+++ b/src/views/projectFront/materialManage/materialExitManage.vue
@@ -37,7 +37,7 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="出场时间" prop="materialName">
+        <el-form-item label="材料出场有效时间" prop="materialName">
           <el-date-picker
             size="medium"
             v-model="queryInfo.timeRange"
@@ -80,8 +80,13 @@
           <el-table-column
             prop="entryTime"
             align="center"
-            label="出场时间"
-          ></el-table-column>
+            label="出场有效时间"
+          >
+          <template slot-scope="scope">
+              开始：{{scope.row.entryTime}} <br/>
+              结束：{{scope.row.entryTime}}
+            </template>
+        </el-table-column>
           <el-table-column align="center" label="操作" width="280">
             <template slot-scope="scope">
               <div
diff --git a/src/views/projectFront/safetyEducation/securityRiskAnalysis.vue b/src/views/projectFront/safetyEducation/securityRiskAnalysis.vue
index b390f05e..e93967cc 100644
--- a/src/views/projectFront/safetyEducation/securityRiskAnalysis.vue
+++ b/src/views/projectFront/safetyEducation/securityRiskAnalysis.vue
@@ -509,9 +509,9 @@ export default {
                         moveOnMouseWheel: true, // 开启滚轮平移
                         moveOnMouseMove: true, // 鼠标移动能触发数据窗口平移
                         preventDefaultMouseMove: false,
-                        start:100,
-                        startValue: 0,
-                        endValue: 3,
+                        // start:100,
+                        startValue: this.safeList.length - 1,
+                        endValue: this.safeList.length - 4,
                         // 滚动条高度
                         width: 8,
                         // 滚动条显示位置
@@ -521,7 +521,7 @@ export default {
                         // 控制手柄的尺寸
                         handleSize: 0,
                         filterMode: 'empty',
-                        top: "top",
+                        // top: "top",
                     },
                 ],
                 series: [
diff --git a/src/views/projectFront/specialWork/blindPlugWork.vue b/src/views/projectFront/specialWork/blindPlugWork.vue
index b15db3ea..0ca9279c 100644
--- a/src/views/projectFront/specialWork/blindPlugWork.vue
+++ b/src/views/projectFront/specialWork/blindPlugWork.vue
@@ -14,10 +14,10 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="作业人">
+                    <!-- <el-form-item label="作业人">
                         <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
                         </el-input>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item>
                         <el-button type="primary" @click="onSubmit" plain>{{
                             $t('message.quality.inquire')
@@ -137,7 +137,7 @@
             <el-page-header @back="goBack" :content="dialogTitle" class="backText"
                 :class="{ dark: styleType == 2 }"></el-page-header>
             <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
-            <detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack"
+            <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="4" :COMPANY_Type="'longguang'" @cancleSave="goBack"
                 :workDetail="workDetail" v-if="isEdit">
                 <template v-slot:basicinfo>
                     <div class="info-content">
@@ -178,7 +178,7 @@
                                 {{workDetail.pipelineParameter&& JSON.parse(workDetail.pipelineParameter) instanceof Array && JSON.parse(workDetail.pipelineParameter).map(item => `介质(${item.materialQuality ? item.materialQuality : ''})、温度(${item.specifications ? item.specifications : ''})、压力(${item.number ? item.number : ''})`).join('，')}}
                             </el-form-item>
                             <el-form-item label="盲板参数：" :label-width="formLabelWidthDetail">
-                                {{workDetail.blindPlateParameter&& JSON.parse(workDetail.blindPlateParameter) instanceof Array && JSON.parse(workDetail.blindPlateParameter).map(item => `材质(${item.materialQuality? item.materialQuality : ''})、规格(${item.specifications? item.specifications : ''})、编号(${item.number? item.number : ''})`).join('，')}}
+                                {{workDetail.blindPlateParameter&& JSON.parse(workDetail.blindPlateParameter) instanceof Array && JSON.parse(workDetail.blindPlateParameter).map(item => `材质(${item.medium? item.medium : ''})、规格(${item.temperature? item.temperature : ''})、编号(${item.pressure? item.pressure : ''})`).join('，')}}
                             </el-form-item>
                             
                             <!-- <el-form-item label="介质：" :label-width="formLabelWidthDetail">
diff --git a/src/views/projectFront/specialWork/confinedSpaceWork.vue b/src/views/projectFront/specialWork/confinedSpaceWork.vue
index 9abf7eef..a61a8323 100644
--- a/src/views/projectFront/specialWork/confinedSpaceWork.vue
+++ b/src/views/projectFront/specialWork/confinedSpaceWork.vue
@@ -14,10 +14,10 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="作业人">
+                    <!-- <el-form-item label="作业人">
                         <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
                         </el-input>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item>
                         <el-button type="primary" @click="onSubmit" plain>{{
                             $t('message.quality.inquire')
@@ -299,7 +299,7 @@
             <el-page-header @back="goBack" :content="dialogTitle" class="backText"
                 :class="{ dark: styleType == 2 }"></el-page-header>
             <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
-            <detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail"
+            <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="3" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail"
                 v-if="isEdit">
                 <template v-slot:basicinfo>
                     <div class="info-content">
diff --git a/src/views/projectFront/specialWork/detail.vue b/src/views/projectFront/specialWork/detail.vue
index c0d372b1..1bfffb3a 100644
--- a/src/views/projectFront/specialWork/detail.vue
+++ b/src/views/projectFront/specialWork/detail.vue
@@ -58,7 +58,8 @@
                 </el-row>
               </div> -->
             </div>
-            <div v-if="COMPANY != 'longguang'" class="others-info">
+            <!-- v-if="COMPANY != 'longguang'" -->
+            <div  class="others-info">
               <div class="top">
                 <div class="info-item">
                   <div class="box-title">
@@ -920,7 +921,7 @@ import {
 
 import moment from "moment";
 export default {
-  props: ["id", "isSuperDanger", "COMPANY_Type","workDetail"],
+  props: ["id", "isSuperDanger", "COMPANY_Type","workDetail","workType"],
   data() {
     return {
       responsibilityList: [],
@@ -1160,7 +1161,7 @@ export default {
     queryDetail() {
       let data = {
         id: this.id,
-        type:2,
+        type:this.workType,
       };
       queryDangerousEngineeringRecordByIdApi(data).then((res) => {
         console.log(res.result, "----详情");
@@ -1210,9 +1211,11 @@ export default {
     },
     // 查询进度
     selectDangerousEngineeringProgressRecord() {
+      console.log(this.$store.state);
       selectDangerousEngineeringProgressRecordApi({
         engineeringId: this.id,
-        type:2,
+        type:this.workType,
+        assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
       }).then((res) => {
         console.log(res.result, "----进度");
         if (res.code == 200 && res.result) {
@@ -1233,7 +1236,8 @@ export default {
       // selectDangerousEngineeringAcceptanceCheckApi({
       selectFinalDangerousEngineeringAcceptanceCheckApi({
         engineeringId: this.id,
-        type:2,
+        type:this.workType,
+        assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
       }).then((res) => {
         console.log(res.result, "-----最终验收");
         console.log(res.result, "-----最终验收");
@@ -1259,7 +1263,8 @@ export default {
     selectDangerousEngineeringSideStation() {
       selectDangerousEngineeringSideStationApi({
         engineeringId: this.id,
-        type:2,
+        type:this.workType,
+        assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
        }).then(
         (res) => {
           console.log(res.result, "-----旁站记录");
@@ -1286,7 +1291,8 @@ export default {
         pageNo: 1,
         pageSize: 1000,
         engineeringId: this.id,
-        type:2,
+        type:this.workType,
+        assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
       };
       // selectHiddenDangerInspectRecordApi(data).then((res) => {
       await selectFinalHiddenDangerInspectRecordApi(data).then((res) => {
@@ -1338,7 +1344,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          deleteDangerousEngineeringProgressRecordApi({ id: val, type:2, }).then(
+          deleteDangerousEngineeringProgressRecordApi({ id: val, type:this.workType, }).then(
             (res) => {
               if (res.code == 200) {
                 this.$message({
@@ -1369,7 +1375,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          deleteDangerousEngineeringSideStationApi({ id: val, type:2, }).then((res) => {
+          deleteDangerousEngineeringSideStationApi({ id: val, type:this.workType, }).then((res) => {
             if (res.code == 200) {
               this.$message({
                 type: "success",
@@ -1399,7 +1405,7 @@ export default {
       })
         .then(() => {
           // deleteDangerousEngineeringAcceptanceCheckApi({ id: val }).then(
-          deleteFinalDangerousEngineeringAcceptanceCheckApi({ id: val, type:2, }).then(
+          deleteFinalDangerousEngineeringAcceptanceCheckApi({ id: val, type:this.workType, }).then(
             (res) => {
               if (res.code == 200) {
                 this.$message({
@@ -1431,7 +1437,7 @@ export default {
       })
         .then(() => {
           // deletehiddenDangerInspectRecordApi({ id: val }).then((res) => {
-          deleteFinlahiddenDangerInspectRecordApi({ id: val, type:2, }).then((res) => {
+          deleteFinlahiddenDangerInspectRecordApi({ id: val, type:this.workType, }).then((res) => {
             if (res.code == 200) {
               this.$message({
                 type: "success",
diff --git a/src/views/projectFront/specialWork/disconnectionWork.vue b/src/views/projectFront/specialWork/disconnectionWork.vue
index 002701b2..17157e55 100644
--- a/src/views/projectFront/specialWork/disconnectionWork.vue
+++ b/src/views/projectFront/specialWork/disconnectionWork.vue
@@ -10,10 +10,10 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="作业人">
+                    <!-- <el-form-item label="作业人">
                         <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
                         </el-input>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item>
                         <el-button type="primary" @click="onSubmit" plain>{{
                             $t('message.quality.inquire')
@@ -127,7 +127,7 @@
             <el-page-header @back="goBack" :content="dialogTitle" class="backText"
                 :class="{ dark: styleType == 2 }"></el-page-header>
             <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
-            <detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack"
+            <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="9" :COMPANY_Type="'longguang'" @cancleSave="goBack"
                 :workDetail="workDetail" v-if="isEdit">
                 <template v-slot:basicinfo>
                     <div class="info-content">
diff --git a/src/views/projectFront/specialWork/fireWork.vue b/src/views/projectFront/specialWork/fireWork.vue
index 36afcee5..e202cb41 100644
--- a/src/views/projectFront/specialWork/fireWork.vue
+++ b/src/views/projectFront/specialWork/fireWork.vue
@@ -14,10 +14,10 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="动火人">
+                    <!-- <el-form-item label="动火人">
                         <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
                         </el-input>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item>
                         <el-button type="primary" @click="onSubmit" plain>{{
                             $t('message.quality.inquire')
@@ -307,7 +307,7 @@
             <el-page-header @back="goBack" :content="dialogTitle" class="backText"
                 :class="{ dark: styleType == 2 }"></el-page-header>
             <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
-            <detail :id="detailId" :isSuperDanger="isSuperDanger" @cancleSave="goBack" :workDetail="workDetail"
+            <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="2" @cancleSave="goBack" :workDetail="workDetail"
                 v-if="isEdit">
                 <template v-slot:basicinfo>
                     <div class="info-content">
diff --git a/src/views/projectFront/specialWork/riggingOutWork.vue b/src/views/projectFront/specialWork/riggingOutWork.vue
index e538a31a..ee915c1b 100644
--- a/src/views/projectFront/specialWork/riggingOutWork.vue
+++ b/src/views/projectFront/specialWork/riggingOutWork.vue
@@ -10,10 +10,10 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="作业人">
+                    <!-- <el-form-item label="作业人">
                         <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
                         </el-input>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item>
                         <el-button type="primary" @click="onSubmit" plain>{{
                             $t('message.quality.inquire')
@@ -130,7 +130,7 @@
             <el-page-header @back="goBack" :content="dialogTitle" class="backText"
                 :class="{ dark: styleType == 2 }"></el-page-header>
             <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
-            <detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack"
+            <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="6" :COMPANY_Type="'longguang'" @cancleSave="goBack"
                 :workDetail="workDetail" v-if="isEdit">
                 <template v-slot:basicinfo>
                     <div class="info-content">
diff --git a/src/views/projectFront/specialWork/startBuildingWork.vue b/src/views/projectFront/specialWork/startBuildingWork.vue
index 8a10af2c..6009c5e0 100644
--- a/src/views/projectFront/specialWork/startBuildingWork.vue
+++ b/src/views/projectFront/specialWork/startBuildingWork.vue
@@ -10,10 +10,10 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="作业人">
+                    <!-- <el-form-item label="作业人">
                         <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
                         </el-input>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item>
                         <el-button type="primary" @click="onSubmit" plain>{{
                             $t('message.quality.inquire')
@@ -127,7 +127,7 @@
             <el-page-header @back="goBack" :content="dialogTitle" class="backText"
                 :class="{ dark: styleType == 2 }"></el-page-header>
             <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
-            <detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail" v-if="isEdit">
+            <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="8" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail" v-if="isEdit">
                 <template v-slot:basicinfo>
                     <div class="info-content">
                         <el-form class="form-box" :model="workDetail">
diff --git a/src/views/projectFront/specialWork/temporaryPowerWork.vue b/src/views/projectFront/specialWork/temporaryPowerWork.vue
index c23d5fa2..e41bab74 100644
--- a/src/views/projectFront/specialWork/temporaryPowerWork.vue
+++ b/src/views/projectFront/specialWork/temporaryPowerWork.vue
@@ -10,10 +10,10 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="作业人">
+                    <!-- <el-form-item label="作业人">
                         <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
                         </el-input>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item>
                         <el-button type="primary" @click="onSubmit" plain>{{
                             $t('message.quality.inquire')
@@ -133,7 +133,7 @@
             <el-page-header @back="goBack" :content="dialogTitle" class="backText"
                 :class="{ dark: styleType == 2 }"></el-page-header>
             <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
-            <detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail" v-if="isEdit">
+            <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="7" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail" v-if="isEdit">
                 <template v-slot:basicinfo>
                     <div class="info-content">
                         <el-form class="form-box" :model="workDetail">
diff --git a/src/views/projectFront/specialWork/towerOverWork.vue b/src/views/projectFront/specialWork/towerOverWork.vue
index b27e2020..9aa3e574 100644
--- a/src/views/projectFront/specialWork/towerOverWork.vue
+++ b/src/views/projectFront/specialWork/towerOverWork.vue
@@ -14,10 +14,10 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="作业人">
+                    <!-- <el-form-item label="作业人">
                         <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
                         </el-input>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item>
                         <el-button type="primary" @click="onSubmit" plain>{{
                             $t('message.quality.inquire')
@@ -133,7 +133,7 @@
             <el-page-header @back="goBack" :content="dialogTitle" class="backText"
                 :class="{ dark: styleType == 2 }"></el-page-header>
             <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
-            <detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail"
+            <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="5" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail"
                 v-if="isEdit">
                 <template v-slot:basicinfo>
                     <div class="info-content">