Merge remote-tracking branch 'origin/20240528Test' into liujun-2024-06-06-相关方新需求

项目负责人待审核修改为项目主管部门待审核
项目负责人审核打回修改为项目主管部门审核打回
2024-06-18 08:37:50 +08:00 · 2024-06-17 17:51:51 +08:00 · 2024-06-14 17:54:09 +08:00 · 2024-06-11 09:45:47 +08:00 · 2024-06-11 09:44:56 +08:00
8 changed files with 85 additions and 33 deletions
--- a/config/index.js
+++ b/config/index.js
@ -11,7 +11,7 @@ module.exports = {
    assetsPublicPath: '/',
    proxyTable: {
      '/api': {
-        target: 'http://192.168.0.90:8091/',
+        target: 'http://192.168.0.49:8091/',
        changeOrigin: true,
        pathRewrite: {
          '^/api': ''
--- a/src/views/hotwork_cfd/hotwork/components/detail.vue
+++ b/src/views/hotwork_cfd/hotwork/components/detail.vue
@ -75,6 +75,22 @@
          <td class="bbg">动火作业实施时间</td>
          <td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
        </tr>
+        <tr v-if="pd.FIRE_COMPLETED === '1' && pd.SITE_CLEANED === '1'">
+          <td class="bbg">动火是否完成</td>
+          <td>
+            <span>已完成</span>
+          </td>
+          <td class="bbg">动火是否完成</td>
+          <td>
+            <span>已清理</span>
+          </td>
+        </tr>
+        <tr v-if="pd.NO_REMAINING_EMBERS === '1'">
+          <td class="bbg">是否存在遗留火种</td>
+          <td>
+            <span>无遗留火种</span>
+          </td>
+        </tr>
        <tr>
          <td colspan="4">
            <table class="table-ui">
@ -149,13 +165,14 @@
        <tr>
          <td class="bbg">接受交底人</td>
          <td colspan="10">
-            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+            <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
              <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+              <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
+              <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
            </div>
          </td>
        </tr>
+
        <tr>
          <td class="bbg">监护人</td>
          <td colspan="3">
@ -178,7 +195,7 @@
        </tr>
        <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
          <td colspan="6">
-            <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
+            <div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT }}</div>
            <div style="text-align: right">
              <span>签字：</span>
              <img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -188,7 +205,7 @@
        </tr>
        <tr v-if="pd.BELONGING_SIGNATURE">
          <td colspan="6">
-            <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
+            <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div>
            <div style="text-align: right">
              <span>签字：</span>
              <img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@ -198,7 +215,7 @@
        </tr>
        <tr v-if="pd.LEADER_USER_SIGNER_PATH">
          <td colspan="6">
-            <div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
+            <div>属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}</div>
            <div style="text-align: right">
              <span>签字：</span>
              <img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -208,7 +225,7 @@
        </tr>
        <tr v-if="pd.AUDIT_USER_SIGNER_PATH">
          <td colspan="6">
-            <div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
+            <div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}</div>
            <div style="text-align: right">
              <span>签字：</span>
              <img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -218,7 +235,7 @@
        </tr>
        <tr v-if="pd.APPROVE_USER_SIGNER_PATH">
          <td colspan="6">
-            <div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
+            <div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}</div>
            <div style="text-align: right">
              <span>签字：</span>
              <img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -228,7 +245,7 @@
        </tr>
        <tr v-if="pd.MONITOR_USER_SIGNER_PATH">
          <td colspan="6">
-            <div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
+            <div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}</div>
            <div style="text-align: right">
              <span>签字：</span>
              <img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -238,7 +255,7 @@
        </tr>
        <tr v-if="imgList1.length>0">
          <td colspan="10">
-            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div>完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT }}</div>
            <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
              <span>签字：</span>
              <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -270,6 +287,7 @@ export default {
      imgList: [],
      imgList1: [],
      otherProtectiveMeasures: [],
+      acceptConfessList: [],
      confessList: []
    }
  },
@ -315,6 +333,11 @@ export default {
            this.confessList.push(item)
          }
        })
