Merge branch 'limingyu-20240520-一公司门口门禁地图' into pet

src/views/map/dialog/index.vue

@@ -11,7 +11,7 @@
       <xf-point v-if="type === 'point'" :id="id" :type="type" :gangkou="gangkou"/>
       <xf-control v-if="type === 'xfbf01' || type ==='xfkzs01' || type ==='xfjyd01' || type ==='xfsy01'" :id="id" :type="type" :gangkou="gangkou"/>
       <alarm-device v-if="type === 'alarm'" :id="id" :type="type" :gangkou="gangkou"/>
-      <mk-gate-machine v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'" :id="id" :type="type" :gangkou="gangkou"/>
+      <mk-gate-machine v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'" :id="id" :type="type" :gangkou="gangkou" :corp-id="corpInfoId"/>
       <mk-gate-machine-cfd v-if="type === 'CAR00004'||type ==='PERSON00004' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/>
       <mk-gate-machine-cmt v-if="type === 'CAR00005'||type ==='PERSON00005' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/>
       <zhong_da_info v-if="type === 'majordangersource'" :id="id" :type="type" :gangkou="gangkou"/>

src/views/map/dialog/mkGateMachine.vue

@@ -34,8 +34,8 @@
               <td>{{ item.USERNAME }}</td>
               <td>{{ item.TIME }}</td>
               <td>
-                <span v-if="item.STATE === '0'">进入</span>
+                <span v-if="item.STATE === 0">进入</span>
-                <span v-if="item.STATE === '1'">出去</span>
+                <span v-if="item.STATE === 1">出去</span>
               </td>
             </tr>
           </table>
@@ -79,6 +79,12 @@ export default {
     gangkou: {
       type: String,
       default: ''
+    },
+    corpId: {
+      type: String,
+      default() {
+        return ''
+      }
     }
   },
   data() {
@@ -107,7 +113,8 @@ export default {
         {
           GATE_AREA_ID: this.id,
           TYPE: this.type,
-          GANGKOU: this.gangkou
+          GANGKOU: this.gangkou,
+          CORPINFO_ID: this.corpId
         }
       ).then((data) => {
         Object.assign(this.info, data.pd)
@@ -143,7 +150,8 @@ export default {
         {
           GATE_AREA_ID: this.id,
           TYPE: this.type,
-          GANGKOU: this.gangkou
+          GANGKOU: this.gangkou,
+          CORPINFO_ID: this.corpId
         }
       ).then((data) => {
         this.recordAllList = data.recordAllList

src/views/map/index.vue

@@ -459,6 +459,16 @@ export default {
           containAuthorization: [],
           eliminateAuthorization: [],
           list: [
+            {
+              label: '人员',
+              dialog_width: '800px',
+              check: false,
+              img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
+              type: 'PERSON',
+              containAuthorization: [],
+              eliminateAuthorization: []
+            },
             {
               label: '车辆',
               dialog_width: '600px',