Merge remote-tracking branch 'origin/dev' into dev

2025-03-06 18:53:55 +08:00 · 2025-03-06 18:53:55 +08:00 · e218f41629
parent 9591af9594 1b97d975b6
commit e218f41629
6 changed files with 60 additions and 7 deletions
--- a/src/asyncRouter.js
+++ b/src/asyncRouter.js
@ -47,10 +47,14 @@ router.beforeEach((to, from, next) => {
  } else {
    if (to.path == `/login` || to.path == '/apiBI' || to.path == '/apivideomanager') {
      next()
+    } else {
+      if (to.path == '/map' && to.query.userId) {
+        next()
      } else {
        next(`/login`)
      }
    }
+  }
 })

 function formatRoutes(routes, baseUrl) {
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@ -1259,6 +1259,7 @@ export default {
    }
  },
  mounted() {
+    this.initUser()
    this.initMap()
    this.pointBoxCfd = loadMapBoxCfd()
    this.pointBoxCmt = loadCmtMapBox()
@ -1362,6 +1363,23 @@ export default {
    //     })
    //   })
    // },
+    initUser() {
+      const { userId } = this.$route.query
+      if (!userId) return
+      requestFN(
+        '/admin/v2/login',
+        { userId }
+      ).then((res) => {
+        console.log(res)
+        if (res.result !== 'success') {
+          alert('登录失败')
+          window.close()
+        }
+      }).catch((e) => {
+        alert('登录失败')
+        window.close()
+      })
+    },
    initMap() {
      viewer = new Cesium.Viewer('cesiumContainer', {
        // terrainProvider: Cesium.createWorldTerrain()
@ -1425,6 +1443,13 @@ export default {
      //     }
      //   }
      // }, 1000)
+      const { id, longitude, latitude, CORP_INFO_ID, type } = this.$route.query
+
+      if (type === 'newToOld') {
+        setTimeout(() => {
+          this.clickPort({ id, longitude, latitude, height: 10000, CORP_INFO_ID })
+        }, 1000)
+      }
    },

    loadTilesetHandler() {
@ -1962,6 +1987,10 @@ export default {
    handleClickRightTools(index) {
      if (this.rightOptionsList[index].check !== '') this.rightOptionsList[index].check = !this.rightOptionsList[index].check
      if (index === 0) {
+        if (this.$route.query.userId) {
+          window.close()
+          return
+        }
        if (this.gangkouActive === '00004') {
          // if (this.fwebsocket) {
          //   this.fwebsocket.close()
--- a/src/views/security_commitment/promise_book_issued/components/add.vue
+++ b/src/views/security_commitment/promise_book_issued/components/add.vue
@ -165,7 +165,7 @@
        <!--        </el-col>-->
      </el-row>
      <el-row v-for="(item,index) in form.coverpeople" :key="item.id">
-        <el-col :span="12">
+        <el-col :span="8">
          <el-form-item
            :label="'部门' + (index + 1)"
            :prop="'coverpeople.' + index + '.DEPARTMENT_ID'"
@ -187,7 +187,7 @@
          </el-form-item>
        </el-col>
        <template>
-          <el-col :span="12">
+          <el-col :span="8">
            <el-form-item
              :label="'人员' + (index + 1)"
              :prop="'coverpeople.' + index + '.USER_ID'"
@ -207,6 +207,11 @@
            </el-form-item>
          </el-col>
        </template>
+        <el-col :span="8">
+          <el-form-item label="岗位名称">
+            <el-input v-model="item.NICKNAME" placeholder="请输入"/>
+          </el-form-item>
+        </el-col>
      </el-row>
      <el-row>
        <el-col :span="24">
@ -355,6 +360,7 @@ export default {
            DEPARTMENT_ID: null,
            POST_ID: '',
            USER_ID: [],
+            NICKNAMES: [],
            id: Math.random()
          }
        ],
@ -459,6 +465,7 @@ export default {
            CORPINFO_ID: data.coverpeople[i].CORPINFO_ID,
            DEPARTMENT_ID: data.coverpeople[i].DEPARTMENT_ID,
            POST_ID: data.coverpeople[i].POST_ID,
+            NICKNAME: data.coverpeople[i].NICKNAME,
            USER_ID: [],
            id: data.coverpeople[i].PROMISEPEOPLE_ID
          })
@ -616,6 +623,7 @@ export default {
          DEPARTMENT_ID: null,
          POST_ID: '',
          USER_ID: [],
+          NICKNAMES: [],
          id: Math.random()
        }
      )
@ -702,7 +710,7 @@ export default {
            { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID, CORPINFO_ID: item.CORPINFO_ID }
          ))
          const coverpeople = this.form.coverpeople.map(item => (
-            { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID, CORPINFO_ID: item.CORPINFO_ID }
+            { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID, CORPINFO_ID: item.CORPINFO_ID,NICKNAME: item.NICKNAME }
          ))
          let url
          if (this.$parent.PROMISE_ID) {
@ -765,6 +773,7 @@ export default {
          DEPARTMENT_ID: null,
          POST_ID: '',
          USER_ID: [],
+          NICKNAMES: [],
          id: Math.random()
        }
      ]
--- a/src/views/security_commitment/promise_book_issued/components/details.vue
+++ b/src/views/security_commitment/promise_book_issued/components/details.vue
@ -92,7 +92,10 @@ export default {
      ).then((data) => {
        const DETAIL = data.COLLATERAL.map(item => ({ value: item.COLLATERAL, id: item.PROMISEDETAIL_ID }))
        this.dialog.visible = true
-        this.dialog.data = { ...data.varList, DETAIL, FILEPATH: data.ISGN.FILEPATH, SIGNTIME: data.ISGN.SIGNTIME, COVERPEOPLE: data.COVERPEOPLE[0].USERNAME, ORDER: data.COVERPEOPLE }
+        this.dialog.data = { ...data.varList, DETAIL,
+          FILEPATH: data.ISGN.FILEPATH, SIGNTIME: data.ISGN.SIGNTIME,
+          COVERPEOPLE: data.COVERPEOPLE[0].USERNAME, ORDER: data.COVERPEOPLE ,
+          NICKNAME: data.COVERPEOPLE[0].NICKNAME,}
      }).catch((e) => {
      })
    },
--- a/src/views/security_commitment/promise_book_issued/components/promise_book_dialog.vue
+++ b/src/views/security_commitment/promise_book_issued/components/promise_book_dialog.vue
@ -9,7 +9,7 @@
        </div>
      </div>
      <h1 class="title">{{ dialogData.TYPE === '0' ? '安全生产承诺书' : '安全生产责任状' }}</h1>
-      <div v-if="dialogData.TYPE === '0'">{{ dialogData.COVERPEOPLE }}：</div>
+      <div v-if="dialogData.TYPE === '0'">{{ dialogData.COVERPEOPLE }}{{ dialogData.NICKNAME }}：</div>
      <div class="text">{{ dialogData.TEXT }}</div>
      <div class="collateral">
        <div v-for="(item,index) in dialogData.DETAIL" :key="index" class="item">
@ -27,7 +27,7 @@
      <div :style="{alignItems:dialogData.FILEPATH ? 'flex-end' : 'flex-start'}" class="footer">
        <!--        <div v-if="dialogData.TYPE === '0'" :style="{marginBottom:dialogData.FILEPATH ? '50px' : '0px'}" class="hairdresser">承诺单位(盖章)：</div>-->
        <div v-if="dialogData.TYPE === '1'" class="hairdresser">
-          <div v-if="!dialogData.ORDER.FILEPATH" class="promiser">发状人：{{ dialogData.COVERPEOPLE }}</div>
+          <div v-if="!dialogData.ORDER.FILEPATH" class="promiser">发状人：{{ dialogData.COVERPEOPLE }}{{ dialogData.NICKNAME }}</div>
          <div v-if="dialogData.ORDER.FILEPATH" class="promiser">：
            <span :style="{marginRight:dialogData.ORDER.FILEPATH ? '0px' : '105px'}">
              发状人：
@ -37,6 +37,11 @@
 <!--          <div class="time">{{ moment(dialogData.CREATTIME) }}</div>-->
        </div>
        <div class="respondent">
+          <div class="promiser">
+            <span :style="{marginRight:dialogData.FILEPATH ? '0px' : '105px'}">
+             承诺期限: {{ dialogData.PROMISE_TERM_START }} - {{ dialogData.PROMISE_TERM_END }}
+            </span>
+          </div>
          <div class="promiser">
            <span :style="{marginRight:dialogData.FILEPATH ? '0px' : '105px'}">
              {{ dialogData.TYPE === '0' ? '承诺人(本人签字)' : '受状人' }}：
--- a/src/views/security_commitment/promise_book_issued/components/see.vue
+++ b/src/views/security_commitment/promise_book_issued/components/see.vue
@ -45,6 +45,8 @@
        <td>{{ item.DEPTNAME }}</td>
        <td class="bbg">{{ '人员' + (index + 1) }}</td>
        <td>{{ item.USERNAME && item.USERNAME.join('、') }}</td>
+        <td class="bbg">{{  '岗位' + (index + 1)  }}</td>
+        <td>{{ item.NICKNAME }}</td>
      </tr>
    </table>
    <el-divider v-if="form.TYPE != '1'" content-position="left">承诺内容</el-divider>
@ -136,6 +138,7 @@ export default {
            DEPTNAME: data.coverpeople[i].DEPTNAME,
            POST_ID: data.coverpeople[i].POST_ID,
            POSTNAME: data.coverpeople[i].POSTNAME,
+            NICKNAME: data.coverpeople[i].NICKNAME,
            USER_ID: [],
            USERNAME: [],
            id: data.coverpeople[i].PROMISEPEOPLE_ID