+        data.pd.acceptConfessList.forEach(item => {
+          if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
+            this.acceptConfessList.push(item)
+          }
+        })
        for (let i = 0; i < data.measuresList.length; i++) {
          // 将字符串转成数组
          const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
--- a/src/views/hotwork_cfd/hotwork/components/list.vue
+++ b/src/views/hotwork_cfd/hotwork/components/list.vue
@ -51,14 +51,14 @@
        <template slot-scope="{row}">
          <span v-if="row.APPLY_STATUS==0">动火作业待提交</span>
          <span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
-          <span v-else-if="row.APPLY_STATUS==1.5">项目负责人待审核</span>
+          <span v-else-if="row.APPLY_STATUS==1.5">项目主管部门待审核</span>
          <span v-else-if="row.APPLY_STATUS==2">属地监管单位待审核</span>
          <span v-else-if="row.APPLY_STATUS==4">安全管理部门待审核</span>
          <span v-else-if="row.APPLY_STATUS==5">动火审批人待审核</span>
          <span v-else-if="row.APPLY_STATUS==6">班长待验票</span>
          <span v-else-if="row.APPLY_STATUS==7">待验收</span>
          <span v-else-if="row.APPLY_STATUS==8">验收归档</span>
-          <span v-else-if="row.APPLY_STATUS==-1.5">项目负责人审核打回</span>
+          <span v-else-if="row.APPLY_STATUS==-1.5">项目主管部门审核打回</span>
          <span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</span>
          <span v-else-if="row.APPLY_STATUS==-4">属地监管单位审核打回</span>
          <span v-else-if="row.APPLY_STATUS==-5">安全管理部门审核打回</span>
@ -217,7 +217,7 @@ export default {
        { ID: '', NAME: '请选择' },
        { ID: '0', NAME: '动火作业待提交' },
        { ID: '1', NAME: '作业负责人待审核' },
-        { ID: '1.5', NAME: '项目负责人待审核' },
+        { ID: '1.5', NAME: '项目主管部门待审核' },
        { ID: '2', NAME: '属地监管单位待审核' },
        { ID: '4', NAME: '安全管理部门待审核' },
        { ID: '5', NAME: '动火审批人待审核' },
--- a/src/views/hotwork_cfd/pigeonhole/components/detail.vue
+++ b/src/views/hotwork_cfd/pigeonhole/components/detail.vue
@ -74,7 +74,22 @@
            <td class="bbg">动火作业实施时间</td>
            <td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
          </tr>
-
+          <tr v-if="pd.FIRE_COMPLETED === '1' && pd.SITE_CLEANED === '1'">
+            <td class="bbg">动火是否完成</td>
+            <td>
+              <span>已完成</span>
+            </td>
+            <td class="bbg">动火是否完成</td>
+            <td>
+              <span>已清理</span>
+            </td>
+          </tr>
+          <tr v-if="pd.NO_REMAINING_EMBERS === '1'">
+            <td class="bbg">是否存在遗留火种</td>
+            <td>
+              <span>无遗留火种</span>
+            </td>
+          </tr>
          <tr>
            <td colspan="4">
              <table class="table-ui">
@ -149,10 +164,10 @@
          <tr>
            <td class="bbg">接受交底人</td>
            <td colspan="10">
-              <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+              <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
                <span>签字：</span>
-                <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-                <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+                <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
+                <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
              </div>
            </td>
          </tr>
@ -178,7 +193,7 @@
          </tr>
          <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
            <td colspan="6">
-              <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
+              <div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT }}</div>
              <div style="text-align: right">
                <span>签字：</span>
                <img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -188,7 +203,7 @@
          </tr>
          <tr v-if="pd.BELONGING_SIGNATURE">
            <td colspan="6">
-              <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
+              <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div>
              <div style="text-align: right">
                <span>签字：</span>
                <img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@ -198,7 +213,7 @@
          </tr>
          <tr v-if="pd.LEADER_USER_SIGNER_PATH">
            <td colspan="6">
-              <div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
+              <div>属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}</div>
              <div style="text-align: right">
                <span>签字：</span>
                <img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -208,7 +223,7 @@
          </tr>
          <tr v-if="pd.AUDIT_USER_SIGNER_PATH">
            <td colspan="6">
-              <div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
+              <div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}</div>
              <div style="text-align: right">
                <span>签字：</span>
                <img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -218,7 +233,7 @@
          </tr>
          <tr v-if="pd.APPROVE_USER_SIGNER_PATH">
            <td colspan="6">
-              <div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
+              <div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}</div>
              <div style="text-align: right">
                <span>签字：</span>
                <img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -228,7 +243,7 @@
          </tr>
          <tr v-if="pd.MONITOR_USER_SIGNER_PATH">
            <td colspan="6">
-              <div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
+              <div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}</div>
              <div style="text-align: right">
                <span>签字：</span>
                <img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -238,7 +253,7 @@
          </tr>
          <tr v-if="imgList1.length>0">
            <td colspan="10">
