Merge remote-tracking branch 'origin/master'

src/api/pro/outsourcingPro.js

@@ -171,3 +171,15 @@ export function addAnnotations(data) {
     data: data
   })
 }
+/**
+ * 删除监理人员
+ * @param data
+ * @returns {AxiosPromise}
+ */
+export function delPersonByIdCardAndPhone(data) {
+  return request({
+    url: '/project/SupervisionUnit/delSupervisoryPersonApply',
+    method: 'post',
+    data: data
+  })
+}

src/api/video/camera.js

@@ -12,21 +12,21 @@ export function reqStationAndCamera(query) {
   return request({
     url: '/project/camera/list',
     method: 'get',
-    params: query
+    params: query,
   })
 }
 export function reqGetRealtimeVideo(query) {
   return request({
     url: '/project/camera/list',
     method: 'get',
-    params: query
+    params: query,
   })
 }
 export function reqCloseVideo1(query) {
   return request({
     url: '/project/camera/list',
     method: 'get',
-    params: query
+    params: query,
   })
 }
 

src/components/JessibucaH265/index.vue

@@ -105,6 +105,8 @@ export default {
 
     async getQxToken() {
       const res = await getQxToken()
+
+      console.log('res播放视频的token', res)
       this.qxToken = res.msg
     },
     async selectVideoLoginInfo() {

src/components/pro-tabs/bns-person-approval-tabs.vue

@@ -137,7 +137,13 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row type="flex" justify="start" align="top" :gutter="gutterValue" v-if="items.data.postName == '1'">
+          <el-row
+            type="flex"
+            justify="start"
+            align="top"
+            :gutter="gutterValue"
+            v-if="items.data.postName == '1' || items.data.postName == '特殊工种'"
+          >
             <el-col :span="11">
               <el-form-item label-width="120px" label="特殊工种种类" prop="specialJobType">
                 <el-input
@@ -207,7 +213,13 @@
               ></bns-file-list-tabs>
             </el-col>
           </el-row>
-          <el-row type="flex" justify="start" align="top" :gutter="gutterValue" v-if="items.data.postName == '1'">
+          <el-row
+            type="flex"
+            justify="start"
+            align="top"
+            :gutter="gutterValue"
+            v-if="items.data.postName == '1' || items.data.postName == '特殊工种'"
+          >
             <el-col :span="24">
               <el-form-item label-width="120px" label="特殊工种文件"></el-form-item>
               <img

src/components/pro-tabs/bns-timeline-tabs.vue

@@ -20,7 +20,7 @@
               <span>审批部门：{{ item.section }}</span>
               <span style="margin-left: 50px">审批人：{{ item.name }}</span>
               <p>审批时间： {{ item.time }}</p>
-              <p>审批状态： {{ item.status }}</p>
+              <p>审批状态： {{ auditingType(item) }}</p>
               <p v-if="item.name.indexOf(userName) != -1 && showType == 2">
                 审批意见：
                 <el-input
@@ -100,9 +100,9 @@
           >
             <div
               :class="{
-                highlight: index < currentCheckIndex && item.isResult,
+                highlight: index < currentCheckIndex,
                 normal: index > currentCheckIndex,
-                currentLight: index === currentCheckIndex || (index === currentCheckIndex - 1 && !item.isResult),
+                currentLight: index === currentCheckIndex,
               }"
             >
               {{ item.checkPerson }} (
@@ -112,6 +112,13 @@
               </span>
             </div>
 
+            <!-- <div :class="styleByType(item)">
+              {{ item.name }} ( {{ item.examineType === '0' ? '依次' : item.examineType === '1' ? '会签' : '或签' }})
+              <span style="margin-left: 15px; font-size: 20px; font-weight: bold">
+                {{ index < currentCheckIndex && item.isResult ? '√' : currentCheckIndex === index ? '?' : '?' }}
+              </span>
+            </div> -->
+
             <div class="arrow-container">
               <div class="line"></div>
               <div class="arrow-down"></div>
@@ -328,6 +335,20 @@ export default {
     addReason() {
       this.dialogVisible = true
     },
+
+    // 审批状态
+    auditingType(item) {
+      if (item.status === '未审核' || item.status == '') return '未审核'
+      if (item.status === '已审核' && (item.agree == 1 || item.agree == 3)) return '审核通过'
+      if (item.status === '已审核' && item.agree == 2) return '审核驳回'
+      if (item.status === '已审核' && (item.agree == 4 || item.agree == null)) return '撤回'
+    },
+
+    // 根据审核状态以及审核结果添加样式
+    styleByType(item) {
+      console.log('item修改样式', item)
+      if (item.status === '未审核') return 'currentLight'
+    },
   },
 }
 </script>

src/views/educTrainLearn/libertyLearn/exercise.vue

@@ -263,7 +263,9 @@
     </el-row>
 
     <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
-      <span style="margin-left: 15px; font-weight: 800; font-size: 16px" v-preventReClick="3000">确定退出本次练习吗?</span>
+      <span style="margin-left: 15px; font-weight: 800; font-size: 16px" v-preventReClick="3000">
+        确定退出本次练习吗?
+      </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="openDialog2" v-preventReClick="5000">确 定</el-button>
@@ -552,9 +554,10 @@ export default {
     handleClose() {
       this.dialogVisible2 = false
       // 关闭页面
-      this.$tab.closePage().then(() => {
+      this.$tab.closePage()
-        this.$router.push({ path: '/educTrainLearn/libertyLearn/index' })
+      // this.$tab.closePage().then(() => {
-      })
+      //   this.$router.push({ path: '/educTrainLearn/libertyLearn/index' })
+      // })
     },
   },
 }

src/views/pro/cons/subManagement/approval/personApproval.vue

@@ -84,6 +84,8 @@ export default {
       }
       getSubPersonnelDetails(params).then(response => {
         this.formData.data = response.data
+
+        console.log('response.data详情数据', response.data)
         this.formData.data.phone = hideSensitiveInfo(response.data.phone)
         this.formData.data.idCard = hideSensitiveInfo(response.data.idCard)
         this.formData.finalCheck = this.paramsData.finalCheck

vue.config.js

@@ -38,10 +38,10 @@ module.exports = {
         // target: `http://localhost:18080`,
         // target: 'http://192.168.0.176:18080',
         // target: 'http://192.168.0.58:19090', // 杰
-        target: 'http://192.168.0.14:18080', // 测试环境
+        // target: 'http://192.168.0.14:18080', // 测试环境
         // target: 'http://218.21.27.6:1999/prod-api', // 生产环境
         // target: 'http://192.168.0.38:18080', // 郝志权
-        // target: 'http://192.168.2.122:18080', // 梁超
+        target: 'http://192.168.2.125:18080', // 梁超
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: '',