Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

src/assets/js/http.js

@@ -84,7 +84,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  axios.defaults.baseURL ='http://192.168.34.221:19111/' //郭圣雄本地
+  // axios.defaults.baseURL ='http://192.168.34.221:19111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
@@ -96,7 +96,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
   // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
   // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
-  // axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
+  axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
 
 } else if (process.env.NODE_ENV == 'debug') {

src/views/projectFront/specialWork/blindPlugWork.vue

@@ -138,7 +138,10 @@
                                 {{ workDetail.workTicketCode }}
                             </el-form-item>
                             <el-form-item label="作业类别：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.jobType }}
+                                <span v-for="(item,i) in JSON.parse(workDetail.jobType)" :key="i">
+                                    <span style="margin-right:5px">{{item}}</span>
+                                </span>
+                                <!-- {{ workDetail.jobType }} -->
                             </el-form-item>
                             <el-form-item label="作业单位：" :label-width="formLabelWidthDetail">
                                 <el-select v-model="workDetail.operatingUnit" placeholder="请选择作业单位" disabled>
@@ -161,9 +164,9 @@
                                 {{ workDetail.jobApplicationTime }}
                             </el-form-item>
                             <el-form-item label="设备、管道名称：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.fireLocationAndFirePart }}
+                                {{ workDetail.devPipelineName  }}
                             </el-form-item>
-                            <el-form-item label="介质：" :label-width="formLabelWidthDetail">
+                            <!-- <el-form-item label="介质：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.jobContent }}
                             </el-form-item>
                             <el-form-item label="温度：" :label-width="formLabelWidthDetail">
@@ -180,12 +183,20 @@
                             </el-form-item>
                             <el-form-item label="编号：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.jobContent }}
-                            </el-form-item>
+                            </el-form-item> -->
                             <el-form-item label="作业人：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.jobPersonName }}
                             </el-form-item>
                             <el-form-item label="盲板位置图：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.blindPlatePic }}
+                                    <span class="value" v-if="workDetail.blindPlatePic && JSON.parse(workDetail.blindPlatePic).length > 0"  
+                                        style="display: flex;justify-content:flex-start;word-wrap: break-word;white-space: normal; flex-wrap: wrap">
+                                        <div v-for="(item,index) in JSON.parse(workDetail.blindPlatePic)" :key="index" style="">
+                                            <img :preview="item ? $store.state.FILEURL + item.url : ''"
+                                                :src="item ? $store.state.FILEURL + item.url : ''" alt="" width="50px" height="50px" style="margin-right: 10px;"/>
+                                        </div>
+                                    </span>
+                                <!-- {{ workDetail.blindPlatePic }} -->
+                                {{workDetail.blindPlatePic&& JSON.parse(workDetail.blindPlatePic) instanceof Array && JSON.parse(workDetail.blindPlatePic).map(item => item.name).join('、')}}
                             </el-form-item>
                             <el-form-item label="盲板编号：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.blindPlateNo }}

src/views/projectFront/specialWork/fireWork.vue

@@ -65,8 +65,8 @@
                            <div :style="scope.row.hotWorkLevel == '特级' ?'color:#f56c6c' : scope.row.hotWorkLevel == '一级' ? 'color:#DAA520' : scope.row.hotWorkLevel == '二级' ? 'color:#5181F6' : ''"> {{ scope.row.hotWorkLevel }}</div>
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="动火人" prop="firemanName"></el-table-column>
+                    <el-table-column align="center" label="动火人及证书编号" prop="firemanAndCertificateNo"></el-table-column>
-                    <el-table-column align="center" label="证书编号" prop="certificateNo"></el-table-column>
+                    <!-- <el-table-column align="center" label="证书编号" prop="certificateNo"></el-table-column> -->
                     <el-table-column align="center" label="作业单位" prop="operatingUnitName"></el-table-column>
                     <el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column>
                     <!-- 状态 -->
@@ -339,15 +339,18 @@
                             <el-form-item label="作业负责人：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.assignmentPersonInChargeName }}
                             </el-form-item>
-                            <el-form-item label="动火人：" :label-width="formLabelWidthDetail">
+                            <!-- <el-form-item label="动火人：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.firemanName }}
+                            </el-form-item> -->
+                            <el-form-item label="动火人及证书编号：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.firemanAndCertificateNo }}
                             </el-form-item>
-                            <el-form-item label="安全作业票编号：" :label-width="formLabelWidthDetail">
+                            <el-form-item label="关联的其他特殊作业及安全作业票编号：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.safetyWorkTicketCode }}
+                                {{ workDetail.otherRelatedSpecialTask }}
                             </el-form-item>
-                            <el-form-item label="证书编号：" :label-width="formLabelWidthDetail">
+                            <!-- <el-form-item label="证书编号：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.certificateNo }}
-                            </el-form-item>
+                            </el-form-item> -->
                             <el-form-item label="动火作业实施时间：" :label-width="formLabelWidthDetail">
                                 <el-date-picker v-model="workDetail.hotWorkExecutionTime" type="daterange"
                                     value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至"