-              <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+              <div>完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT }}</div>
              <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
                <span>签字：</span>
                <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -274,6 +289,7 @@ export default {
      imgList: [],
      imgList1: [],
      otherProtectiveMeasures: [],
+      acceptConfessList: [],
      confessList: []
    }
  },
@ -399,6 +415,11 @@ export default {
            this.confessList.push(item)
          }
        })
+        data.pd.acceptConfessList.forEach(item => {
+          if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
+            this.acceptConfessList.push(item)
+          }
+        })
        for (let i = 0; i < data.measuresList.length; i++) {
          // 将字符串转成数组
          const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
--- a/src/views/hotwork_cfd/pigeonhole/components/list.vue
+++ b/src/views/hotwork_cfd/pigeonhole/components/list.vue
@ -44,7 +44,7 @@
        <template slot-scope="{row}">
          <span v-if="row.APPLY_STATUS==0">动火作业待提交</span>
          <span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
-          <span v-else-if="row.APPLY_STATUS==1.5">项目负责人待审核</span>
+          <span v-else-if="row.APPLY_STATUS==1.5">项目主管部门待审核</span>
          <span v-else-if="row.APPLY_STATUS==2">属地监管单位待审核</span>
          <span v-else-if="row.APPLY_STATUS==4">安全管理部门待审核</span>
          <span v-else-if="row.APPLY_STATUS==5">动火审批人待审核</span>
--- a/src/views/map/dialog/hotworkFirst.vue
+++ b/src/views/map/dialog/hotworkFirst.vue
@ -138,10 +138,10 @@
      <tr>
        <td class="bbg-transparent">接受交底人</td>
        <td colspan="10">
-          <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+          <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
            <span>签字：</span>
-            <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-            <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+            <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
+            <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
          </div>
        </td>
      </tr>
@ -271,6 +271,7 @@ export default {
      imgList: [],
      imgList1: [],
      otherProtectiveMeasures: [],
+      acceptConfessList: [],
      confessList: []
    }
  },
@ -318,6 +319,11 @@ export default {
            this.confessList.push(item)
          }
        })
+        data.pd.acceptConfessList.forEach(item => {
+          if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
+            this.acceptConfessList.push(item)
+          }
+        })
        for (let i = 0; i < data.measuresList.length; i++) {
          // 将字符串转成数组
          const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
--- a/static/config.js
+++ b/static/config.js
@ -1,7 +1,7 @@
 // eslint-disable-next-line no-unused-vars
 const config = {
-  weburl: 'http://192.168.0.90:8080/', // 前台地址
-  httpurl: 'http://192.168.0.90:8091/', // 后台地址
+  weburl: 'http://192.168.0.49:8080/', // 前台地址
+  httpurl: 'http://192.168.0.49:8091/', // 后台地址
  qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台
  adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/',
  // 正式
--- a/static/config_dev.js
+++ b/static/config_dev.js
@ -1,7 +1,9 @@
 // eslint-disable-next-line no-unused-vars
 const config = {
-  weburl: 'http://192.168.151.43:8080/', // 前台地址
-  httpurl: 'http://qgqy.qhdsafety.com/qa-prevention-gwj/', // 后台地址
+  // weburl: 'http://192.168.151.43:8080/', // 前台地址
+  // httpurl: 'http://qgqy.qhdsafety.com/qa-prevention-gwj/', // 后台地址
+  weburl: 'http://192.168.0.49:8080/', // 前台地址
+  httpurl: 'http://192.168.0.49:8091/', // 后台地址
  qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台
  adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/',
  // 正式
Author	SHA1	Message	Date
liujun	8685c9663f	Merge remote-tracking branch 'origin/20240528Test' into liujun-2024-06-06-相关方新需求	2024-06-18 08:37:50 +08:00
WenShiJun	f1128ecffc	项目负责人待审核修改为项目主管部门待审核项目负责人审核打回修改为项目主管部门审核打回	2024-06-17 17:51:51 +08:00
WenShiJun	59c3d44b1a	动火详情页面补充字段和相关字段逻辑修改	2024-06-14 17:54:09 +08:00
WenShiJun	49304ab68c	Merge remote-tracking branch 'origin/20240528Test' into 20240528Test # Conflicts: # config/index.js # static/config.js	2024-06-11 09:45:47 +08:00
WenShiJun	52cc054b20	动火作业相关页面接受交底人由一个修改为展示多个，新增动火是否完成，作业现场是否清理，是否存在遗留火种三个字段显示	2024-06-11 09:44:56 +08:00