解决了人脸设备问题 添加场地码

public/js/config.js

@@ -1,13 +1,24 @@
-// var COMPANY = ''; //通用
+var COMPANY = ''; //通用
 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
 // var COMPANY='hezhan'; //合展-宿迁
-var COMPANY='nanchang'; //南昌地铁、衢州
+// var COMPANY='nanchang'; //南昌地铁、衢州
 // var COMPANY='longguang'; //龙光地产
 // var COMPANY='zhengwu'
 // var COMPANY='shenbai'; //沈白高铁
 // COMPANY = 'henan' // 河南
 // COMPANY = 'xingxuan'
 
+
+
+// 政务切换不同请求API
+var PROJECT = {
+    local_test : '', // 普通版
+    online_hq: 'hengqin', // 横琴
+}
+
+
+var PROJECT_TYPE = PROJECT.online_hq
+
 var headerShow = true; // 是否显示头部
 var tabsShow = true;  // 是否显示tabs
 if (COMPANY == 'xingxuan') {

src/assets/js/http.js

@@ -43,7 +43,7 @@ if (process.env.NODE_ENV == 'development') {
     // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
     // tag: 本地
     // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
-    // axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //杨意本地 http/1.1
+    axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //杨意本地 http/1.1
     // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
     // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇
     // axios.defaults.baseURL = 'http://120.196.217.6:7000/';
@@ -56,7 +56,7 @@ if (process.env.NODE_ENV == 'development') {
     // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //
     // axios.defaults.baseURL = 'http://120.236.247.200:9000/'; //横琴线上
     // axios.defaults.baseURL = 'http://223.82.100.80:9000/'; //南昌地铁
-    axios.defaults.baseURL = 'http://139.9.66.234:40001/';  //南昌地铁二期
+    // axios.defaults.baseURL = 'http://139.9.66.234:40001/';  //南昌地铁二期
     // axios.defaults.baseURL = 'http://124.71.178.44:30/';
     // axios.defaults.baseURL = 'http://192.168.34.125:9090/';
     // axios.defaults.baseURL = 'http://192.168.88.220:6023/';

src/components/account.vue

@@ -15,7 +15,8 @@
           <div style="margin-left:10px">
             <p>{{ $store.state.userInfo.companyName }}</p>
             <!-- 横琴和鹤洲不需要客服电话-->
-            <p>客服电话：{{$store.state.userInfo.customerServicePhone}}</p>
+            <p v-if="projectType != 'hengqin'">客服电话：{{$store.state.userInfo.customerServicePhone}}</p>
+            <p v-if="projectType == 'hengqin'">入场码：{{$store.state.currentProDetail.placeCode}}</p>
           </div>
         </div>
         <!-- <div class="flex2" style="margin-top:20px">
@@ -125,6 +126,7 @@
 export default {
   data() {
     return {
+      projectType:'',
       loginData:'',
       dataCenter1:'',
       projectBackground:'项目后台',
@@ -135,7 +137,9 @@ export default {
       dataCenter:"资料中心",//资料中心
     };
   },
-  
+  created() {
+    this.projectType = PROJECT_TYPE
+  },
   mounted() {
     this.seeEquipment = this.$store.state.userInfo.seeEquipment;
     this.loginData = JSON.parse(localStorage.getItem('systemInfo'))

src/views/companyAdmin/companyDiagram.vue

@@ -638,6 +638,17 @@
               <el-radio v-model="addProjectForm.majorProjectType" :label="0">否</el-radio>
             </div>
           </el-form-item>
+          
+          <el-form-item
+          v-if="projectType2 == 'hengqin'"
+            :label="'id'"
+            prop="placeCode"
+          >
+            <el-input
+              v-model="addProjectForm.placeCode"
+              :placeholder="$t('message.companyDiagram.PleaseEnter')"
+            ></el-input>
+          </el-form-item>
           <el-form-item
             :label="
               $t('message.companyDiagram.dialog_ProjectPop_up.layoutImage')
@@ -884,6 +895,7 @@ export default {
       }
     };
     return {
+      projectType2:'',//全局的项目类型 （eg:hengqin）
       yiCheckArr: [],
       yiCheckOptions: [],
       projectCheckArr: [],
@@ -986,6 +998,7 @@ export default {
       projectDialogTitle: "",
       addProjectDialog: false,
       addProjectForm: {
+        placeCode:'',
         areaCode: "",
         buildingNum: "",
         bulidStatus: "",
@@ -1618,6 +1631,8 @@ export default {
   created(){
     this.accountType = this.$store.state.userInfo.accountType
     this.company = COMPANY
+    this.projectType2 = PROJECT_TYPE
+    // console.log('---------projectType',this.projectType)
     // this.getGeoJson('/js/mapJson/allcitys.json').then(res=>{
     //   console.log(res)
     //   let allcitys = res.map(x=>{
@@ -2065,7 +2080,7 @@ export default {
     },
     editOrganizationFn(data){
       this.state = ''
-      console.log(data)
+      console.log('-----编辑的logo',data)
       // console.log(data.parentId)
       // console.log(data.companyType)
       if(data.companyType === 4 ){
@@ -2669,7 +2684,7 @@ export default {
     },
     //显示编辑项目弹框
     editProjectFn(item) {
-      console.log(item)
+      console.log('编辑页有值吗',item)
       this.projectDialogTitle = this.$t("message.companyDiagram.editProject"); //编辑项目
       this.isAdd = false;
       this.addProjectForm = JSON.parse(JSON.stringify(item));
@@ -2693,6 +2708,7 @@ export default {
           if (this.isAdd) {
             console.log(this.addProjectForm)
             addProjectApi(this.addProjectForm).then((res) => {
+               console.log('添加成功',res)
               this.addProjectDialog = false;
               this.initData();
               this.$message.success(
@@ -2701,6 +2717,7 @@ export default {
             });
           } else {
             editProjectApi(this.addProjectForm).then((res) => {
+              console.log('信息编辑',res)
               this.addProjectDialog = false;
               this.initData();
               this.$message.success(

src/views/projectFront/laborManage/personModule/administration.vue

@@ -1433,13 +1433,14 @@
                   @change="handleCheckAllChangeFace"
                   >{{ $t('message.laborMange.checkAll') }}</el-checkbox
                 >
+                
                 <el-checkbox-group
                   v-model="personForm.ufaceDevId"
                   @change="handleUfaceDevChange"
                 >
                   <el-checkbox
                     v-for="(item, index) in ufaceDevAllList"
-                    :key="index"
+                    :key="item.id"
                     :label="item.id"
                     :disabled="item.disabled"
                   >
@@ -2037,6 +2038,7 @@ export default {
       this.refreshBtn()
     },
     handleUfaceDevChange(val) {
+      console.log('-------------',val)
       let checkedCount = val.length
       let allCheckList = []
       for (let i = 0; i < this.ufaceDevAllList.length; i++) {
@@ -2047,6 +2049,7 @@ export default {
       this.checkAllFaceDev = checkedCount === allCheckList.length
       this.isIndeterminate2 =
         checkedCount > 0 && checkedCount < allCheckList.length
+        console.log('--------------------------',this.personForm.ufaceDevId)
     },
     handleCheckAllChangeFace(val) {
       if (val) {
@@ -2067,6 +2070,9 @@ export default {
         if (res.code == 200) {
           this.ufaceDevAllList = res.result
           console.log(this.ufaceDevAllList)
+          //  console.log('shuchu',this.personForm.ufaceDevId)
+          //  console.log('accountType!= 6',this.personForm.ufaceDevId)
+           this.personForm.ufaceDevId =[...this.personForm.ufaceDevId]
           if (this.$store.state.userInfo.accountType == 6) {
             this.ufaceDevAllList.forEach((item) => {
               item.disabled = true
@@ -2090,9 +2096,12 @@ export default {
                   }
                 }
               }
+               console.log('accountType == 6',this.personForm.ufaceDevId)
             })
           }
         }
+
+       
       })
     },
     // 获取企业分级列表

src/views/projectFront/laborManage/personModule/laborComponent.vue

@@ -2594,6 +2594,7 @@ export default {
         console.log(res);
         if (res.code == 200) {
           this.ufaceDevAllList = res.result;
+          this.personForm.ufaceDevId =[...this.personForm.ufaceDevId]
           if (this.$store.state.userInfo.accountType == 6) {
             this.ufaceDevAllList.forEach((item) => {
               item.disabled = true;