diff --git a/src/assets/js/api/laborPerson.js b/src/assets/js/api/laborPerson.js
index ee1c7673..fcc96250 100644
--- a/src/assets/js/api/laborPerson.js
+++ b/src/assets/js/api/laborPerson.js
@@ -63,6 +63,8 @@ export const editDepartmentInfo = data => post('xmgl/departmentInfo/edit', data)
 //劳务管理 --- 新增设备
 export const getProjectUfaceConfigInfo = data => post('xmgl/projectUfaceConfig/getProjectUfaceConfigInfo', data); //查询项目的对应的人脸设备配置信息
 export const projectUfaceConfigEdit = data => post('xmgl/projectUfaceConfig/edit', data); //编辑项目对应的人脸设备配置信息
+export const projectCarConfigInfoList = data => get('xmgl/projectCarCameraConfig/list', data); //查询车辆项目初始化
+export const projectCarConfigInfoEdit = data => post('xmgl/projectCarCameraConfig/saveProjectCarCameraConfig', data); //编辑车辆项目初始化配置
 export const ufaceDevAdd = data => post('xmgl/ufaceDev/add', data); //添加人脸设备信息
 export const ufaceDevEdit = data => post('xmgl/ufaceDev/edit', data); //编辑人脸设备信息
 export const ufaceDevDelete = data => post('xmgl/ufaceDev/delete', data); //删除人脸设备信息
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 00f534d6..bbfad638 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -385,4 +385,4 @@ function startLoading() {
 
 function endLoading() {
     loading.close()
-}
\ No newline at end of file
+}
diff --git a/src/components/centerChange.vue b/src/components/centerChange.vue
index 28b2dea8..37eb54f2 100644
--- a/src/components/centerChange.vue
+++ b/src/components/centerChange.vue
@@ -13,6 +13,16 @@
           <span>个人中心</span>
           <div class="row-line"></div>
           <div class="classify-item">
+            <div
+              @click="jumpRouter(item.modulePath)"
+              :class="isActive(item.modulePath) ? 'active-item' : ''"
+              v-for="(item,index) in moduleList"
+              :key="index"
+            >
+              {{item.moduleName}}
+            </div>
+          </div>
+          <!-- <div class="classify-item">
             <div
               @click="jumpRouter('/workSpace')"
               :class="isActive('/workSpace') ? 'active-item' : ''"
@@ -31,7 +41,7 @@
             >
               消息中心
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
       <!-- 点击内容 -->
@@ -45,15 +55,35 @@
   </div>
 </template>
 <script>
+import {
+  getNewUserAllModulePageApi,
+} from "@/assets/js/api/jxjadmin.js";
 export default {
   data() {
     return {
       visible: false,
+      moduleList: []
     };
   },
-  created() {},
+  created() {
+    this.getModuleList();},
   mounted() {},
   methods: {
+    // 查询全部模块(拿到工作流的模块菜单)
+    getModuleList() {
+      getNewUserAllModulePageApi({
+        projectSn: this.$store.state.projectSn,
+        moduleType: 7,
+        userId: this.$store.state.userInfo.userId,
+      }).then((res) => {
+        if(res.result && res.result.moduleList){
+          this.moduleList = res.result.moduleList;
+          console.log(this.moduleList,123321)
+        } else {
+          this.moduleList = [];
+        }
+      });
+    },
     isActive(val) {
       return this.$route.path.indexOf(val) != -1 ? true : false;
     },
diff --git a/src/components/header.vue b/src/components/header.vue
index dc5c0b71..0c029c5c 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -55,7 +55,7 @@
     <div class="title_near flex" v-if="![1,2].includes($store.state.userInfo.accountType)">
       <userChange></userChange>
     </div>
-    <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
+    <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType) && workSpaceShow">
       <div class="divider-line"></div>
       <centerChange></centerChange>
     </div>
@@ -226,7 +226,8 @@ export default {
       timer: null,
       jumpToken: "",
       showQrCode: false,
-      educationId: ""
+      educationId: "",
+      workSpaceShow: false
     };
   },
   components: {
@@ -267,6 +268,9 @@ export default {
     }
     this.loginData = JSON.parse(localStorage.getItem("systemInfo"));
     // console.log('信息',this.loginData)\
+    if(this.$store.state.projectSn){
+      this.getModuleList();
+    }
   },
   mounted() {
     if (localStorage.getItem("systemInfo")) {
@@ -311,6 +315,22 @@ export default {
     },
   },
   methods: {
+    // 查询全部模块(拿到工作流的模块菜单)
+    getModuleList() {
+      getNewUserAllModulePageApi({
+        projectSn: this.$store.state.projectSn,
+        moduleType: 7,
+        userId: this.$store.state.userInfo.userId,
+      }).then((res) => {
+        let all = res.result.moduleList;
+        if (all.length == 0) {
+          this.workSpaceShow = false;
+          return;
+        } else {
+          this.workSpaceShow = true;
+        }
+      });
+    },
     getEduIdFn(){
       let data = {
         projectSn: this.$store.state.projectSn,
diff --git a/src/components/userChange.vue b/src/components/userChange.vue
index 6e6722b7..461a4ba6 100644
--- a/src/components/userChange.vue
+++ b/src/components/userChange.vue
@@ -46,7 +46,7 @@
           :style="{ height: groupListData.length > 4 ? '300px' : 'auto' }"
           v-if="isUserList"
         >
-          <vue-scroll style="height: 100%;" v-if="groupListData.length > 0">
+          <vue-scroll style="height: 100%" v-if="groupListData.length > 0">
             <div
               class="content-list-item"
               v-for="(item, index) in groupListData"
@@ -68,44 +68,47 @@
           </div> -->
         </div>
         <div class="tree-group" v-else>
-          <div class="select-list" :style="{ height: selectedGroupData.length > 4 ? '300px' : 'auto' }">
-            <vue-scroll style="height: 100%;">
-            <el-input
-              placeholder="输入关键字进行查找"
-              v-model="filterText"
-              style="width: 98%;"
-              suffix-icon="el-icon-search"
-              size="medium"
-            >
-            </el-input>
-            <el-tree
-              :data="selectedGroupData"
-              :default-expanded-keys="expandKey"
-              :default-expand-all="false"
-              node-key="sn"
-              ref="tree"
-              :props="selectTreeProps"
-              :filter-node-method="filterNode"
-              :highlight-current="true"
-              :check-on-click-node="false"
-              style="margin:10px 5px;"
-            >
-              <span class="custom-tree-node" slot-scope="{ node, data }">
-                <span
-                  style="
-                    width: 100%;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                    display: inline-block;
-                  "
-                  @click="treeClick(data)"
-                  :class="data.projectSn ? 'projectStyle' : 'companyStyle'"
-                  :title="node.label"
-                  >{{ node.label }}</span
-                >
-              </span>
-            </el-tree>
+          <div
+            class="select-list"
+            :style="{ height: selectedGroupData.length > 4 ? '300px' : 'auto' }"
+          >
+            <vue-scroll style="height: 100%">
+              <el-input
+                placeholder="输入关键字进行查找"
+                v-model="filterText"
+                style="width: 98%"
+                suffix-icon="el-icon-search"
+                size="medium"
+              >
+              </el-input>
+              <el-tree
+                :data="selectedGroupData"
+                :default-expanded-keys="expandKey"
+                :default-expand-all="false"
+                node-key="sn"
+                ref="tree"
+                :props="selectTreeProps"
+                :filter-node-method="filterNode"
+                :highlight-current="true"
+                :check-on-click-node="false"
+                style="margin: 10px 5px"
+              >
+                <span class="custom-tree-node" slot-scope="{ node, data }">
+                  <span
+                    style="
+                      width: 100%;
+                      overflow: hidden;
+                      text-overflow: ellipsis;
+                      white-space: nowrap;
+                      display: inline-block;
+                    "
+                    @click="treeClick(data)"
+                    :class="data.projectSn ? 'projectStyle' : 'companyStyle'"
+                    :title="node.label"
+                    >{{ node.label }}</span
+                  >
+                </span>
+              </el-tree>
             </vue-scroll>
           </div>
         </div>
@@ -132,6 +135,7 @@
 <script>
 import { getGroupListApi } from "@/assets/js/api/loginSign.js";
 import { getComapnyStatisticsSupplierListApi } from "@/assets/js/api/company/project";
+import { getNewUserAllModulePageApi } from "@/assets/js/api/jxjadmin.js";
 export default {
   data() {
     return {
@@ -148,7 +152,8 @@ export default {
       expandKey: [],
       selectFirst: 0,
       isShowGroup: false,
-      selectGroupFirst: 0
+      selectGroupFirst: 0,
+      workSpaceShow: false,
     };
   },
   created() {
@@ -162,9 +167,26 @@ export default {
       this.expandKey = [this.selectedProjectSn];
     }
     this.loadData();
+    this.getModuleList();
   },
   mounted() {},
   methods: {
+    // 查询全部模块(拿到工作流的模块菜单)
+    getModuleList() {
+      getNewUserAllModulePageApi({
+        projectSn: this.$store.state.projectSn,
+        moduleType: 7,
+        userId: this.$store.state.userInfo.userId,
+      }).then((res) => {
+        let all = res.result.moduleList;
+        if (all.length == 0) {
+          this.workSpaceShow = false;
+          return;
+        } else {
+          this.workSpaceShow = true;
+        }
+      });
+    },
     // 获取是否只有一个企业一个项目，只有一个企业一个项目时隐藏
     loadData() {
       let that = this;
@@ -177,13 +199,13 @@ export default {
         sn: sn,
         projectType: projectType,
       }).then((res) => {
-        console.log(res,666555444)
-        if(res.result && res.result.companyList){
-          if(res.result.companyList.length > 1){
+        console.log(res, 666555444);
+        if (res.result && res.result.companyList) {
+          if (res.result.companyList.length > 1) {
             that.isShowGroup = true;
           } else {
-            if(res.result.companyList.length == 1){
-              that.selectShowGroup(res.result.companyList[0])
+            if (res.result.companyList.length == 1) {
+              that.selectShowGroup(res.result.companyList[0]);
             } else {
               that.isShowGroup = false;
             }
@@ -262,11 +284,14 @@ export default {
         this.selectedGroupData = [item];
         this.$store.commit("setSelectedGroupSn", item.companySn); // 存储选中的组织Sn
         this.filterTreeData(this.selectedGroupData);
-
-        if (this.$route.path.indexOf("supplier") == -1) {
-          this.$router.push("/workSpace");
+        if (this.workSpaceShow) {
+          if (this.$route.path.indexOf("supplier") == -1) {
+            this.$router.push("/workSpace");
+          } else {
+            this.$router.push("/supplierIndex");
+          }
         } else {
-          this.$router.push("/supplierIndex");
+          this.$router.push("/projectIndex");
         }
         console.log(this.selectedGroupData);
       } else {
@@ -300,7 +325,10 @@ export default {
           this.filterTreeData(this.selectedGroupData);
           this.$nextTick(() => {
             // 默认选中项目
-            if(this.$route.path.indexOf("/supplierIndex") != -1 && !this.$store.state.projectSn){
+            if (
+              this.$route.path.indexOf("/supplierIndex") != -1 &&
+              !this.$store.state.projectSn
+            ) {
               this.selectProject(this.selectedGroupData[0]);
             } else {
               this.setTreeActive();
@@ -332,10 +360,14 @@ export default {
         // 收起popover
         this.visible = false;
       }
-      if (this.$route.path.indexOf("supplier") == -1) {
-        this.$router.push("/workSpace");
+      if (this.workSpaceShow) {
+        if (this.$route.path.indexOf("supplier") == -1) {
+          this.$router.push("/workSpace");
+        } else {
+          this.$router.push("/supplierIndex");
+        }
       } else {
-        this.$router.push("/supplierIndex");
+        this.$router.push("/projectIndex");
       }
     },
     filterNode(value, data) {
diff --git a/src/store/index.js b/src/store/index.js
index d3b03f03..86c30dff 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -357,4 +357,4 @@ export default new Vuex.Store({
         // sideMenu,
         // imgReview
     },
-});
\ No newline at end of file
+});
diff --git a/src/views/companyAdmin/layout.vue b/src/views/companyAdmin/layout.vue
index 81efc5a1..44656ea3 100644
--- a/src/views/companyAdmin/layout.vue
+++ b/src/views/companyAdmin/layout.vue
@@ -15,7 +15,7 @@
       <!-- <div class="title_near flex" v-if="![1,2].includes($store.state.userInfo.accountType)">
         <userChange></userChange>
       </div> -->
-      <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
+      <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType) && workSpaceShow">
         <div class="divider-line"></div>
         <centerChange></centerChange>
       </div>
@@ -74,6 +74,9 @@
 import account from "@/components/account.vue";
 import userChange from "@/components/userChange.vue";
 import centerChange from "@/components/centerChange.vue";
+import {
+  getNewUserAllModulePageApi,
+} from "@/assets/js/api/jxjadmin.js";
 export default {
   data() {
     return {
@@ -101,7 +104,8 @@ export default {
             "loginLogo": "",
             "platformLogo": "",
             "platformName": "智慧工地云平台"
-        }
+        },
+      workSpaceShow: false
     };
   },
   components:{
@@ -112,6 +116,9 @@ export default {
   created() {
     this.company = COMPANY;
     console.log(COMPANY)
+    if(this.$store.state.projectSn){
+      this.getModuleList();
+    }
   },
   mounted(){
     this.getAllModule()
@@ -123,6 +130,22 @@ export default {
     
   },
   methods: {
+    // 查询全部模块(拿到工作流的模块菜单)
+    getModuleList() {
+      getNewUserAllModulePageApi({
+        projectSn: this.$store.state.projectSn,
+        moduleType: 7,
+        userId: this.$store.state.userInfo.userId,
+      }).then((res) => {
+        let all = res.result.moduleList;
+        if (all.length == 0) {
+          this.workSpaceShow = false;
+          return;
+        } else {
+          this.workSpaceShow = true;
+        }
+      });
+    },
     hasSubMenu(list) {
       //用于判断有没有下级菜单
       let onoff = false;
diff --git a/src/views/equipmentCenter/carManage/carCameraDev.vue b/src/views/equipmentCenter/carManage/carCameraDev.vue
index d9a4ccbe..8127d1da 100644
--- a/src/views/equipmentCenter/carManage/carCameraDev.vue
+++ b/src/views/equipmentCenter/carManage/carCameraDev.vue
@@ -1,190 +1,284 @@
 <template>
-    <div class="fullHeight">
-        <div class="searchBox whiteBlock">
-            <el-button type="warning" size="medium" plain @click="refresh">{{$t('message.alarmValueSet.refresh')}}</el-button>
-            <el-button type="primary" size="medium" @click="add">{{$t('message.videoManage.add')}}</el-button>
-            <!-- <el-button
-                        type="primary"
-                        @click="initDialog=true;canCloseInitDialog=true;noEdit=true"
-                        size="medium"
-                >{{$t('message.laborDev.projectInit')}}
-            </el-button> -->
-            <!-- <span class="downloadBtn primaryText" @click="downloadFn">
+  <div class="fullHeight">
+    <div class="searchBox whiteBlock">
+      <el-button type="warning" size="medium" plain @click="refresh">{{
+        $t("message.alarmValueSet.refresh")
+      }}</el-button>
+      <el-button type="primary" size="medium" @click="add">{{
+        $t("message.videoManage.add")
+      }}</el-button>
+      <el-button
+        type="primary"
+        @click="
+          initDialog = true;
+          canCloseInitDialog = true;
+          noEdit = true;
+        "
+        size="medium"
+        >{{ $t("message.laborDev.projectInit") }}
+      </el-button>
+      <!-- <span class="downloadBtn primaryText" @click="downloadFn">
                 {{$t('message.alarmValueSet.protocolDownload')}}
             </span> -->
-        </div>
-        <div class="table_wrap whiteBlock">
-        <el-table class="tables" :data="List">
-            <el-table-column width="200" prop="cameraName" align="center"
-                             :label="$t('message.alarmValueSet.deviceName')"
-            ></el-table-column>
+    </div>
+    <div class="table_wrap whiteBlock">
+      <el-table class="tables" :data="List">
+        <el-table-column
+          width="200"
+          prop="cameraName"
+          align="center"
+          :label="$t('message.alarmValueSet.deviceName')"
+        ></el-table-column>
 
-            <el-table-column prop="cameraId" :label="$t('message.alarmValueSet.deviceId')"
-                             align="center"></el-table-column>
-            <el-table-column prop="passType" :label="$t('message.carOverview.gateInoutType')"
-                             align="center">
-                             <!-- enter 进   out  出 -->
-                <template slot-scope="scope">{{scope.row.passType===1? $t('message.alarmValueSet.enter') :scope.row.passType===2? $t('message.alarmValueSet.out') :''}}</template>
-            </el-table-column>
-            <!-- <el-table-column prop="address" width="100" :label="$t('message.alarmValueSet.address')"
+        <el-table-column
+          prop="cameraId"
+          :label="$t('message.alarmValueSet.deviceId')"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="passType"
+          :label="$t('message.carOverview.gateInoutType')"
+          align="center"
+        >
+          <!-- enter 进   out  出 -->
+          <template slot-scope="scope">{{
+            scope.row.passType === 1
+              ? $t("message.alarmValueSet.enter")
+              : scope.row.passType === 2
+              ? $t("message.alarmValueSet.out")
+              : ""
+          }}</template>
+        </el-table-column>
+        <!-- <el-table-column prop="address" width="100" :label="$t('message.alarmValueSet.address')"
                              align="center"></el-table-column>
             <el-table-column prop="realTime" width="200"
                              :label="$t('message.alarmValueSet.createTime')"
                              align="center"></el-table-column> -->
-            <el-table-column
-                    :label="$t('message.alarmValueSet.operation')" align="center">
-                <template slot-scope="scope">
-                    <div class="tableBtns">
-                        <!--<div @click="yu(scope.row)" class="operationText"><img src="@/assets/images/yu.png" alt="">{{$t('message.alarmValueSet.yjz')}}
+        <el-table-column
+          :label="$t('message.alarmValueSet.operation')"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <div class="tableBtns">
+              <!--<div @click="yu(scope.row)" class="operationText"><img src="@/assets/images/yu.png" alt="">{{$t('message.alarmValueSet.yjz')}}
                         </div>
                         <div @click="bao(scope.row)" class="operationText"><img src="@/assets/images/bao.png" alt="">{{$t('message.alarmValueSet.bjz')}}
                         </div>-->
-                        <div @click="edit(scope.row)" class="operationText">
-                            <img src="@/assets/images/icon-edit.png" width="15px" height="15px"/>
-                            <span>{{$t('message.alarmValueSet.edit')}}</span>
-                        </div>
-                        <div @click="deleteDev(scope.row)" class="operationText">
-                            <img src="@/assets/images/icon-delete.png" width="15px" height="15px"/>
-                            <span>
-                                <!-- 删除 -->
-                                {{ $t('message.alarmValueSet.delete') }}
-                            </span>
-                        </div>
-                    </div>
-                </template>
-            </el-table-column>
-        </el-table></div>
-        <!-- 项目初始化 -->
-        <el-dialog
-                   :title="$t('message.laborDev.projectInit')"
-                   :visible.sync="initDialog"
-                   width="667px"
-                   :modal-append-to-body="false"
-                   :show-close="canCloseInitDialog"
-                   :close-on-click-modal="canCloseInitDialog"
-        >
-            <div class="dialog_content">
-                <el-form
-                        size="medium"
-                        :model="beaconForm"
-                        ref="beaconForm"
-                        :rules="beaconFormRules"
-                        label-width="125px"
-                        class="dialogFormBox"
-                >
-                    <el-form-item :label="$t('message.laborDev.devTypeLabel')" prop="supplierType">
-                        <el-select
-                                v-model="beaconForm.supplierType" :disabled="noEdit"
-                                :placeholder="$t('message.personnelPosition.please_select')"
-                        >
-                            <el-option
-                                    :label="item.name"
-                                    :value="item.id"
-                                    v-for="(item,index) in devTypeList"
-                                    :key="index"
-                            ></el-option>
-                        </el-select>
-                        <el-button style=" position: absolute;right: -95px;top: 3px;" v-show="beaconForm.supplierType==4" type="primary" @click="openPlat" size="small">
-                            <!-- 打开平台 -->
-                            {{ $t('message.laborDev.openPlatform') }}
-                        </el-button>
-                    </el-form-item>
-                    <div class="dialog-footer">
-                        <!-- 取消按钮 -->
-                        <el-button
-                            type="primary"
-                            plain
-                            icon="el-icon-circle-close"
-                            @click="cancelBeaconFn"
-                            size="medium"
-                            >取消
-                        </el-button>
-                        <el-button
-                            type="primary"
-                            icon="el-icon-circle-check"
-                            @click="saveBeaconFn"
-                            size="medium"
-                            >{{$t('message.personnelPosition.determine')}}
-                        </el-button>
-                    </div>
-                </el-form>
+              <div @click="edit(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-edit.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{ $t("message.alarmValueSet.edit") }}</span>
+              </div>
+              <div @click="deleteDev(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-delete.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>
+                  <!-- 删除 -->
+                  {{ $t("message.alarmValueSet.delete") }}
+                </span>
+              </div>
             </div>
-        </el-dialog>
-        <el-dialog :modal-append-to-body="false" @close="close"
-                   :title="$t('message.alarmValueSet.Popup_title')[Popup.type]"
-                   :visible.sync="Popup.show"
-                   width="667px">
-            <div class="dialog_content">
-                <el-form v-if="Popup.type === 'add'||Popup.type === 'edit'" size="medium" :model="addEditForm"
-                         ref="addEditForm"
-                         label-width="120px" class="dialogFormBox" :rules="formRules">
-                         <!-- 项目SN -->
-                    <el-form-item :label="$t('message.alarmValueSet.projectSn')">
-                        <el-input v-model="$store.state.projectSn" disabled></el-input>
-                    </el-form-item>
-                    <el-form-item :label="$t('message.alarmValueSet.dialog_edit.deviceId')" prop="cameraId">
-                        <el-input v-model="addEditForm.cameraId"
-                                  :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
-                    </el-form-item>
-                   
-                    <el-form-item :label="$t('message.alarmValueSet.deviceName')" prop="cameraName">
-                        <el-input v-model="addEditForm.cameraName"
-                                  :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
-                    </el-form-item>
-                    <el-form-item :label="$t('message.carOverview.gateInoutType')" prop="passType">
-                        <el-radio-group v-model="addEditForm.passType">
-                            <el-radio :label="1">{{$t('message.carOverview.enterTheArena')}}</el-radio>
-                            <el-radio :label="2">{{$t('message.carOverview.enterAnArena')}}</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <!-- 冲洗摄像头 -->
-                    <el-form-item :label="$t('message.alarmValueSet.flushCamera')" >
-                        <el-select
-                             v-model="addEditForm.washVideoItemId"
-                             multiple
-                            :multiple-limit="2"
-                             style="width: 100%"
-                             :placeholder="$t('message.alarmValueSet.placeholder_select')"
-                        >
-                            <el-option v-for='item in videoList'
-                                        :key="item.itemId"
-                                        :label="item.videoName"
-                                        :value="item.itemId"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <!-- 密闭摄像头 -->
-                    <el-form-item :label="$t('message.alarmValueSet.closedCamera')" >
-                        <el-select
-                             v-model="addEditForm.airtightVideoItemId"
-                             style="width: 100%"
-                             :placeholder="$t('message.alarmValueSet.placeholder_select')"
-                        >
-                            <el-option v-for='item in videoList'
-                                        :key="item.itemId"
-                                        :label="item.videoName"
-                                        :value="item.itemId"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <!-- 报警推送人 -->
-                    <el-form-item :label="$t('message.alarmValueSet.dialog_edit.pusher')">
-                            
-                            <div v-for="(item,index) in addEditForm.pushWorker" :key="index" class="personItem">
-                                <!-- 请输入手机号 -->
-                                <el-input v-model="item.phone" :placeholder="$t('message.alarmValueSet.pleaseEnterPhoneNumber')" class="phone"></el-input>
-                                <!-- 请输入姓名 -->
-                                <el-input v-model="item.name" :placeholder="$t('message.alarmValueSet.pleaseEnterYourName')" class="name"></el-input>
-                                <i class="redText el-icon-remove" @click="operateAddPerson(1,false,index)"></i>
-                            </div>
-                            <el-button plain type="primary" size="mini" style="margin: 10px 0" @click="operateAddPerson(1,true)">
-                                <!-- 新增人员 -->
-                                {{ $t('message.alarmValueSet.newPersonnel') }}
-                            </el-button>
-                        </el-form-item>
-                    <!-- <el-form-item :label="$t('message.alarmValueSet.dialog_edit.address')" prop="devName">
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 项目初始化 -->
+    <el-dialog
+      :title="$t('message.laborDev.projectInit')"
+      :visible.sync="initDialog"
+      width="667px"
+      :modal-append-to-body="false"
+      :show-close="canCloseInitDialog"
+      :close-on-click-modal="canCloseInitDialog"
+    >
+      <div class="dialog_content">
+        <el-form
+          size="medium"
+          :model="beaconForm"
+          ref="beaconForm"
+          :rules="beaconFormRules"
+          label-width="125px"
+          class="dialogFormBox"
+        >
+          <el-form-item
+            :label="$t('message.laborDev.devTypeLabel')"
+            prop="supplierType"
+          >
+            <el-select
+              v-model="beaconForm.supplierType"
+              :disabled="noEdit"
+              :placeholder="$t('message.personnelPosition.please_select')"
+            >
+              <el-option
+                :label="item.name"
+                :value="item.id"
+                v-for="(item, index) in devTypeList"
+                :key="index"
+              ></el-option>
+            </el-select>
+            <el-button
+              style="position: absolute; right: -95px; top: 3px"
+              v-show="beaconForm.supplierType == 4"
+              type="primary"
+              @click="openPlat"
+              size="small"
+            >
+              <!-- 打开平台 -->
+              {{ $t("message.laborDev.openPlatform") }}
+            </el-button>
+          </el-form-item>
+          <div class="dialog-footer">
+            <!-- 取消按钮 -->
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-circle-close"
+              @click="cancelBeaconFn"
+              size="medium"
+              >取消
+            </el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="saveBeaconFn"
+              size="medium"
+              >{{ $t("message.personnelPosition.determine") }}
+            </el-button>
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :modal-append-to-body="false"
+      @close="close"
+      :title="$t('message.alarmValueSet.Popup_title')[Popup.type]"
+      :visible.sync="Popup.show"
+      width="667px"
+    >
+      <div class="dialog_content">
+        <el-form
+          v-if="Popup.type === 'add' || Popup.type === 'edit'"
+          size="medium"
+          :model="addEditForm"
+          ref="addEditForm"
+          label-width="120px"
+          class="dialogFormBox"
+          :rules="formRules"
+        >
+          <!-- 项目SN -->
+          <el-form-item :label="$t('message.alarmValueSet.projectSn')">
+            <el-input v-model="$store.state.projectSn" disabled></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('message.alarmValueSet.dialog_edit.deviceId')"
+            prop="cameraId"
+          >
+            <el-input
+              v-model="addEditForm.cameraId"
+              :placeholder="$t('message.alarmValueSet.placeholder')"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item
+            :label="$t('message.alarmValueSet.deviceName')"
+            prop="cameraName"
+          >
+            <el-input
+              v-model="addEditForm.cameraName"
+              :placeholder="$t('message.alarmValueSet.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('message.carOverview.gateInoutType')"
+            prop="passType"
+          >
+            <el-radio-group v-model="addEditForm.passType">
+              <el-radio :label="1">{{
+                $t("message.carOverview.enterTheArena")
+              }}</el-radio>
+              <el-radio :label="2">{{
+                $t("message.carOverview.enterAnArena")
+              }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <!-- 冲洗摄像头 -->
+          <el-form-item :label="$t('message.alarmValueSet.flushCamera')">
+            <el-select
+              v-model="addEditForm.washVideoItemId"
+              multiple
+              :multiple-limit="2"
+              style="width: 100%"
+              :placeholder="$t('message.alarmValueSet.placeholder_select')"
+            >
+              <el-option
+                v-for="item in videoList"
+                :key="item.itemId"
+                :label="item.videoName"
+                :value="item.itemId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 密闭摄像头 -->
+          <el-form-item :label="$t('message.alarmValueSet.closedCamera')">
+            <el-select
+              v-model="addEditForm.airtightVideoItemId"
+              style="width: 100%"
+              :placeholder="$t('message.alarmValueSet.placeholder_select')"
+            >
+              <el-option
+                v-for="item in videoList"
+                :key="item.itemId"
+                :label="item.videoName"
+                :value="item.itemId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 报警推送人 -->
+          <el-form-item :label="$t('message.alarmValueSet.dialog_edit.pusher')">
+            <div
+              v-for="(item, index) in addEditForm.pushWorker"
+              :key="index"
+              class="personItem"
+            >
+              <!-- 请输入手机号 -->
+              <el-input
+                v-model="item.phone"
+                :placeholder="
+                  $t('message.alarmValueSet.pleaseEnterPhoneNumber')
+                "
+                class="phone"
+              ></el-input>
+              <!-- 请输入姓名 -->
+              <el-input
+                v-model="item.name"
+                :placeholder="$t('message.alarmValueSet.pleaseEnterYourName')"
+                class="name"
+              ></el-input>
+              <i
+                class="redText el-icon-remove"
+                @click="operateAddPerson(1, false, index)"
+              ></i>
+            </div>
+            <el-button
+              plain
+              type="primary"
+              size="mini"
+              style="margin: 10px 0"
+              @click="operateAddPerson(1, true)"
+            >
+              <!-- 新增人员 -->
+              {{ $t("message.alarmValueSet.newPersonnel") }}
+            </el-button>
+          </el-form-item>
+          <!-- <el-form-item :label="$t('message.alarmValueSet.dialog_edit.address')" prop="devName">
                         <el-input v-model="addEditForm.address"
                                   :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
                     </el-form-item>
@@ -207,319 +301,344 @@
                             </el-option>
                         </el-select>
                     </el-form-item> -->
-                    <div class="dialog-footer">
-                        <el-button
-                                class="cancleBtn"
-                                @click="Popup.show = false"
-                                icon="el-icon-circle-close"
-                                size="medium"
-                        >{{$t('message.alarmValueSet.cancel')}}
-                        </el-button>
-                        <el-button
-                                type="primary"
-                                icon="el-icon-circle-check"
-                                @click="submit"
-                                size="medium"
-                        >{{$t('message.alarmValueSet.save')}}
-                        </el-button>
-                    </div>
-                </el-form>
-            </div>
-        </el-dialog>
-    </div>
+          <div class="dialog-footer">
+            <el-button
+              class="cancleBtn"
+              @click="Popup.show = false"
+              icon="el-icon-circle-close"
+              size="medium"
+              >{{ $t("message.alarmValueSet.cancel") }}
+            </el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="submit"
+              size="medium"
+              >{{ $t("message.alarmValueSet.save") }}
+            </el-button>
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 <script>
-    import {
-        addCarCameraApi,
-        editCarCameraApi,
-        deleteCarCameraApi,
-        getCarCameraListApi
-    } from '../../../assets/js/api/carManage'
-    
-    import {
-        getProjectUfaceConfigInfo,
-        projectUfaceConfigEdit
-    } from "../../../assets/js/api/laborPerson";
- import {
-    getVideoItemListApi,
-    } from "@/assets/js/api/lifter";
-    export default {
-        mounted() {
+import {
+  addCarCameraApi,
+  editCarCameraApi,
+  deleteCarCameraApi,
+  getCarCameraListApi,
+} from "../../../assets/js/api/carManage";
+
+import {
+  projectCarConfigInfoList,
+  projectCarConfigInfoEdit,
+} from "../../../assets/js/api/laborPerson";
+import { getVideoItemListApi } from "@/assets/js/api/lifter";
+export default {
+  mounted() {
+    this.getList();
+  },
+  data() {
+    return {
+      devTypeList: this.$t("message.laborDev.devTypeList"),
+      noEdit: true, //不允许配置信息
+      canCloseInitDialog: false,
+      initDialog: false,
+      beaconForm: {
+        supplierType: "",
+      },
+      beaconFormRules: {
+        supplierType: [
+          {
+            required: true,
+            message: this.$t("message.personnelPosition.required"),
+            trigger: "blur",
+          },
+        ],
+      },
+      addEditForm: {
+        cameraName: "",
+        cameraId: "",
+        passType: "",
+        pushWorker: [],
+        washVideoItemId: [],
+        airtightVideoItemId: "",
+      },
+      formRules: {
+        cameraName: [
+          {
+            required: true,
+            message: this.$t("message.personnelPosition.required"),
+            trigger: "blur",
+          },
+        ],
+        cameraId: [
+          {
+            required: true,
+            message: this.$t("message.personnelPosition.required"),
+            trigger: "blur",
+          },
+        ],
+        passType: [
+          {
+            required: true,
+            message: this.$t("message.personnelPosition.mandatory"),
+            trigger: "change",
+          },
+        ],
+      },
+      List: [],
+      Popup: {
+        type: "add",
+        show: false,
+      },
+      videoList: [],
+    };
+  },
+  created() {
+    this.getConfig();
+    this.getVideoItemList();
+  },
+  methods: {
+    getConfig() {
+      projectCarConfigInfoList({
+        projectSn: this.$store.state.projectSn,
+      }).then((result) => {
+        if (result.success) {
+          if (result.result && result.result.length) {
+            this.beaconForm = result.result[0];
+            if (this.beaconForm.housing) {
+              if (this.beaconForm.housing.indexOf(",") != -1) {
+                this.selectedHousingList = this.beaconForm.housing.split(",");
+              } else {
+                this.selectedHousingList = [this.beaconForm.housing];
+              }
+            }
+            // console.log("配置", result.result);
+            // this.selectDev = result.result.supplierType;
             this.getList();
-        },
-        data() {
-            return {
-                devTypeList: this.$t("message.laborDev.devTypeList"),
-                noEdit: true,//不允许配置信息
-                canCloseInitDialog: false,
-                initDialog: false,
-                beaconForm: {
-                    supplierType: ''
-                },
-                beaconFormRules: {
-                    supplierType: [
-                        {
-                            required: true,
-                            message: this.$t("message.personnelPosition.required"),
-                            trigger: "blur",
-                        },
-                    ]
-                },
-                addEditForm: {
-                    cameraName:'',
-                    cameraId:'',
-                    passType:'',
-                    pushWorker:[],
-                    washVideoItemId: [],
-                    airtightVideoItemId: ''
-                },
-                formRules: {
-                    cameraName: [{
-                        required: true,
-                        message: this.$t('message.personnelPosition.required'),
-                        trigger: "blur"
-                    }],cameraId: [{
-                        required: true,
-                        message: this.$t('message.personnelPosition.required'),
-                        trigger: "blur"
-                    }],passType: [{
-                        required: true,
-                        message: this.$t('message.personnelPosition.mandatory'),
-                        trigger: "change"
-                    }],
-                },
-                List: [],
-                Popup: {
-                    type: 'add',
-                    show: false
-                },
-                videoList: []
-            }
-        },
-        created(){
-            this.getConfig();
-            this.getVideoItemList()
-        },
-        methods: {
-            getConfig() {
-                getProjectUfaceConfigInfo({
-                    projectSn: this.$store.state.projectSn,
-                }).then((result) => {
-                    if (result.success) {
-                        if (!result.result) {
-                            console.log("弹窗");
-                            // this.canCloseInitDialog = true;
-                            this.noEdit = false;
-                            this.initDialog = true;
-                        } else {
-                            this.beaconForm = result.result;
-                            if(this.beaconForm.housing){
-                                if(this.beaconForm.housing.indexOf(',')!=-1){
-                                    this.selectedHousingList=this.beaconForm.housing.split(',')
-                                }else{
-                                    this.selectedHousingList=[this.beaconForm.housing]
-                                }
-                                
-                            }
-                            // console.log("配置", result.result);
-                            // this.selectDev = result.result.supplierType;
-                            this.getList();
-                        }
-                    }
-                });
-            },
-            // 取消
-            cancelBeaconFn(){
-                this.initDialog = false
-                 this.beaconForm= {
-                    supplierType: ''
-                }
-            },
-            saveBeaconFn() {
-                this.$refs["beaconForm"].validate((valid) => {
-                    if (valid) {
-                        projectUfaceConfigEdit(this.beaconForm).then((res) => {
-                            console.log('初始化设备',res)
-                            this.getConfig();//???获取配置
-                            // this.getList();
-                            this.$message.success(
-                                this.$t("message.personnelPosition.add_success")
-                            ); //添加成功
-                            this.initDialog = false;
-                        });
-                    } else {
-                        console.log("error submit!!");
-                        return false;
-                         
-                    }
-                });
-            },
-            openPlat(){
-                window.open('http://scenario.qy-rgs.com:9000/auth/page')
-            },
-             //获取摄像机列表
-            getVideoItemList() {
-                let data = {
-                    projectSn: this.$store.state.projectSn,
-                };
-                console.log(data)
-                getVideoItemListApi(data).then((res) => {
-                    if (res.code == 200) {
-                        console.log(res)
-                    this.videoList = res.result.list;
-                    }
-                });
-            },
-             downloadFn(){
-                //  车牌设备对接协议
-                // window.open('/doc/'+$t('message.alarmValueSet.licensePlateAgreement')+'.doc')
-                window.open('http://182.90.224.147:100/document/index.html#出入口车牌识别相机')
-            },
-            //操作人员的添加和删除
-            operateAddPerson(hour,isAdd,index){
-                let json = {
-                                name:'',phone:''
-                            }
-                if(isAdd){
-                    this.addEditForm.pushWorker.push(json)
-                }else{
-                    this.addEditForm.pushWorker.splice(index,1)
-                }
-                
-            },
-            handle(type, show) {//打开弹窗前的统一处理
-                this.Popup = {
-                    type: type,
-                    show: show
-                }
-            },
-            Change() {
-            },
-            add() {
-                this.handle('add', true);
-            },
-            edit(obj) {
-                console.log('编辑', obj);
-                this.addEditForm = JSON.parse(JSON.stringify(obj));
-                if(obj.washVideoItemId == "" || obj.washVideoItemId == null) {
-                    console.log('111',this.addEditForm)
-                    this.addEditForm.washVideoItemId = null
-                }else {
-                    console.log('222',this.addEditForm)
-                    this.addEditForm.washVideoItemId = JSON.parse(JSON.stringify(obj)).washVideoItemId.split(',')
-                }
-                this.addEditForm.airtightVideoItemId = this.addEditForm.airtightVideoItemId
-                if (obj.pushWorker == ''||obj.pushWorker==null) {
-                    this.addEditForm.pushWorker = [];
-                }else{
-                    this.addEditForm.pushWorker=JSON.parse(this.addEditForm.pushWorker)
-                }
-                this.handle('edit', true);
-            },
-            deleteDev(obj) {
-                console.log('删除', obj);
-                this.$confirm(this.$t('message.personnelPosition.beaconManage.table.confirmText') + "【" + obj.cameraName + "】?", this.$t('message.personnelPosition.beaconManage.table.Tips'), {
-                    confirmButtonText: this.$t('message.personnelPosition.confirmButtonText'),
-                    cancelButtonText: this.$t('message.personnelPosition.cancelButtonText'),
-                    type: "warning",
-                }).then(() => {
-                    deleteCarCameraApi({id: obj.id}).then(result => {
-                        if (result.success) {
-                            this.$message.success(result.message);
-                            this.getList();
-                        }
-                    })
-                })
-            },
-            submit() {
-                this.$refs["addEditForm"].validate((valid) => {
-                    if (valid) {
-                        let params = this.addEditForm;
-                        params.pushWorker = JSON.stringify(this.addEditForm.pushWorker);
-                        params.projectSn = this.$store.state.projectSn;
-                        params.washVideoItemId = this.addEditForm.washVideoItemId.join(',')
-                        if (this.Popup.type === 'add') {
-                            addCarCameraApi(params).then(result => {
-                                if (result.success) {
-                                    this.$message.success(result.message);
-                                    this.getList();
-                                }
-                            })
-                        } else if (this.Popup.type === 'edit') {
-                            console.log('编辑信息', this.addEditForm)
-                            editCarCameraApi(params).then(result => {
-                                if (result.success) {
-                                    this.$message.success(result.message);
-                                    this.getList();
-                                }
-                            })
-                        }
-                        this.Popup.show = false;
-                    } else {
-                        console.log("error submit!!");
-                        return false;
-                    }
-                });
-                
-            },
-            refresh() {
-                this.getList();
-            },
-            getList() {
-                getCarCameraListApi({projectSn: this.$store.state.projectSn}).then(result => {
-                    if (result.success) {
-                        this.List = result.result;
-                        console.log('列表', result);
-                    }
-                })
-            },
-            close() {
-                this.addEditForm = {
-                    cameraName:'',
-                    cameraId:'',
-                    passType:'',
-                    pushWorker:[],
-                    washVideoItemId: [],
-                    airtightVideoItemId: ''
-                }
-            }
+          } else {
+            console.log("弹窗");
+            // this.canCloseInitDialog = true;
+            this.noEdit = false;
+            this.initDialog = true;
+          }
         }
-    }
+      });
+    },
+    // 取消
+    cancelBeaconFn() {
+      this.initDialog = false;
+      this.beaconForm = {
+        supplierType: "",
+      };
+    },
+    saveBeaconFn() {
+      this.$refs["beaconForm"].validate((valid) => {
+        if (valid) {
+            let requestData = {
+                ...this.beaconForm,
+                projectSn: this.$store.state.projectSn,
+            }
+            projectCarConfigInfoEdit(requestData).then((res) => {
+            console.log("初始化设备", res);
+            this.getConfig(); //???获取配置
+            // this.getList();
+            this.$message.success(
+              this.$t("message.personnelPosition.add_success")
+            ); //添加成功
+            this.initDialog = false;
+          });
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    openPlat() {
+      window.open("http://scenario.qy-rgs.com:9000/auth/page");
+    },
+    //获取摄像机列表
+    getVideoItemList() {
+      let data = {
+        projectSn: this.$store.state.projectSn,
+      };
+      console.log(data);
+      getVideoItemListApi(data).then((res) => {
+        if (res.code == 200) {
+          console.log(res);
+          this.videoList = res.result.list;
+        }
+      });
+    },
+    downloadFn() {
+      //  车牌设备对接协议
+      // window.open('/doc/'+$t('message.alarmValueSet.licensePlateAgreement')+'.doc')
+      window.open(
+        "http://182.90.224.147:100/document/index.html#出入口车牌识别相机"
+      );
+    },
+    //操作人员的添加和删除
+    operateAddPerson(hour, isAdd, index) {
+      let json = {
+        name: "",
+        phone: "",
+      };
+      if (isAdd) {
+        this.addEditForm.pushWorker.push(json);
+      } else {
+        this.addEditForm.pushWorker.splice(index, 1);
+      }
+    },
+    handle(type, show) {
+      //打开弹窗前的统一处理
+      this.Popup = {
+        type: type,
+        show: show,
+      };
+    },
+    Change() {},
+    add() {
+      this.handle("add", true);
+    },
+    edit(obj) {
+      console.log("编辑", obj);
+      this.addEditForm = JSON.parse(JSON.stringify(obj));
+      if (obj.washVideoItemId == "" || obj.washVideoItemId == null) {
+        console.log("111", this.addEditForm);
+        this.addEditForm.washVideoItemId = null;
+      } else {
+        console.log("222", this.addEditForm);
+        this.addEditForm.washVideoItemId = JSON.parse(
+          JSON.stringify(obj)
+        ).washVideoItemId.split(",");
+      }
+      this.addEditForm.airtightVideoItemId =
+        this.addEditForm.airtightVideoItemId;
+      if (obj.pushWorker == "" || obj.pushWorker == null) {
+        this.addEditForm.pushWorker = [];
+      } else {
+        this.addEditForm.pushWorker = JSON.parse(this.addEditForm.pushWorker);
+      }
+      this.handle("edit", true);
+    },
+    deleteDev(obj) {
+      console.log("删除", obj);
+      this.$confirm(
+        this.$t("message.personnelPosition.beaconManage.table.confirmText") +
+          "【" +
+          obj.cameraName +
+          "】?",
+        this.$t("message.personnelPosition.beaconManage.table.Tips"),
+        {
+          confirmButtonText: this.$t(
+            "message.personnelPosition.confirmButtonText"
+          ),
+          cancelButtonText: this.$t(
+            "message.personnelPosition.cancelButtonText"
+          ),
+          type: "warning",
+        }
+      ).then(() => {
+        deleteCarCameraApi({ id: obj.id }).then((result) => {
+          if (result.success) {
+            this.$message.success(result.message);
+            this.getList();
+          }
+        });
+      });
+    },
+    submit() {
+      this.$refs["addEditForm"].validate((valid) => {
+        if (valid) {
+          let params = this.addEditForm;
+          params.pushWorker = JSON.stringify(this.addEditForm.pushWorker);
+          params.projectSn = this.$store.state.projectSn;
+          params.washVideoItemId = this.addEditForm.washVideoItemId.join(",");
+          if (this.Popup.type === "add") {
+            addCarCameraApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message);
+                this.getList();
+              }
+            });
+          } else if (this.Popup.type === "edit") {
+            console.log("编辑信息", this.addEditForm);
+            editCarCameraApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message);
+                this.getList();
+              }
+            });
+          }
+          this.Popup.show = false;
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    refresh() {
+      this.getList();
+    },
+    getList() {
+      getCarCameraListApi({ projectSn: this.$store.state.projectSn }).then(
+        (result) => {
+          if (result.success) {
+            this.List = result.result;
+            console.log("列表", result);
+          }
+        }
+      );
+    },
+    close() {
+      this.addEditForm = {
+        cameraName: "",
+        cameraId: "",
+        passType: "",
+        pushWorker: [],
+        washVideoItemId: [],
+        airtightVideoItemId: "",
+      };
+    },
+  },
+};
 </script>
 <style lang="less">
-    .tableBtns {
-        display: flex;
-        justify-content: center;
-    }
+.tableBtns {
+  display: flex;
+  justify-content: center;
+}
 
-    .yj-dialogFormBox {
-        width: 462px;
-    }
-    .personItem{
-        margin-top: 10px;
-        .phone{
-            width: 150px!important;
-            margin-right: 10px;
-        }
-        .name{
-            width: 100px!important;
-        }
-    }
-    .el-icon-remove{
-        font-size: 22px;
-        margin-left: 10px;
-        margin-top: 7px;
-        vertical-align: top;
-        cursor: pointer;
-    }
-    .searchBox{
-        position: relative;
-    }
-    .downloadBtn{
-        position: absolute;
-        right: 20px;
-        top: 30px;
-        text-decoration: underline;
-        cursor: pointer;
-    }
-</style>
\ No newline at end of file
+.yj-dialogFormBox {
+  width: 462px;
+}
+.personItem {
+  margin-top: 10px;
+  .phone {
+    width: 150px !important;
+    margin-right: 10px;
+  }
+  .name {
+    width: 100px !important;
+  }
+}
+.el-icon-remove {
+  font-size: 22px;
+  margin-left: 10px;
+  margin-top: 7px;
+  vertical-align: top;
+  cursor: pointer;
+}
+.searchBox {
+  position: relative;
+}
+.downloadBtn {
+  position: absolute;
+  right: 20px;
+  top: 30px;
+  text-decoration: underline;
+  cursor: pointer;
+}
+</style>
diff --git a/src/views/equipmentCenter/laborManage/devConfig.vue b/src/views/equipmentCenter/laborManage/devConfig.vue
index c580c2e8..546c1001 100644
--- a/src/views/equipmentCenter/laborManage/devConfig.vue
+++ b/src/views/equipmentCenter/laborManage/devConfig.vue
@@ -137,7 +137,7 @@
                         </el-button>
                     </el-form-item>
                     <!-- v-if="beaconForm.supplierType!=5" -->
-                    <el-form-item :label="$t('message.laborDev.appID')" v-if="beaconForm.supplierType!=5"  prop="appId" :rules='[
+                    <el-form-item :label="$t('message.laborDev.appID')" v-if="![5,7,9].includes(beaconForm.supplierType)"  prop="appId" :rules='[
                         {
                             required: true,
                             message: this.$t("message.personnelPosition.required"),
@@ -149,7 +149,7 @@
                                   :placeholder="$t('message.personnelPosition.please_enter')"
                         ></el-input>
                     </el-form-item>
-                    <el-form-item v-if="beaconForm.supplierType!=4&&beaconForm.supplierType!=6&&beaconForm.supplierType!=5" :label="$t('message.laborDev.projectAppKey')" prop="appKey" :rules='[
+                    <el-form-item v-if="![4,5,6,7,9].includes(beaconForm.supplierType)" :label="$t('message.laborDev.projectAppKey')" prop="appKey" :rules='[
                         {
                             required: true,
                             message: this.$t("message.personnelPosition.required"),
@@ -161,7 +161,7 @@
                                   :placeholder="$t('message.personnelPosition.please_enter')"
                         ></el-input>
                     </el-form-item>
-                    <el-form-item v-if="beaconForm.supplierType!=6&&beaconForm.supplierType!=5" :label="$t('message.laborDev.projectAppSecret')" prop="appSecret" :rules='[
+                    <el-form-item v-if="![5,6,7,9].includes(beaconForm.supplierType)" :label="$t('message.laborDev.projectAppSecret')" prop="appSecret" :rules='[
                         {
                             required: true,
                             message: this.$t("message.personnelPosition.required"),
diff --git a/src/views/infoCenter/layout.vue b/src/views/infoCenter/layout.vue
index f067a63f..37b69581 100644
--- a/src/views/infoCenter/layout.vue
+++ b/src/views/infoCenter/layout.vue
@@ -15,7 +15,7 @@
       <!-- <div class="title_near flex" v-if="![1,2].includes($store.state.userInfo.accountType)">
         <userChange></userChange>
       </div> -->
-      <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
+      <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType) && workSpaceShow">
         <div class="divider-line"></div>
         <centerChange></centerChange>
       </div>
@@ -83,6 +83,9 @@
 import account from "@/components/account.vue";
 import userChange from "@/components/userChange.vue";
 import centerChange from "@/components/centerChange.vue";
+import {
+  getNewUserAllModulePageApi,
+} from "@/assets/js/api/jxjadmin.js";
 export default {
   data() {
     return {
@@ -98,7 +101,8 @@ export default {
             "loginLogo": "",
             "platformLogo": "",
             "platformName": "智慧工地云平台"
-        }
+        },
+      workSpaceShow: false
     };
   },
   components:{
@@ -109,6 +113,9 @@ export default {
   created() {
     this.company = COMPANY;
     console.log(COMPANY)
+    if(this.$store.state.projectSn){
+      this.getModuleList();
+    }
   },
   mounted(){
     // this.getAllModule()
@@ -120,6 +127,22 @@ export default {
     
   },
   methods: {
+     // 查询全部模块(拿到工作流的模块菜单)
+     getModuleList() {
+      getNewUserAllModulePageApi({
+        projectSn: this.$store.state.projectSn,
+        moduleType: 7,
+        userId: this.$store.state.userInfo.userId,
+      }).then((res) => {
+        let all = res.result.moduleList;
+        if (all.length == 0) {
+          this.workSpaceShow = false;
+          return;
+        } else {
+          this.workSpaceShow = true;
+        }
+      });
+    },
     backTo(){
       this.$router.back();
     },
diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue
index 4448462d..dd04c994 100644
--- a/src/views/projectFront/carManage/carManage.vue
+++ b/src/views/projectFront/carManage/carManage.vue
@@ -23,7 +23,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="车辆下发状态">
+        <el-form-item label="车辆下发状态" v-if="isIscDevice">
           <el-select
             size="medium"
             v-model="tableParameter.sendSuccessStatus"
@@ -238,7 +238,7 @@
             <span v-else-if="scope.row.entryAndExitPermit === 1">多次</span>
           </template>
         </el-table-column>
-        <el-table-column width="120" align="center" label="车辆下发状态">
+        <el-table-column width="120" align="center" label="车辆下发状态" v-if="isIscDevice">
           <template v-slot="{ row }">
             <span
               :class="[
@@ -392,6 +392,7 @@
                         <div @click="bao(scope.row)" class="operationText"><img src="@/assets/images/bao.png" alt="">{{$t('message.alarmValueSet.bjz')}}
                         </div>-->
               <div @click="showDetail(scope.row.id)" class="operationText"
+                v-if="isIscDevice"
                 v-permission="{
                   key: 'clgl_downDetail',
                   menuPath: '/project/carManage/carManage',
@@ -1060,7 +1061,7 @@
                   </div>
                 </el-col>
                 <el-col :span="12">
-                  <div class="grid-content">
+                  <div class="grid-content" v-if="isIscDevice">
                     <span class="label">车辆下发状态：</span>
                     <span class="value">
                       <span
@@ -1245,6 +1246,7 @@ import {
   getEnterpriseInfoList,
   xmglXzHikvisionSyncGetNewestList,
   xmglXzHikvisionSyncRetryAPI,
+  projectCarConfigInfoList
 } from "@/assets/js/api/laborPerson";
 import store from "@/store";
 import mqtt from "mqtt";
@@ -1501,6 +1503,7 @@ export default {
       entityDetail: {},
       topicName: "topic",
       userId: "",
+      isIscDevice: false
     };
   },
   beforeDestroy() {
@@ -1523,7 +1526,21 @@ export default {
     client = mqtt.connect(mqttUrl, options);
     this.mqttMSG();
   },
+  created() {
+    this.getConfig();
+  },
   methods: {
+    getConfig() {
+      projectCarConfigInfoList({
+        projectSn: this.$store.state.projectSn,
+      }).then((result) => {
+        if (result.success) {
+          if (result.result && result.result.length) {
+            this.isIscDevice = result.result[0].supplierType == 9 ? true: false;
+          }
+        }
+      });
+    },
     // 监听mqtt下发信息然后刷新列表
     mqttMSG() {
       // mqtt连接   +"/#"  +workerId
diff --git a/src/views/projectFront/carManage/realTimeData.vue b/src/views/projectFront/carManage/realTimeData.vue
index 7b466fba..be8ee1e4 100644
--- a/src/views/projectFront/carManage/realTimeData.vue
+++ b/src/views/projectFront/carManage/realTimeData.vue
@@ -57,6 +57,7 @@
             >{{ $t("message.deviceManage.query") }}</el-button
           >
           <el-button
+            v-if="isIscDevice"
             v-permission="{
               key: 'clgl_synchronizeVchicleTrafficData',
               menuPath: '/project/carManage/realTimeData',
@@ -253,6 +254,9 @@ import {
   getCarPassRecordListByPageApi,
   pullCarDataApi
 } from "@/assets/js/api/carManage";
+import {
+  projectCarConfigInfoList
+} from "@/assets/js/api/laborPerson";
 export default {
   name: "historyData",
   data() {
@@ -288,14 +292,27 @@ export default {
       pageNo: 1,
       pageSize: 10,
       total: 0,
+      isIscDevice: false
     };
   },
   created() {
     this.projectSn = this.$store.state.projectSn;
     this.selectNowDate()
     this.onSubmit();
+    this.getConfig();
   },
   methods: {
+    getConfig() {
+      projectCarConfigInfoList({
+        projectSn: this.$store.state.projectSn,
+      }).then((result) => {
+        if (result.success) {
+          if (result.result && result.result.length) {
+            this.isIscDevice = result.result[0].supplierType == 9 ? true: false;
+          }
+        }
+      });
+    },
      // 确认拉取数据
      confirmPullData(){
       if(!this.timeRange || this.timeRange.length  == 0){
diff --git a/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue b/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue
index 34f7ae0a..63f2b4e5 100644
--- a/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue
+++ b/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue
@@ -90,7 +90,11 @@
           style="width: 100%; color: #737996"
           @selection-change="handleCheckedCitiesChange"
         >
-          <el-table-column prop="questionName" label="试题内容"></el-table-column>
+          <el-table-column prop="questionName" label="试题内容">
+            <template slot-scope="scope">
+              <div v-html="scope.row.questionName"></div>
+            </template>
+          </el-table-column>
           <el-table-column prop="type" width="100px" label="题目类型">
             <template slot-scope="scope">
               <div>{{ scope.row.type && typeArr[scope.row.type - 1].name }}</div>
@@ -656,7 +660,7 @@ export default {
       // + '&endReceiveTime=' + this.time[1] + '&startReceiveTime=' + this.time[0] + '&devName=' + this.devName, {
       // fetch(this.$http.defaults.baseURL + 'exam/questionBank/exportXls?&projectSn=' + this.projectSn + "&subjectId=" + this.subjectId,{
       let data = {
-        projectSn:this.projectSn,
+        projectSn:this.$store.state.projectSn,
         subjectId:this.subjectId
       }  
       fetch(this.$http.defaults.baseURL + 'exam/questionBank/exportXls',{
@@ -739,7 +743,7 @@ export default {
     },
     getExamSubjectList() {  // 获取科目类型列表
       let data = {
-        sn: this.projectSn,
+        projectSn: this.$store.state.projectSn,
       }
       // listTreeExamSubjectApi(data).then((res) => {
       listExamSubjectApi(data).then((res) => {
@@ -752,10 +756,10 @@ export default {
     //获取列表数据
     getExamSubjectTreeList() {
       let data = {
-        sn: this.$store.state.projectSn,
+        // projectSn: this.$store.state.projectSn,
       }
-      listTreeExamSubjectApi(data).then((res) => {
-      // listExamSubjectApi(data).then((res) => {
+      // listTreeExamSubjectApi(data).then((res) => {
+      listExamSubjectApi(data).then((res) => {
         if (res.code == 200) {
           this.level1CompanyData = res.result;
           console.log('11111111111111',res);
@@ -777,6 +781,7 @@ export default {
         pageSize: this.pageSize,
         questionName: this.tableParameter.name,
         subjectId: this.subjectId,
+        projectSn: this.$store.state.projectSn
       }).then((result) => {
         if (result.success) {
           console.log(result);
@@ -872,7 +877,8 @@ export default {
                 optionList:tempOptions,
                 options:this.questionForm.type == 1 ? this.questionForm.options : multiOptions,
                 score:this.questionForm.score,
-                subjectId:this.subjectId,
+                subjectId:this.questionForm.subjectId,
+                projectSn:this.$store.state.projectSn
               }).then(result => {
                   if (result.success) {
                     this.$message.success(result.message);
@@ -914,7 +920,7 @@ export default {
               options:this.questionForm.type == 1 ? option : multiOptions,
               score:this.questionForm.score,
               subjectId:this.subjectId,
-              projectSn: this.projectSn,
+              projectSn: this.$store.state.projectSn,
             }).then(result => {
                 if (result.success) {
                     console.log('信息添加成功', result);
@@ -941,7 +947,8 @@ export default {
     // 预览
     previewDialog(item) {
       detailIdQuestionBankApi({
-        id: item.id
+        id: item.id,
+        projectSn: this.$store.state.projectSn
       }).then(result => {
           if (result.success) {
             this.questionForm = result.result;
@@ -1072,7 +1079,7 @@ export default {
     refreshBtn() {
       window._paq.push(['trackEvent', '点击', '刷新', '刷新人员信息'])
       this.page = 1
-  
+
       this.tableParameter.name = ''
       // this.tableParameter.workerName = ''
       // this.tableParameter.inserviceType = ''
@@ -1144,7 +1151,8 @@ export default {
 
       moveQuestionBankApi({
         id:this.editQuestion.id,
-        subjectId:this.subjectId2
+        subjectId:this.subjectId2,
+        projectSn: this.$store.state.projectSn
       }).then(result => {
           if (result.success) {
             this.$message.success(result.message);
diff --git a/src/views/projectFront/examSystem2/subjectManagement/subjectManagement.vue b/src/views/projectFront/examSystem2/subjectManagement/subjectManagement.vue
index 1b600a2a..55588df9 100644
--- a/src/views/projectFront/examSystem2/subjectManagement/subjectManagement.vue
+++ b/src/views/projectFront/examSystem2/subjectManagement/subjectManagement.vue
@@ -139,7 +139,7 @@ export default {
     //获取列表数据
     getExamSubjectList() {
       let data = {
-        // sn: this.projectSn,
+        projectSn: this.projectSn,
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
       }
diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue
index 9ddd8b98..1eaf7c08 100644
--- a/src/views/projectFront/laborManage/personDetails.vue
+++ b/src/views/projectFront/laborManage/personDetails.vue
@@ -2812,6 +2812,8 @@ export default {
                   name: item.imageUrl.split("*")[0],
                   url: item.imageUrl.split("*")[1],
                  }];
+                } else {
+                  item.fileList = []
                 }
               }
             });
diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index 59ede25b..39248fe6 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -320,6 +320,7 @@
             >导入照片</el-button
           >
           <el-button
+            v-if="isIscDevice"
             v-permission="{
               key: 'rygl_distributeAccessEquipment',
               menuPath: '/project/labor/personManage',
@@ -425,12 +426,9 @@
                   key: 'rygl_refresh',
                   menuPath: '/project/labor/personManage',
                 }" -->
-              <el-button
-                type="warning"
-                @click="refreshBtn"
-                plain
-                >{{ $t("message.laborMange.refresh") }}</el-button
-              >
+              <el-button type="warning" @click="refreshBtn" plain>{{
+                $t("message.laborMange.refresh")
+              }}</el-button>
               <el-button
                 title="按班组导出"
                 v-permission="{
@@ -539,7 +537,7 @@
             <!-- 测试 -->
             <el-table-column prop="sendSuccessStatus">
               <template v-slot="{ row }">
-                <div>
+                <div v-if="isIscDevice">
                   下发状态：
                   <span
                     :class="[
@@ -574,6 +572,7 @@
               <template slot-scope="scope">
                 <div class="tableBtns">
                   <el-button
+                    v-if="isIscDevice"
                     v-permission="{
                       key: 'rygl_Check_Distribution',
                       menuPath: '/project/labor/personManage',
@@ -2153,7 +2152,7 @@ import {
   sendBatchWokerApi,
   importImgDataApi,
   xmglXzHikvisionSyncGetNewestList,
-  xmglXzHikvisionSyncRetryAPI,
+  xmglXzHikvisionSyncRetryAPI
 } from "@/assets/js/api/laborPerson";
 import { selectUserDevAuthorityByUserIdApi } from "@/assets/js/api/configManage";
 import { getProjectConfigListApi } from "@/assets/js/api/project.js";
@@ -2309,6 +2308,7 @@ export default {
       umentScreenUrl: "./img/logo/" + LOGO_white + ".png",
       base64Type: "data:image/jpeg;base64,",
       isUploadToHouse: false, //是否显示上传到住建局按钮
+      isIscDevice: false, //是否是海康门禁isc设备
       attendRulesList: [],
       enterpriseTypeId: "",
       enterpriseTypeList: [],
@@ -2770,6 +2770,7 @@ export default {
         if (result.success) {
           if (result.result) {
             this.isUploadToHouse = result.result.housing ? true : false;
+            this.isIscDevice = result.result.supplierType == 9 ? true: false;
           }
         }
       });
@@ -4017,6 +4018,9 @@ export default {
       });
     },
     tableRowClassName({ row, rowIndex }) {
+      if(!this.isIscDevice){
+        return
+      }
       if (row.sendSuccessStatus === 1) {
         return "green2";
       }
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index a1f19303..62f0ccb3 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -281,6 +281,7 @@
             >导入照片</el-button
           >
           <el-button
+            v-if="isIscDevice"
             v-permission="{
               key: 'rygl_distributeAccessEquipment',
               menuPath: '/project/labor/personManage',
@@ -507,7 +508,7 @@
             <!-- 测试 -->
             <el-table-column prop="sendSuccessStatus">
               <template v-slot="{ row }">
-                <div>
+                <div v-if="isIscDevice">
                   下发状态：
                   <span
                     :class="[
@@ -542,6 +543,7 @@
               <template slot-scope="scope">
                 <div class="tableBtns">
                   <el-button
+                    v-if="isIscDevice"
                     v-permission="{
                       key: 'rygl_Check_Distribution',
                       menuPath: '/project/labor/personManage',
@@ -2575,6 +2577,7 @@ export default {
       umentScreenUrl: "",
       base64Type: "data:image/jpeg;base64,",
       isUploadToHouse: false, //是否显示上传到住建局按钮
+      isIscDevice: false, //是否是海康门禁isc设备
       attendRulesList: [],
       enterpriseTypeId: "",
       cropperOption: {
@@ -2990,6 +2993,7 @@ export default {
         if (result.success) {
           if (result.result) {
             this.isUploadToHouse = result.result.housing ? true : false;
+            this.isIscDevice = result.result.supplierType == 9 ? true: false;
           }
         }
       });
@@ -4679,6 +4683,9 @@ export default {
       });
     },
     tableRowClassName({ row, rowIndex }) {
+      if(!this.isIscDevice){
+        return
+      }
       if (row.sendSuccessStatus === 1) {
         return "green2";
       }
diff --git a/src/views/projectFront/laborManage/roster.vue b/src/views/projectFront/laborManage/roster.vue
index 34ebcc39..8aa6bf2a 100644
--- a/src/views/projectFront/laborManage/roster.vue
+++ b/src/views/projectFront/laborManage/roster.vue
@@ -811,7 +811,7 @@ import {
   deleteWorkerInfoAuditApi,
   selectWorkerInfoAuditListApi,
   ufaceDevList,
-  getEnterpriseInfoList,
+  getEnterpriseInfoList
 } from "@/assets/js/api/laborPerson";
 import {
   getProjectConfigListApi,
@@ -908,7 +908,7 @@ export default {
       selectCompanyData: [],
       itemSelectId: "",
       disabledArr: [],
-      company: "",
+      company: ""
     };
   },
   computed: {
diff --git a/src/views/projectFront/laborManage/rosterNew.vue b/src/views/projectFront/laborManage/rosterNew.vue
index 8a85fdda..208eb47f 100644
--- a/src/views/projectFront/laborManage/rosterNew.vue
+++ b/src/views/projectFront/laborManage/rosterNew.vue
@@ -109,7 +109,7 @@
               v-model="tableParameter.idCard"
             ></el-input>
           </el-form-item>
-          <el-form-item label="人员下发状态">
+          <el-form-item label="人员下发状态" v-if="isIscDevice">
             <el-select
               size="medium"
               v-model="tableParameter.sendSuccessStatus"
@@ -362,7 +362,7 @@
           <el-table-column align="lfet">
             <template v-slot="{ row }">
               <div>
-                <div>
+                <div v-if="isIscDevice">
                   下发状态：
                   <span
                     :class="[
@@ -400,6 +400,7 @@
             <template slot-scope="scope">
               <div class="tableBtns">
                 <el-button
+                  v-if="isIscDevice"
                   v-permission="{
                     key: 'hmc_ckxfxq',
                     menuPath: '/project/labor/roster',
@@ -974,6 +975,7 @@ import {
   getWorkerInfoList,
   xmglXzHikvisionSyncGetNewestList,
   xmglXzHikvisionSyncRetryAPI,
+  getProjectUfaceConfigInfo,
 } from "@/assets/js/api/laborPerson";
 import {
   getProjectConfigListApi,
@@ -1084,6 +1086,7 @@ export default {
         pageSize: 10,
       },
       whoId: "",
+      isIscDevice: false
     };
   },
   computed: {
@@ -1119,8 +1122,20 @@ export default {
     this.getInfoList();
     this.getProjectList();
     this.getProjectSetting();
+    this.getConfig();
   },
   methods: {
+    getConfig() {
+      getProjectUfaceConfigInfo({
+        projectSn: this.$store.state.projectSn,
+      }).then((result) => {
+        if (result.success) {
+          if (result.result) {
+            this.isIscDevice = result.result.supplierType == 9 ? true: false;
+          }
+        }
+      });
+    },
     // 人员录入关闭
     comboFormClose() {
       this.comboFormVisible = false;
@@ -1532,6 +1547,9 @@ export default {
       });
     },
     tableRowClassName({ row, rowIndex }) {
+      if(!this.isIscDevice){
+        return
+      }
       if (row.sendSuccessStatus === 1) {
         return "green2";
       }
diff --git a/src/views/supplierAdmin/layout.vue b/src/views/supplierAdmin/layout.vue
index eeae7748..4b391dbc 100644
--- a/src/views/supplierAdmin/layout.vue
+++ b/src/views/supplierAdmin/layout.vue
@@ -15,7 +15,7 @@
       <!-- <div class="title_near flex" v-if="![1,2].includes($store.state.userInfo.accountType)">
         <userChange></userChange>
       </div> -->
-      <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
+      <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType) && workSpaceShow">
         <div class="divider-line"></div>
         <centerChange></centerChange>
       </div>
@@ -107,6 +107,9 @@ import userChange from "@/components/userChange.vue";
 import centerChange from "@/components/centerChange.vue";
 import { getGroupListByCompanyApi, jumpLargeUserInfoApi } from "@/assets/js/api/loginSign.js";
 import { getProjectDetail } from "@/assets/js/api/baseInfo.js";
+import {
+  getNewUserAllModulePageApi,
+} from "@/assets/js/api/jxjadmin.js";
 export default {
   data() {
     return {
@@ -124,7 +127,7 @@ export default {
             "platformLogo": "",
             "platformName": "智慧工地云平台"
         },
-        projectSn: ""
+      workSpaceShow: false
     };
   },
   components:{
@@ -140,6 +143,9 @@ export default {
     this.getGroupTreeData();
     this.company = COMPANY;
     console.log(COMPANY)
+    if(this.$store.state.projectSn){
+      this.getModuleList();
+    }
   },
   mounted(){
     // this.getAllModule()
@@ -151,6 +157,22 @@ export default {
     
   },
   methods: {
+    // 查询全部模块(拿到工作流的模块菜单)
+    getModuleList() {
+      getNewUserAllModulePageApi({
+        projectSn: this.$store.state.projectSn,
+        moduleType: 7,
+        userId: this.$store.state.userInfo.userId,
+      }).then((res) => {
+        let all = res.result.moduleList;
+        if (all.length == 0) {
+          this.workSpaceShow = false;
+          return;
+        } else {
+          this.workSpaceShow = true;
+        }
+      });
+    },
     //获取详情
     getDataDateils() {
       let data = {
diff --git a/src/views/userCenter/layout.vue b/src/views/userCenter/layout.vue
index 59cdceb1..bd617447 100644
--- a/src/views/userCenter/layout.vue
+++ b/src/views/userCenter/layout.vue
@@ -15,7 +15,7 @@
       <!-- <div class="title_near flex" v-if="![1,2].includes($store.state.userInfo.accountType)">
         <userChange></userChange>
       </div> -->
-      <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
+      <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType) && workSpaceShow">
         <div class="divider-line"></div>
         <centerChange></centerChange>
       </div>
@@ -83,6 +83,9 @@
 import account from "@/components/account.vue";
 import userChange from "@/components/userChange.vue";
 import centerChange from "@/components/centerChange.vue";
+import {
+  getNewUserAllModulePageApi,
+} from "@/assets/js/api/jxjadmin.js";
 export default {
   data() {
     return {
@@ -96,7 +99,8 @@ export default {
             "loginLogo": "",
             "platformLogo": "",
             "platformName": "智慧工地云平台"
-        }
+        },
+      workSpaceShow: false
     };
   },
   components:{
@@ -107,6 +111,9 @@ export default {
   created() {
     this.company = COMPANY;
     console.log(COMPANY)
+    if(this.$store.state.projectSn){
+      this.getModuleList();
+    }
   },
   mounted(){
     // this.getAllModule()
@@ -115,9 +122,24 @@ export default {
     }
     document.title='企业后台'
     console.log('mounted',this.$route.path)
-    
   },
   methods: {
+    // 查询全部模块(拿到工作流的模块菜单)
+    getModuleList() {
+      getNewUserAllModulePageApi({
+        projectSn: this.$store.state.projectSn,
+        moduleType: 7,
+        userId: this.$store.state.userInfo.userId,
+      }).then((res) => {
+        let all = res.result.moduleList;
+        if (all.length == 0) {
+          this.workSpaceShow = false;
+          return;
+        } else {
+          this.workSpaceShow = true;
+        }
+      });
+    },
     backTo(){
       this.$router.back();
     },
diff --git a/src/views/workSpace/index.vue b/src/views/workSpace/index.vue
index 069de5a2..d6e31be3 100644
--- a/src/views/workSpace/index.vue
+++ b/src/views/workSpace/index.vue
@@ -183,6 +183,7 @@ export default {
         let all = res.result.moduleList;
         if (all.length == 0) {
           this.workSpaceShow = false;
+          this.$router.push("/projectIndex")
           return;
         } else {
           this.workSpaceShow = false;