diff --git a/src/assets/images/emailIcon.png b/src/assets/images/emailIcon.png
new file mode 100644
index 00000000..9663be01
Binary files /dev/null and b/src/assets/images/emailIcon.png differ
diff --git a/src/assets/images/enterpriseIcon.png b/src/assets/images/enterpriseIcon.png
new file mode 100644
index 00000000..7f958689
Binary files /dev/null and b/src/assets/images/enterpriseIcon.png differ
diff --git a/src/assets/images/tableIcon/auditPassIcon.png b/src/assets/images/tableIcon/auditPassIcon.png
new file mode 100644
index 00000000..f9262953
Binary files /dev/null and b/src/assets/images/tableIcon/auditPassIcon.png differ
diff --git a/src/assets/images/tableIcon/noPassIcon.png b/src/assets/images/tableIcon/noPassIcon.png
new file mode 100644
index 00000000..024c6a0a
Binary files /dev/null and b/src/assets/images/tableIcon/noPassIcon.png differ
diff --git a/src/assets/images/tableIcon/relativeIcon.png b/src/assets/images/tableIcon/relativeIcon.png
new file mode 100644
index 00000000..00534200
Binary files /dev/null and b/src/assets/images/tableIcon/relativeIcon.png differ
diff --git a/src/assets/images/userNameIcon.png b/src/assets/images/userNameIcon.png
new file mode 100644
index 00000000..aa42eeb7
Binary files /dev/null and b/src/assets/images/userNameIcon.png differ
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 10ede28b..1b2b505a 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -73,7 +73,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://101.43.164.214:12350/'//中建五局线上
   // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
   // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式
-  axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/·
+  // axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/·
   // axios.defaults.baseURL ='http://192.168.34.221:8188/' //郭圣雄本地
   // axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地
   // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
@@ -83,7 +83,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+  axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
diff --git a/src/components/closePage.vue b/src/components/closePage.vue
index ad7faf78..81ca4da7 100644
--- a/src/components/closePage.vue
+++ b/src/components/closePage.vue
@@ -33,7 +33,7 @@ export default {
       // })
 
       if ( this.styleType != 3 && this.$route.path.indexOf('/project/dataBoard') != -1 ||
-      this.$route.path.indexOf('/project/videoOverview') != -1 || this.$route.path.indexOf('/project/environmentalOverview') != -1 ||
+      this.$route.path.indexOf('/project/videoOverview') != -1 || this.$route.path.indexOf('/project/replayVideo') != -1 || this.$route.path.indexOf('/project/environmentalOverview') != -1 ||
        this.$route.path.indexOf('/project/projectSummary') != -1 || this.$route.path.indexOf('/project/imgRanging') != -1 || 
        this.$route.path.indexOf('/project/warningManage') != -1 ) {
         console.log(window.location.href.split('#/')[0] + '#/projectIndex')
diff --git a/src/router/index.js b/src/router/index.js
index 4b6eaaee..37b22b21 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -20,7 +20,8 @@ const routes2 = [
     path: "/login",
     name: "login",
     // component: () => import('../views/home/login.vue')
-    component: () => import("../views/home/login_v1.vue"),
+    // component: () => import("../views/home/login_v1.vue"),
+    component: () => import("../views/home/login_v2.vue"),
   },
   {
     path: "/sign",
diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue
index 99aac144..f9117875 100644
--- a/src/views/companyAdmin/companyDiagram.vue
+++ b/src/views/companyAdmin/companyDiagram.vue
@@ -8,7 +8,7 @@
             v-if="
               ($store.state.userInfo.addProjectType == 1 &&
                 $store.state.userInfo.accountType != 7) ||
-              $store.state.userInfo.addProjectType == 0
+                $store.state.userInfo.addProjectType == 0
             "
             class="plusBtn"
             @click="
@@ -69,7 +69,7 @@
           </vue-scroll>
           <div class="placeholderBox" v-else>
             <img src="@/assets/images/noData2.png" alt="" srcset="" />
-            <p>{{ $t('message.videoManage.empty') }}</p>
+            <p>{{ $t("message.videoManage.empty") }}</p>
           </div>
         </div>
       </div>
@@ -138,13 +138,17 @@
                   >
                     <el-button size="small" type="primary">上传账号</el-button>
                   </div>
+                  <div @click="editGroup(scope.row)" class="operationText">
+                    <i class="el-icon-s-operation"></i>
+                    <span>调整组织</span>
+                  </div>
                   <div @click="editAccountFn(scope.row)" class="operationText">
                     <img
                       src="@/assets/images/icon-edit.png"
                       width="15px"
                       height="15px"
                     />
-                    <span>{{ $t('message.deviceManage.edit') }}</span>
+                    <span>{{ $t("message.deviceManage.edit") }}</span>
                   </div>
                   <div
                     @click="deleteAccountFn(scope.row)"
@@ -155,7 +159,7 @@
                       width="15px"
                       height="15px"
                     />
-                    <span>{{ $t('message.deviceManage.delete') }}</span>
+                    <span>{{ $t("message.deviceManage.delete") }}</span>
                   </div>
                 </div>
               </template>
@@ -190,7 +194,7 @@
                       width="15px"
                       height="15px"
                     />
-                    <span>{{ $t('message.deviceManage.edit') }}</span>
+                    <span>{{ $t("message.deviceManage.edit") }}</span>
                   </div>
                   <div @click="deleteJobFn(scope.row)" class="operationText">
                     <img
@@ -198,7 +202,137 @@
                       width="15px"
                       height="15px"
                     />
-                    <span>{{ $t('message.deviceManage.delete') }}</span>
+                    <span>{{ $t("message.deviceManage.delete") }}</span>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="新用户审核" name="third">
+          <el-table class="tables" :data="level1AccountData">
+            <el-table-column
+              prop="jobName"
+              align="center"
+              label="账号"
+            ></el-table-column>
+            <el-table-column
+              prop="jobDuty"
+              label="密码"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="jobDuty"
+              label="电子邮箱"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="jobDuty"
+              label="注册时间"
+              align="center"
+            ></el-table-column>
+            <el-table-column :label="$t('message.deviceManage.operation')">
+              <template slot-scope="scope">
+                <div class="tableBtns">
+                  <!-- <div @click="auditPass(scope.row)" class="operationText">
+                    <img
+                      src="@/assets/images/tableIcon/auditPassIcon.png"
+                      width="15px"
+                      height="15px"
+                    />
+                    <span>审批通过</span>
+                  </div>
+                  <div @click="noPassFn(scope.row)" class="operationText">
+                    <img
+                      src="@/assets/images/tableIcon/noPassIcon.png"
+                      width="15px"
+                      height="15px"
+                    />
+                    <span>拒绝申请</span>
+                  </div> -->
+                  <div
+                    @click="relativeGroupFn(scope.row)"
+                    class="operationText"
+                  >
+                    <img
+                      src="@/assets/images/tableIcon/relativeIcon.png"
+                      width="15px"
+                      height="15px"
+                    />
+                    <span>关联组织</span>
+                  </div>
+                  <div @click="deleteJobFn(scope.row)" class="operationText">
+                    <img
+                      src="@/assets/images/icon-delete.png"
+                      width="15px"
+                      height="15px"
+                    />
+                    <span>{{ $t("message.deviceManage.delete") }}</span>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="供应商审核" name="four">
+          <el-table class="tables" :data="level1AccountData">
+            <el-table-column
+              prop="jobName"
+              align="center"
+              label="账号"
+            ></el-table-column>
+            <el-table-column
+              prop="jobDuty"
+              label="密码"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="jobDuty"
+              label="电子邮箱"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="jobDuty"
+              label="注册时间"
+              align="center"
+            ></el-table-column>
+            <el-table-column :label="$t('message.deviceManage.operation')">
+              <template slot-scope="scope">
+                <div class="tableBtns">
+                  <!-- <div @click="auditPass(scope.row)" class="operationText">
+                    <img
+                      src="@/assets/images/tableIcon/auditPassIcon.png"
+                      width="15px"
+                      height="15px"
+                    />
+                    <span>审批通过</span>
+                  </div>
+                  <div @click="noPassFn(scope.row)" class="operationText">
+                    <img
+                      src="@/assets/images/tableIcon/noPassIcon.png"
+                      width="15px"
+                      height="15px"
+                    />
+                    <span>拒绝申请</span>
+                  </div> -->
+                  <div
+                    @click="relativeGroupFn(scope.row)"
+                    class="operationText"
+                  >
+                    <img
+                      src="@/assets/images/tableIcon/relativeIcon.png"
+                      width="15px"
+                      height="15px"
+                    />
+                    <span>关联组织</span>
+                  </div>
+                  <div @click="deleteJobFn(scope.row)" class="operationText">
+                    <img
+                      src="@/assets/images/icon-delete.png"
+                      width="15px"
+                      height="15px"
+                    />
+                    <span>{{ $t("message.deviceManage.delete") }}</span>
                   </div>
                 </div>
               </template>
@@ -244,7 +378,7 @@
                 <el-link type="primary" @click="toGetLocalFn">
                   {{
                     $t(
-                      'message.companyDiagram.dialog_ProjectPop_up.coordinatePicking'
+                      "message.companyDiagram.dialog_ProjectPop_up.coordinatePicking"
                     )
                   }}
                 </el-link>
@@ -330,14 +464,14 @@
             @click="addCompanyDialog = false"
             icon="el-icon-circle-close"
             size="medium"
-            >{{ $t('message.companyDiagram.cancel') }}
+            >{{ $t("message.companyDiagram.cancel") }}
           </el-button>
           <el-button
             type="primary"
             icon="el-icon-circle-check"
             @click="saveCompanyFn"
             size="medium"
-            >{{ $t('message.companyDiagram.determine') }}
+            >{{ $t("message.companyDiagram.determine") }}
           </el-button>
         </div>
       </div>
@@ -435,14 +569,14 @@
             @click="addAccountDialog = false"
             icon="el-icon-circle-close"
             size="medium"
-            >{{ $t('message.companyDiagram.cancel') }}
+            >{{ $t("message.companyDiagram.cancel") }}
           </el-button>
           <el-button
             type="primary"
             icon="el-icon-circle-check"
             @click="saveAccountFn"
             size="medium"
-            >{{ $t('message.companyDiagram.determine') }}
+            >{{ $t("message.companyDiagram.determine") }}
           </el-button>
         </div>
       </div>
@@ -535,7 +669,7 @@
                 <el-link type="primary" @click="toGetLocalFn">
                   {{
                     $t(
-                      'message.companyDiagram.dialog_ProjectPop_up.coordinatePicking'
+                      "message.companyDiagram.dialog_ProjectPop_up.coordinatePicking"
                     )
                   }}
                 </el-link>
@@ -608,7 +742,7 @@
               :placeholder="$t('message.companyDiagram.PleaseSelect')"
             >
               <el-option
-              v-for="item in structureTypeList"
+                v-for="item in structureTypeList"
                 :key="item.data"
                 :label="item.name"
                 :value="Number(item.data)"
@@ -829,14 +963,14 @@
               @click="addProjectDialog = false"
               icon="el-icon-circle-close"
               size="medium"
-              >{{ $t('message.companyDiagram.cancel') }}
+              >{{ $t("message.companyDiagram.cancel") }}
             </el-button>
             <el-button
               type="primary"
               icon="el-icon-circle-check"
               @click="saveProjectFn"
               size="medium"
-              >{{ $t('message.companyDiagram.determine') }}
+              >{{ $t("message.companyDiagram.determine") }}
             </el-button>
           </div>
         </el-form>
@@ -986,14 +1120,121 @@
             @click="addJobDialog = false"
             icon="el-icon-circle-close"
             size="medium"
-            >{{ $t('message.companyDiagram.cancel') }}
+            >{{ $t("message.companyDiagram.cancel") }}
           </el-button>
           <el-button
             type="primary"
             icon="el-icon-circle-check"
             @click="saveJobFn"
             size="medium"
-            >{{ $t('message.companyDiagram.determine') }}
+            >{{ $t("message.companyDiagram.determine") }}
+          </el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <!-- 调整组织 -->
+    <el-dialog
+      title="调整组织"
+      :visible.sync="editGroupDialog"
+      :modal-append-to-body="false"
+      width="667px"
+    >
+      <div class="dialog_content">
+        <el-form
+          size="medium"
+          :model="editGroupForm"
+          ref="editGroupForm"
+          label-width="110px"
+        >
+          <el-form-item label="调整至" prop="groupId">
+            <div class="select-content">
+              <div class="tip-text" @click="isSelectCompany = !isSelectCompany">
+                <span>{{ selectTree.label || "请选择" }}</span>
+                <i class="el-icon-arrow-down" v-show="!isSelectCompany"></i>
+                <i class="el-icon-arrow-up" v-show="isSelectCompany"></i>
+              </div>
+              <div class="select-list" v-if="isSelectCompany">
+                <el-input
+                  placeholder="输入关键字进行过滤"
+                  v-model="filterText"
+                  style="width: 98%;margin: 0 5px;"
+                >
+                </el-input>
+                <el-tree
+                  :data="treeData"
+                  :props="selectTreeProps"
+                  node-key="id"
+                  ref="tree"
+                  :filter-node-method="filterNode"
+                  :highlight-current="true"
+                  :check-on-click-node="true"
+                  @node-click="treeClick"
+                  style="margin:10px 5px;"
+                ></el-tree>
+              </div>
+            </div>
+          </el-form-item>
+        </el-form>
+        <div class="dialog-footer">
+          <el-button
+            class="cancleBtn"
+            @click="editGroupDialog = false"
+            icon="el-icon-circle-close"
+            size="medium"
+            >{{ $t("message.companyDiagram.cancel") }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            @click="saveAccountFn"
+            size="medium"
+            >{{ $t("message.companyDiagram.determine") }}
+          </el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <!-- 关联组织 -->
+    <el-dialog
+      title="关联组织"
+      :visible.sync="relativeGroupDialog"
+      :modal-append-to-body="false"
+      width="667px"
+    >
+      <div class="dialog_content">
+        <div>
+          <el-input
+            placeholder="输入关键字进行过滤"
+            v-model="filterText"
+            style="width: 98%;margin: 0 5px;"
+          >
+          </el-input>
+          <el-tree
+            :data="treeData"
+            :props="selectTreeProps"
+            node-key="id"
+            ref="tree"
+            show-checkbox
+            :filter-node-method="filterNode"
+            :highlight-current="true"
+            :check-on-click-node="true"
+            @node-click="treeClick"
+            style="margin:10px 5px;"
+          ></el-tree>
+        </div>
+        <div class="dialog-footer">
+          <el-button
+            class="cancleBtn"
+            @click="relativeGroupDialog = false"
+            icon="el-icon-circle-close"
+            size="medium"
+            >{{ $t("message.companyDiagram.cancel") }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            @click="saveAccountFn"
+            size="medium"
+            >{{ $t("message.companyDiagram.determine") }}
           </el-button>
         </div>
       </div>
@@ -1001,7 +1242,7 @@
   </div>
 </template>
 <script>
-import gdMap from '../../components/map/gd-map'
+import gdMap from "../../components/map/gd-map";
 import {
   getCompanyProjectListApi,
   addCompanyApi,
@@ -1014,59 +1255,57 @@ import {
   deleteorganizationJobApi,
   getorganizationJobListApi,
   sendSafetyHatAccountDataApi,
-  getDictionaryItemApi
-} from '@/assets/js/api/companyDiagram.js'
-import { getComapnyStatisticsListApi } from '@/assets/js/api/company/project'
+  getDictionaryItemApi,
+} from "@/assets/js/api/companyDiagram.js";
+import { getComapnyStatisticsListApi } from "@/assets/js/api/company/project";
 import {
   addSystemUserApi,
   editSystemUserApi,
   deleteSystemUserApi,
-  getSystemUserBySnApi
-} from '@/assets/js/api/account.js'
+  getSystemUserBySnApi,
+} from "@/assets/js/api/account.js";
 import {
   getProjectListApi,
   addProjectApi,
   deleteProjectApi,
   editProjectApi,
-  selectProvincesCityListApi
-} from '@/assets/js/api/project.js'
+  selectProvincesCityListApi,
+} from "@/assets/js/api/project.js";
 import {
   getCompanyModuleList,
   getProjectModuleList,
   baseModuleProjectEdit,
   getUserModuleList,
-  baseModuleUserEdit
-} from '@/assets/js/api/jxjadmin'
-import axios from 'axios'
-import {
-  checkPhone
-} from '@/assets/js/util.js'
+  baseModuleUserEdit,
+} from "@/assets/js/api/jxjadmin";
+import axios from "axios";
+import { checkPhone } from "@/assets/js/util.js";
 export default {
   components: {
-    gdMap
+    gdMap,
   },
   data() {
     var checkAge = (rule, value, callback) => {
-      if (value == '' && value != 0) {
-        callback(new Error(this.$t('message.companyDiagram.required')))
-        return
+      if (value == "" && value != 0) {
+        callback(new Error(this.$t("message.companyDiagram.required")));
+        return;
       }
       if (!Number.isInteger(value)) {
-        callback(new Error(this.$t('message.companyDiagram.required_msg')))
+        callback(new Error(this.$t("message.companyDiagram.required_msg")));
       } else {
-        callback()
+        callback();
       }
-    }
+    };
     return {
       COMPANY: COMPANY,
-      projectType2: '', //全局的项目类型 （eg:hengqin）
+      projectType2: "", //全局的项目类型 （eg:hengqin）
       yiCheckArr: [],
       yiCheckOptions: [],
       projectCheckArr: [],
       projectOptions: [],
       authorizedConfig: {
-        type: '',
-        show: false
+        type: "",
+        show: false,
       },
       checkAll: false,
       isIndeterminate: false,
@@ -1085,83 +1324,84 @@ export default {
       projectIndex: 0,
       projectAccountData: [],
       searchForm: {
-        projectName: '',
-        sn: ''
+        projectName: "",
+        sn: "",
       },
-      searchProject: '',
+      searchProject: "",
       addCompanyForm: {
-        companyName: '',
-        companyTel: '',
+        companyName: "",
+        companyTel: "",
         companyType: 2, //1总部，2区域，3城市
-        headquartersSn: '',
+        headquartersSn: "",
         parentId: 0,
-        longitude: '',
-        latitude: '',
-        rangeAddr: '',
-        editType: 1
+        longitude: "",
+        latitude: "",
+        rangeAddr: "",
+        editType: 1,
       },
       addCompanyFormRules: {
         companyName: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'), //必填
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"), //必填
+            trigger: "blur",
+          },
         ],
         longitude: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
         ],
         latitude: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
-        ]
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
+        ],
       },
       addCompanyDialog: false,
-      dialogTitle: this.$t('message.companyDiagram.addManagementTitle1'), //添加一级管理机构
+      dialogTitle: this.$t("message.companyDiagram.addManagementTitle1"), //添加一级管理机构
       isAdd: true, //是否是添加
-      accountDialogTitle: '添加成员', //添加账号
+      accountDialogTitle: "添加成员", //添加账号
       addAccountDialog: false,
       addAccountForm: {
-        account: '',
+        account: "",
         accountType: 3, //1系统管理员，2企业总部管理员账号,3区域账号，4城市账号，5项目账号
-        department: '',
-        password: '',
-        realName: '',
-        sn: '',
-        userTel: '',
-        jobId: '',
-        externalAccount: ''
+        department: "",
+        password: "",
+        realName: "",
+        sn: "",
+        userTel: "",
+        jobId: "",
+        externalAccount: "",
       },
       addAccountFormRules: {
         account: [
           {
             required: true,
             message: this.$t(
-              'message.companyDiagram.dialog_Account_box.message'
+              "message.companyDiagram.dialog_Account_box.message"
             ),
-            trigger: 'blur'
-          }
+            trigger: "blur",
+          },
         ],
         password: [
           {
             required: true,
             message: this.$t(
-              'message.companyDiagram.dialog_Account_box.message'
+              "message.companyDiagram.dialog_Account_box.message"
             ),
-            trigger: 'blur'
+            trigger: "blur",
           },
           {
             pattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+~`\-={}[\]:";'<>?,./])[a-zA-Z\d!@#$%^&*()_+~`\-={}[\]:";'<>?,./]{8,}$/,
-            message: '密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数',
-            trigger: 'blur'
-          }
+            message:
+              "密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数",
+            trigger: "blur",
+          },
         ],
         showPassword: [
           {
@@ -1171,206 +1411,207 @@ export default {
           },
           {
             pattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+~`\-={}[\]:";'<>?,./])[a-zA-Z\d!@#$%^&*()_+~`\-={}[\]:";'<>?,./]{8,}$/,
-            message: '密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数',
-            trigger: 'blur'
-          }
+            message:
+              "密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数",
+            trigger: "blur",
+          },
         ],
       },
-      projectDialogTitle: '',
+      projectDialogTitle: "",
       addProjectDialog: false,
       addProjectForm: {
-        placeCode: '',
-        areaCode: '',
-        buildingNum: '',
-        bulidStatus: '',
-        cityCode: '',
-        companySn: '',
-        constructionStage: '',
-        engineeringPurpose: '',
-        households: '',
-        latitude: '',
-        layoutImage: '',
-        longitude: '',
-        projectAcreage: '',
-        projectAddress: '',
-        projectName: '',
-        projectNumber: '',
-        projectType: '',
-        provincesCode: '',
-        saleAcreage: '',
-        startWorkDate: '',
-        structureType: '',
-        projectManage: '',
-        projectTel: '',
+        placeCode: "",
+        areaCode: "",
+        buildingNum: "",
+        bulidStatus: "",
+        cityCode: "",
+        companySn: "",
+        constructionStage: "",
+        engineeringPurpose: "",
+        households: "",
+        latitude: "",
+        layoutImage: "",
+        longitude: "",
+        projectAcreage: "",
+        projectAddress: "",
+        projectName: "",
+        projectNumber: "",
+        projectType: "",
+        provincesCode: "",
+        saleAcreage: "",
+        startWorkDate: "",
+        structureType: "",
+        projectManage: "",
+        projectTel: "",
         majorProjectType: 0,
-        constructionPermit: '',
-        streetTownshipTownCode: '',
-        streetTownshipTown: ''
+        constructionPermit: "",
+        streetTownshipTownCode: "",
+        streetTownshipTown: "",
       },
       addProjectFormRules: {
         streetTownshipTown: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
         ],
         streetTownshipTownCode: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
         ],
         constructionPermit: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
         ],
         projectName: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
         ],
         provincesCode: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.Mandatory'),
-            trigger: 'change'
-          }
+            message: this.$t("message.companyDiagram.Mandatory"),
+            trigger: "change",
+          },
         ],
         projectAddress: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
         ],
         projectManage: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
         ],
         projectTel: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
         ],
         longitude: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
         ],
         latitude: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
         ],
         projectNumber: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
         ],
         projectType: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.Mandatory'),
-            trigger: 'change'
-          }
+            message: this.$t("message.companyDiagram.Mandatory"),
+            trigger: "change",
+          },
         ],
         engineeringPurpose: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.Mandatory'),
-            trigger: 'change'
-          }
+            message: this.$t("message.companyDiagram.Mandatory"),
+            trigger: "change",
+          },
         ],
         structureType: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.Mandatory'),
-            trigger: 'change'
-          }
+            message: this.$t("message.companyDiagram.Mandatory"),
+            trigger: "change",
+          },
         ],
         projectAcreage: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.companyDiagram.required"),
+            trigger: "blur",
+          },
         ],
         bulidStatus: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.Mandatory'),
-            trigger: 'change'
-          }
+            message: this.$t("message.companyDiagram.Mandatory"),
+            trigger: "change",
+          },
         ],
         startWorkDate: [
           {
             required: true,
-            message: this.$t('message.companyDiagram.Mandatory'),
-            trigger: 'change'
-          }
+            message: this.$t("message.companyDiagram.Mandatory"),
+            trigger: "change",
+          },
         ],
-        households: [{ required: true, validator: checkAge, trigger: 'blur' }],
-        buildingNum: [{ required: true, validator: checkAge, trigger: 'blur' }]
+        households: [{ required: true, validator: checkAge, trigger: "blur" }],
+        buildingNum: [{ required: true, validator: checkAge, trigger: "blur" }],
       },
       provincesCityList: [],
       cascaderProps: {
-        label: 'name',
-        children: 'childrenlist',
-        value: 'code'
+        label: "name",
+        children: "childrenlist",
+        value: "code",
       },
       provincesCityArr: [],
       bigImageDialog: false,
-      bigImageUrl: '',
+      bigImageUrl: "",
       defaultProps: {
-        children: 'list',
-        label: 'name'
+        children: "list",
+        label: "name",
       },
-      tabActiveName: 'first',
+      tabActiveName: "first",
       treeSelectData: {},
       addJobForm: {
-        jobName: '',
-        jobDuty: '',
-        sn: ''
+        jobName: "",
+        jobDuty: "",
+        sn: "",
       },
       addJobDialog: false,
-      jobDialogTitle: '',
+      jobDialogTitle: "",
       addJobFormRules: {
         jobName: [
           {
             required: true,
             message: this.$t(
-              'message.companyDiagram.dialog_Account_box.message'
+              "message.companyDiagram.dialog_Account_box.message"
             ),
-            trigger: 'blur'
-          }
+            trigger: "blur",
+          },
         ],
         jobDuty: [
           {
             required: true,
             message: this.$t(
-              'message.companyDiagram.dialog_Account_box.message'
+              "message.companyDiagram.dialog_Account_box.message"
             ),
-            trigger: 'blur'
-          }
-        ]
+            trigger: "blur",
+          },
+        ],
       },
       jobList: [],
       selectProvince: [],
@@ -1378,427 +1619,444 @@ export default {
       options: [
         {
           id: 1,
-          label: '河南省',
-          value: '河南省'
+          label: "河南省",
+          value: "河南省",
         },
         {
           id: 2,
-          label: '河北省',
-          value: '河北省'
+          label: "河北省",
+          value: "河北省",
         },
         {
           id: 3,
-          label: '安徽省',
-          value: '安徽省'
+          label: "安徽省",
+          value: "安徽省",
         },
         {
           id: 4,
-          label: '湖北省',
-          value: '湖北省'
+          label: "湖北省",
+          value: "湖北省",
         },
         {
           id: 5,
-          label: '湖南省',
-          value: '湖南省'
+          label: "湖南省",
+          value: "湖南省",
         },
         {
           id: 6,
-          label: '江苏省',
-          value: '江苏省'
+          label: "江苏省",
+          value: "江苏省",
         },
         {
           id: 7,
-          label: '浙江省',
-          value: '浙江省'
+          label: "浙江省",
+          value: "浙江省",
         },
         {
           id: 8,
-          label: '四川省',
-          value: '四川省'
+          label: "四川省",
+          value: "四川省",
         },
         {
           id: 9,
-          label: '内蒙古自治区',
-          value: '内蒙古自治区'
+          label: "内蒙古自治区",
+          value: "内蒙古自治区",
         },
         {
           id: 10,
-          label: '新疆维吾尔自治区',
-          value: '新疆维吾尔自治区'
+          label: "新疆维吾尔自治区",
+          value: "新疆维吾尔自治区",
         },
         {
           id: 11,
-          label: '甘肃省',
-          value: '甘肃省'
+          label: "甘肃省",
+          value: "甘肃省",
         },
         {
           id: 12,
-          label: '青海省',
-          value: '青海省'
+          label: "青海省",
+          value: "青海省",
         },
         {
           id: 13,
-          label: '西藏自治区',
-          value: '西藏自治区'
+          label: "西藏自治区",
+          value: "西藏自治区",
         },
         {
           id: 14,
-          label: '云南省',
-          value: '云南省'
+          label: "云南省",
+          value: "云南省",
         },
         {
           id: 15,
-          label: '贵州省',
-          value: '贵州省'
+          label: "贵州省",
+          value: "贵州省",
         },
         {
           id: 16,
-          label: '广西壮族自治区',
-          value: '广西壮族自治区'
+          label: "广西壮族自治区",
+          value: "广西壮族自治区",
         },
         {
           id: 17,
-          label: '广东省',
-          value: '广东省'
+          label: "广东省",
+          value: "广东省",
         },
         {
           id: 18,
-          label: '江西省',
-          value: '江西省'
+          label: "江西省",
+          value: "江西省",
         },
         {
           id: 19,
-          label: '福建省',
-          value: '福建省'
+          label: "福建省",
+          value: "福建省",
         },
         {
           id: 20,
-          label: '山东省',
-          value: '山东省'
+          label: "山东省",
+          value: "山东省",
         },
         {
           id: 21,
-          label: '陕西省',
-          value: '陕西省'
+          label: "陕西省",
+          value: "陕西省",
         },
         {
           id: 22,
-          label: '北京市',
-          value: '北京市'
+          label: "北京市",
+          value: "北京市",
         },
         {
           id: 23,
-          label: '天津市',
-          value: '天津市'
+          label: "天津市",
+          value: "天津市",
         },
         {
           id: 24,
-          label: '海南省',
-          value: '海南省'
+          label: "海南省",
+          value: "海南省",
         },
         {
           id: 25,
-          label: '重庆市',
-          value: '重庆市'
+          label: "重庆市",
+          value: "重庆市",
         },
         {
           id: 26,
-          label: '上海市',
-          value: '上海市'
+          label: "上海市",
+          value: "上海市",
         },
         {
           id: 27,
-          label: '黑龙江省',
-          value: '黑龙江省'
+          label: "黑龙江省",
+          value: "黑龙江省",
         },
         {
           id: 28,
-          label: '吉林省',
-          value: '吉林省'
+          label: "吉林省",
+          value: "吉林省",
         },
         {
           id: 29,
-          label: '辽宁省',
-          value: '辽宁省'
+          label: "辽宁省",
+          value: "辽宁省",
         },
         {
           id: 30,
-          label: '宁夏回族自治区',
-          value: '宁夏回族自治区'
+          label: "宁夏回族自治区",
+          value: "宁夏回族自治区",
         },
         {
           id: 31,
-          label: '山西省',
-          value: '山西省'
+          label: "山西省",
+          value: "山西省",
         },
         {
           id: 32,
-          label: '台湾省',
-          value: '台湾省'
+          label: "台湾省",
+          value: "台湾省",
         },
         {
           id: 33,
-          label: '香港特别行政区',
-          value: '香港特别行政区'
+          label: "香港特别行政区",
+          value: "香港特别行政区",
         },
         {
           id: 34,
-          label: '澳门特别行政区',
-          value: '澳门特别行政区'
-        }
+          label: "澳门特别行政区",
+          value: "澳门特别行政区",
+        },
       ], //下拉选择
       selectProvince2: [
         {
           key: 1,
-          label: '河南省',
-          disabled: false
+          label: "河南省",
+          disabled: false,
         },
         {
           key: 2,
-          label: '河北省',
-          disabled: false
-        }
+          label: "河北省",
+          disabled: false,
+        },
       ],
       selectValue: [],
-      state: '',
+      state: "",
       allcitys: [],
       options2: [
-        { label: '河南省', value: '河南省' },
-        { label: '河北省', value: '河北省' },
-        { label: '安徽省', value: '安徽省' },
-        { label: '湖北省', value: '湖北省' },
-        { label: '湖南省', value: '湖南省' },
-        { label: '江苏省', value: '江苏省' },
-        { label: '浙江省', value: '浙江省' },
-        { label: '四川省', value: '四川省' },
-        { label: '内蒙古自治区', value: '内蒙古自治区' },
+        { label: "河南省", value: "河南省" },
+        { label: "河北省", value: "河北省" },
+        { label: "安徽省", value: "安徽省" },
+        { label: "湖北省", value: "湖北省" },
+        { label: "湖南省", value: "湖南省" },
+        { label: "江苏省", value: "江苏省" },
+        { label: "浙江省", value: "浙江省" },
+        { label: "四川省", value: "四川省" },
+        { label: "内蒙古自治区", value: "内蒙古自治区" },
         {
-          label: '新疆维吾尔自治区',
-          value: '新疆维吾尔自治区'
+          label: "新疆维吾尔自治区",
+          value: "新疆维吾尔自治区",
         },
         {
-          label: '甘肃省',
-          value: '甘肃省'
+          label: "甘肃省",
+          value: "甘肃省",
         },
         {
-          label: '青海省',
-          value: '青海省'
+          label: "青海省",
+          value: "青海省",
         },
         {
-          label: '西藏自治区',
-          value: '西藏自治区'
+          label: "西藏自治区",
+          value: "西藏自治区",
         },
         {
-          label: '云南省',
-          value: '云南省'
+          label: "云南省",
+          value: "云南省",
         },
         {
-          label: '贵州省',
-          value: '贵州省'
+          label: "贵州省",
+          value: "贵州省",
         },
         {
-          label: '广西壮族自治区',
-          value: '广西壮族自治区'
+          label: "广西壮族自治区",
+          value: "广西壮族自治区",
         },
         {
-          label: '广东省',
-          value: '广东省'
+          label: "广东省",
+          value: "广东省",
         },
         {
-          label: '江西省',
-          value: '江西省'
+          label: "江西省",
+          value: "江西省",
         },
         {
-          label: '福建省',
-          value: '福建省'
+          label: "福建省",
+          value: "福建省",
         },
         {
-          label: '山东省',
-          value: '山东省'
+          label: "山东省",
+          value: "山东省",
         },
         {
-          label: '陕西省',
-          value: '陕西省'
+          label: "陕西省",
+          value: "陕西省",
         },
         {
-          label: '北京市',
-          value: '北京市'
+          label: "北京市",
+          value: "北京市",
         },
         {
-          label: '天津市',
-          value: '天津市'
+          label: "天津市",
+          value: "天津市",
         },
         {
-          label: '海南省',
-          value: '海南省'
+          label: "海南省",
+          value: "海南省",
         },
         {
-          label: '重庆市',
-          value: '重庆市'
+          label: "重庆市",
+          value: "重庆市",
         },
         {
-          label: '上海市',
-          value: '上海市'
+          label: "上海市",
+          value: "上海市",
         },
         {
-          label: '黑龙江省',
-          value: '黑龙江省'
+          label: "黑龙江省",
+          value: "黑龙江省",
         },
         {
-          label: '吉林省',
-          value: '吉林省'
+          label: "吉林省",
+          value: "吉林省",
         },
         {
-          label: '辽宁省',
-          value: '辽宁省'
+          label: "辽宁省",
+          value: "辽宁省",
         },
         {
-          label: '宁夏回族自治区',
-          value: '宁夏回族自治区'
+          label: "宁夏回族自治区",
+          value: "宁夏回族自治区",
         },
         {
-          label: '山西省',
-          value: '山西省'
+          label: "山西省",
+          value: "山西省",
         },
         {
-          label: '台湾省',
-          value: '台湾省'
+          label: "台湾省",
+          value: "台湾省",
         },
         {
-          label: '香港特别行政区',
-          value: '香港特别行政区'
+          label: "香港特别行政区",
+          value: "香港特别行政区",
         },
         {
-          label: '澳门特别行政区',
-          value: '澳门特别行政区'
-        }
+          label: "澳门特别行政区",
+          value: "澳门特别行政区",
+        },
       ], //下拉选择
       options4: [
-        { label: '河南省', value: '河南省' },
-        { label: '河北省', value: '河北省' },
-        { label: '安徽省', value: '安徽省' },
-        { label: '湖北省', value: '湖北省' },
-        { label: '湖南省', value: '湖南省' },
-        { label: '江苏省', value: '江苏省' },
-        { label: '浙江省', value: '浙江省' },
-        { label: '四川省', value: '四川省' },
-        { label: '内蒙古自治区', value: '内蒙古自治区' },
+        { label: "河南省", value: "河南省" },
+        { label: "河北省", value: "河北省" },
+        { label: "安徽省", value: "安徽省" },
+        { label: "湖北省", value: "湖北省" },
+        { label: "湖南省", value: "湖南省" },
+        { label: "江苏省", value: "江苏省" },
+        { label: "浙江省", value: "浙江省" },
+        { label: "四川省", value: "四川省" },
+        { label: "内蒙古自治区", value: "内蒙古自治区" },
         {
-          label: '新疆维吾尔自治区',
-          value: '新疆维吾尔自治区'
+          label: "新疆维吾尔自治区",
+          value: "新疆维吾尔自治区",
         },
         {
-          label: '甘肃省',
-          value: '甘肃省'
+          label: "甘肃省",
+          value: "甘肃省",
         },
         {
-          label: '青海省',
-          value: '青海省'
+          label: "青海省",
+          value: "青海省",
         },
         {
-          label: '西藏自治区',
-          value: '西藏自治区'
+          label: "西藏自治区",
+          value: "西藏自治区",
         },
         {
-          label: '云南省',
-          value: '云南省'
+          label: "云南省",
+          value: "云南省",
         },
         {
-          label: '贵州省',
-          value: '贵州省'
+          label: "贵州省",
+          value: "贵州省",
         },
         {
-          label: '广西壮族自治区',
-          value: '广西壮族自治区'
+          label: "广西壮族自治区",
+          value: "广西壮族自治区",
         },
         {
-          label: '广东省',
-          value: '广东省'
+          label: "广东省",
+          value: "广东省",
         },
         {
-          label: '江西省',
-          value: '江西省'
+          label: "江西省",
+          value: "江西省",
         },
         {
-          label: '福建省',
-          value: '福建省'
+          label: "福建省",
+          value: "福建省",
         },
         {
-          label: '山东省',
-          value: '山东省'
+          label: "山东省",
+          value: "山东省",
         },
         {
-          label: '陕西省',
-          value: '陕西省'
+          label: "陕西省",
+          value: "陕西省",
         },
         {
-          label: '北京市',
-          value: '北京市'
+          label: "北京市",
+          value: "北京市",
         },
         {
-          label: '天津市',
-          value: '天津市'
+          label: "天津市",
+          value: "天津市",
         },
         {
-          label: '海南省',
-          value: '海南省'
+          label: "海南省",
+          value: "海南省",
         },
         {
-          label: '重庆市',
-          value: '重庆市'
+          label: "重庆市",
+          value: "重庆市",
         },
         {
-          label: '上海市',
-          value: '上海市'
+          label: "上海市",
+          value: "上海市",
         },
         {
-          label: '黑龙江省',
-          value: '黑龙江省'
+          label: "黑龙江省",
+          value: "黑龙江省",
         },
         {
-          label: '吉林省',
-          value: '吉林省'
+          label: "吉林省",
+          value: "吉林省",
         },
         {
-          label: '辽宁省',
-          value: '辽宁省'
+          label: "辽宁省",
+          value: "辽宁省",
         },
         {
-          label: '宁夏回族自治区',
-          value: '宁夏回族自治区'
+          label: "宁夏回族自治区",
+          value: "宁夏回族自治区",
         },
         {
-          label: '山西省',
-          value: '山西省'
+          label: "山西省",
+          value: "山西省",
         },
         {
-          label: '台湾省',
-          value: '台湾省'
+          label: "台湾省",
+          value: "台湾省",
         },
         {
-          label: '香港特别行政区',
-          value: '香港特别行政区'
+          label: "香港特别行政区",
+          value: "香港特别行政区",
         },
         {
-          label: '澳门特别行政区',
-          value: '澳门特别行政区'
-        }
+          label: "澳门特别行政区",
+          value: "澳门特别行政区",
+        },
       ], //下拉选择
 
       options3: [],
-      value1: '',
-      company: '',
+      value1: "",
+      company: "",
       cityList: [],
       parentPrivnce: [], //父级省的名字
       accountType: 0,
       constructionStageList: [],
-      structureTypeList: []
-    }
+      structureTypeList: [],
+      editGroupDialog: false,
+      relativeGroupDialog: false,
+      editGroupForm: {
+        groupId: "",
+      },
+      treeData: [
+        { id: 1, label: "一级 1", children: [{ id: 11, label: "二级 1-1" }] },
+        { id: 2, label: "一级 2", children: [{ id: 21, label: "二级 2-1" }] },
+        { id: 3, label: "一级 3", children: [{ id: 31, label: "二级 3-1" }] },
+      ],
+      selectTreeProps: {
+        children: "children",
+        label: "label",
+      },
+      isSelectCompany: false,
+      selectTree: {},
+      filterText: "",
+    };
   },
   created() {
-    this.accountType = this.$store.state.userInfo.accountType
-    this.company = COMPANY
-    this.projectType2 = PROJECT_TYPE
+    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)
@@ -1819,82 +2077,88 @@ export default {
     // })
   },
   mounted() {
-    this.addCompanyForm.headquartersSn =
-      this.$store.state.userInfo.headquartersSn
-    this.getModuleList()
-    this.initData()
-    this.loadProvincesCityList()
-    this.getDictionaryList()
-    this.getDictionaryByStructure()
+    this.addCompanyForm.headquartersSn = this.$store.state.userInfo.headquartersSn;
+    this.getModuleList();
+    this.initData();
+    this.loadProvincesCityList();
+    this.getDictionaryList();
+    this.getDictionaryByStructure();
   },
   methods: {
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 树形控件点击
+    treeClick(data) {
+      console.log(data);
+      this.selectTree = { ...data };
+    },
     //获取字典施工阶段
     getDictionaryList() {
       getDictionaryItemApi({
-        dictionaryEncoding: 'project_construction_stage'
-      }).then(res => {
+        dictionaryEncoding: "project_construction_stage",
+      }).then((res) => {
         if (res.result.length > 0) {
-          this.constructionStageList = res.result
+          this.constructionStageList = res.result;
         }
-
-      })
+      });
     },
     //获取字典 结构类型
     getDictionaryByStructure() {
       getDictionaryItemApi({
-        dictionaryEncoding: 'project_structure_type',
-        projectSn: this.projectSn
-      }).then(res => {
+        dictionaryEncoding: "project_structure_type",
+        projectSn: this.projectSn,
+      }).then((res) => {
         if (res.result.length > 0) {
-          this.structureTypeList = res.result
+          this.structureTypeList = res.result;
         }
-
-      })
+      });
     },
     close() {
       this.addAccountForm = {
-        account: '',
+        account: "",
         accountType: 3, //1系统管理员，2企业总部管理员账号,3区域账号，4城市账号，5项目账号
-        department: '',
-        password: '',
-        realName: '',
-        sn: '',
-        userTel: '',
-        jobId: '',
-        externalAccount: ''
-      }
-      this.addJobForm = {
-        jobName: '',
-        jobDuty: '',
-      },
-        this.addCompanyDialog = false
+        department: "",
+        password: "",
+        realName: "",
+        sn: "",
+        userTel: "",
+        jobId: "",
+        externalAccount: "",
+      };
+      (this.addJobForm = {
+        jobName: "",
+        jobDuty: "",
+      }),
+        (this.addCompanyDialog = false);
     },
     leftChangeState(item) {
-      console.log(item)
-      console.log(this.selectValue)
+      console.log(item);
+      console.log(this.selectValue);
     },
     querySearch(queryString, cb) {
-      console.log(queryString)
-      console.log(cb)
-      var restaurants = this.options
+      console.log(queryString);
+      console.log(cb);
+      var restaurants = this.options;
       var results = queryString
         ? restaurants.filter(this.createFilter(queryString))
-        : restaurants
+        : restaurants;
       // 调用 callback 返回建议列表的数据
-      cb(results)
+      cb(results);
     },
     createFilter(queryString) {
       return (restaurant) => {
         return (
           restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
           0
-        )
-      }
+        );
+      };
     },
     handleSelect(item) {
-      console.log(item)
+      console.log(item);
       if (this.selectValue.indexOf(item.value) === -1) {
-        this.selectValue.push(item.value)
+        this.selectValue.push(item.value);
       }
     },
     // 关闭选择的省
@@ -1903,36 +2167,36 @@ export default {
     //   this.options.splice(index,1)
     // },
     deleteItem(index) {
-      console.log(index)
-      this.selectValue.splice(index, 1)
-      console.log(this.selectValue)
+      console.log(index);
+      this.selectValue.splice(index, 1);
+      console.log(this.selectValue);
     },
     uploadAccountFn(val) {
-      console.log(val)
+      console.log(val);
       sendSafetyHatAccountDataApi({
-        userId: val.userId
+        userId: val.userId,
       }).then((res) => {
-        console.log(res.code)
+        console.log(res.code);
         if (res.code == 200) {
-          this.$message.success('上传成功！')
+          this.$message.success("上传成功！");
         }
-      })
+      });
     },
     isShowProject(companyType) {
       if (this.$store.state.userInfo.addProjectType == 0) {
         if (companyType) {
-          return true
+          return true;
         }
       } else {
         if (companyType == 2 || companyType == 3) {
-          return true
+          return true;
         } else {
-          return false
+          return false;
         }
       }
     },
     handleTabClick(tab, event) {
-      console.log(tab, event)
+      console.log(tab, event);
       // if(this.tabActiveName=='first'){
       //     this.getAccountList()
 
@@ -1941,29 +2205,29 @@ export default {
       // }
     },
     handleNodeClick(data) {
-      this.tabActiveName = 'first'
-      this.treeSelectData = data
-      this.getAccountList()
-      this.getJobList()
+      this.tabActiveName = "first";
+      this.treeSelectData = data;
+      this.getAccountList();
+      this.getJobList();
     },
     closeMap(val) {
-      this.showMap = val
-      console.log('打印子组件', val)
+      this.showMap = val;
+      console.log("打印子组件", val);
     },
     getLngLat(v) {
-      this.showMap = false
+      this.showMap = false;
       if (this.addCompanyDialog) {
-        this.addCompanyForm.longitude = v.lng
-        this.addCompanyForm.latitude = v.lat
+        this.addCompanyForm.longitude = v.lng;
+        this.addCompanyForm.latitude = v.lat;
       } else {
-        this.addProjectForm.longitude = v.lng
-        this.addProjectForm.latitude = v.lat
+        this.addProjectForm.longitude = v.lng;
+        this.addProjectForm.latitude = v.lat;
       }
 
       // console.log("经纬度", v);
     },
     initData() {
-      this.loadData()
+      this.loadData();
       // switch (this.$store.state.userInfo.accountType) {
       //   case 2:
       //     this.loadData();
@@ -1978,42 +2242,42 @@ export default {
     },
     //查看密码
     viewPwd1(index, type) {
-      var json = this.level1AccountData[index]
-      json.isShow = type
-      this.$set(this.level1AccountData, index, json)
+      var json = this.level1AccountData[index];
+      json.isShow = type;
+      this.$set(this.level1AccountData, index, json);
     },
     viewPwd2(index, type) {
-      var json = this.level2AccountData[index]
-      json.isShow = type
-      this.$set(this.level2AccountData, index, json)
+      var json = this.level2AccountData[index];
+      json.isShow = type;
+      this.$set(this.level2AccountData, index, json);
     },
     viewPwd3(index, type) {
-      var json = this.projectAccountData[index]
-      json.isShow = type
-      this.$set(this.projectAccountData, index, json)
+      var json = this.projectAccountData[index];
+      json.isShow = type;
+      this.$set(this.projectAccountData, index, json);
     },
     loadData() {
-      let sn = this.$store.state.userInfo.sn
-      let projectType = 1 // 展示项目列表
+      let sn = this.$store.state.userInfo.sn;
+      let projectType = 1; // 展示项目列表
       if (this.$store.state.userInfo.addProjectType == 1) {
-        projectType = 0 // 不展示项目列表
+        projectType = 0; // 不展示项目列表
       }
       getComapnyStatisticsListApi({
         sn: sn,
-        projectType: projectType
+        projectType: projectType,
       }).then((res) => {
         this.level1CompanyData = res.result.companyList
           ? res.result.companyList
-          : res.result.projectList
+          : res.result.projectList;
         this.level4CompanyData = res.result.companyInfo
           ? res.result.companyInfo
-          : res.result.companyList
+          : res.result.companyList;
         // if (this.level1CompanyData.length > 0) {
         //   this.changeLevel1();
         // }
-      })
+      });
 
-      console.log(this.level1CompanyData)
+      console.log(this.level1CompanyData);
     },
     // loadData2() {
     //   getChildCompanyProjectListApi({
@@ -2101,17 +2365,17 @@ export default {
     //删除管理机构信息
     deleteFn(item, index) {
       this.$confirm(
-        this.$t('message.companyDiagram.deleteManagementMsg') +
-        '【' +
-        item.companyName +
-        '】?',
-        this.$t('message.companyDiagram.Tips'),
+        this.$t("message.companyDiagram.deleteManagementMsg") +
+          "【" +
+          item.companyName +
+          "】?",
+        this.$t("message.companyDiagram.Tips"),
         {
           confirmButtonText: this.$t(
-            'message.companyDiagram.confirmButtonText'
+            "message.companyDiagram.confirmButtonText"
           ), //确定
-          cancelButtonText: this.$t('message.companyDiagram.cancelButtonText'), //取消
-          type: 'warning'
+          cancelButtonText: this.$t("message.companyDiagram.cancelButtonText"), //取消
+          type: "warning",
         }
       ).then(() => {
         deleteCompanyApi({ id: item.companyId }).then((res) => {
@@ -2130,37 +2394,39 @@ export default {
           //     this.level2Index--;
           //   }
 
-          this.initData()
-          this.$message.success(this.$t('message.companyDiagram.deleteSuccess')) //删除成功!
-        })
-      })
+          this.initData();
+          this.$message.success(
+            this.$t("message.companyDiagram.deleteSuccess")
+          ); //删除成功!
+        });
+      });
     },
     async getGeoJson(url) {
       // window.location.href='http://geo.datav.aliyun.com/areas_v3/bound'+url
-      return await $.getJSON(url)
+      return await $.getJSON(url);
     },
     //编辑管理机构信息
     editFn(item) {
       // $.getJSON('/public/js/mapJson/city.json').then(res=>{
       //   console.log(res)
       // })
-      console.log(item)
-      console.log(this.selectValue)
-      this.selectValue = []
-      let selectValue2 = item.rangeAddr ? JSON.parse(item.rangeAddr) : ''
+      console.log(item);
+      console.log(this.selectValue);
+      this.selectValue = [];
+      let selectValue2 = item.rangeAddr ? JSON.parse(item.rangeAddr) : "";
       if (selectValue2 instanceof Array) {
-        this.selectValue = selectValue2
+        this.selectValue = selectValue2;
       } else {
-        this.selectValue = []
+        this.selectValue = [];
       }
-      console.log(this.selectValue)
+      console.log(this.selectValue);
       // this.addCompanyForm = JSON.parse(JSON.stringify(item))
-      console.log(this.addCompanyForm)
-      this.addCompanyForm = item
+      console.log(this.addCompanyForm);
+      this.addCompanyForm = item;
       // this.addCompanyForm = JSON.parse(item);
 
-      this.addCompanyDialog = true
-      this.isAdd = false
+      this.addCompanyDialog = true;
+      this.isAdd = false;
       // if (this.addCompanyForm.companyType == 2) {
       //   this.dialogTitle = this.$t(
       //     "message.companyDiagram.editManagementTitle1"
@@ -2171,39 +2437,39 @@ export default {
       //     "message.companyDiagram.editManagementTitle2"
       //   ); //编辑二级管理机构
       // }
-      this.dialogTitle = '编辑管理机构'
+      this.dialogTitle = "编辑管理机构";
       // if (this.addCompanyForm.companyType == 4) {
       //   this.dialogTitle = '编辑三级管理机构'; //编辑三级管理机构
       // }
-      delete this.addCompanyForm.list
+      delete this.addCompanyForm.list;
 
       this.$nextTick(() => {
-        this.$refs['addCompanyForm'].clearValidate()
-        console.log(this.options)
-      })
+        this.$refs["addCompanyForm"].clearValidate();
+        console.log(this.options);
+      });
     },
     addOrganizationFn2() {
-      let accountType = this.$store.state.userInfo.accountType
+      let accountType = this.$store.state.userInfo.accountType;
       switch (Number(accountType)) {
         case 2:
-          this.add(accountType)
-          break
+          this.add(accountType);
+          break;
         case 3:
-          this.add2('', '', accountType)
-          break
+          this.add2("", "", accountType);
+          break;
         case 4:
           // this.addProjectFn(this.$store.state.userInfo.sn)
-          this.add2('', '', 4)
-          break
+          this.add2("", "", 4);
+          break;
         case 7:
           // this.add2('',4)
-          this.addProjectFn(this.$store.state.userInfo.sn)
-          break
+          this.addProjectFn(this.$store.state.userInfo.sn);
+          break;
       }
     },
     addOrganizationFn(data) {
-      this.state = ''
-      console.log('----------', data)
+      this.state = "";
+      console.log("----------", data);
       // if(data.companyType==2){
       //     this.add2(data.companyId,data.companyType)
       // }
@@ -2211,90 +2477,92 @@ export default {
       //     this.addProjectFn(data.companySn,data.companyType)
       // }
       if (data.companyType == 3) {
-        this.options3 = []
-        this.selectValue = []
-        this.getGeoJson('/js/mapJson/city.json').then((res) => {
+        this.options3 = [];
+        this.selectValue = [];
+        this.getGeoJson("/js/mapJson/city.json").then((res) => {
           res.forEach((x) => {
-            let target = data.rangeAddr !== '' ? JSON.parse(data.rangeAddr) : []
-            console.log(target.indexOf(x.province) !== -1)
+            let target =
+              data.rangeAddr !== "" ? JSON.parse(data.rangeAddr) : [];
+            console.log(target.indexOf(x.province) !== -1);
             if (target.indexOf(x.province) !== -1) {
-              this.options3 = this.options3.concat(x.citys)
+              this.options3 = this.options3.concat(x.citys);
             }
-          })
+          });
           // console.log(this.options3)
-          console.log(this.options3.length)
-          console.log(this.options3)
+          console.log(this.options3.length);
+          console.log(this.options3);
           if (this.options3.length !== 0) {
-            console.log('1')
-            this.options = this.options3
+            console.log("1");
+            this.options = this.options3;
           } else {
-            this.options = []
+            this.options = [];
           }
           // this.options = targetCity2.citys
           // console.log(targetCity2) //省份下的全部市
           // console.log(this.options)
 
-          console.log(this.options3)
-        })
+          console.log(this.options3);
+        });
         //  this.value1 = ''
-        console.log(data)
-        this.add2(data, data.companyId, data.companyType + 1)
+        console.log(data);
+        this.add2(data, data.companyId, data.companyType + 1);
       }
       if (data.companyType == 2 && this.accountType === 2) {
-        let options4 = data.rangeAddr ? JSON.parse(data.rangeAddr) : []
+        let options4 = data.rangeAddr ? JSON.parse(data.rangeAddr) : [];
         if (options4.length !== 0) {
           this.options = options4.map((x) => {
             return {
               label: x,
-              value: x
-            }
-          })
+              value: x,
+            };
+          });
         } else {
-          this.options = []
+          this.options = [];
         }
-        this.add2(data, data.companyId, data.companyType + 1)
+        this.add2(data, data.companyId, data.companyType + 1);
       }
       if (data.companyType == 2 && this.accountType !== 2) {
-        console.log()
+        console.log();
         // this.value1 = ''
-        this.selectValue = []
-        let options4 = []
-        this.getGeoJson('/js/mapJson/city.json').then((res) => {
+        this.selectValue = [];
+        let options4 = [];
+        this.getGeoJson("/js/mapJson/city.json").then((res) => {
           res.forEach((x) => {
-            let target = data.rangeAddr !== '' ? JSON.parse(data.rangeAddr) : []
+            let target =
+              data.rangeAddr !== "" ? JSON.parse(data.rangeAddr) : [];
             if (target.indexOf(x.province) !== -1) {
-              options4.push(...x.citys)
+              options4.push(...x.citys);
             }
-          })
+          });
           // console.log(this.options3)
           if (options4.length !== 0) {
-            console.log('1')
-            this.options = options4
+            console.log("1");
+            this.options = options4;
           }
           // this.options = targetCity2.citys
           // console.log(targetCity2) //省份下的全部市
           // console.log(this.options)
 
-          console.log(options4)
-        })
-        let target = data.rangeAddr ? JSON.parse(data.rangeAddr) : []
+          console.log(options4);
+        });
+        let target = data.rangeAddr ? JSON.parse(data.rangeAddr) : [];
         options4 = target.map((x, y) => {
           return {
             id: y,
             label: x,
-            value: x
-          }
-        })
-        this.options = options4
-        this.add2(data, data.companyId, data.companyType + 1)
+            value: x,
+          };
+        });
+        this.options = options4;
+        this.add2(data, data.companyId, data.companyType + 1);
       }
       if (data.companyType == 4) {
-        this.addProjectFn(data.companySn, data.companyType)
+        this.addProjectFn(data.companySn, data.companyType);
       }
     },
     editOrganizationFn(data) {
-      this.state = ''
-      console.log('-----编辑的logo', data)
+      this.state = "";
+      console.log("-----编辑的logo", data);
       // console.log(data.parentId)
       // console.log(data.companyType)
       if (data.companyType === 4) {
@@ -2306,43 +2574,43 @@ export default {
         // })
         // console.log(this.parentPrivnce)
         // let targetCity = this.parentPrivnce.filter(x=> x.companyId === data.parentId)
-        if (data.parentRangeAddr === '') {
-          this.options = this.options3
-          this.editFn(data)
+        if (data.parentRangeAddr === "") {
+          this.options = this.options3;
+          this.editFn(data);
         }
-        let targetCity = []
-        targetCity = data
-        console.log(targetCity)
-        this.getGeoJson('/js/mapJson/city.json').then((res) => {
-          console.log(targetCity)
+        let targetCity = [];
+        targetCity = data;
+        console.log(targetCity);
+        this.getGeoJson("/js/mapJson/city.json").then((res) => {
+          console.log(targetCity);
           let target =
-            targetCity.parentRangeAddr !== ''
+            targetCity.parentRangeAddr !== ""
               ? JSON.parse(targetCity.parentRangeAddr)
-              : []
-          console.log(target)
-          this.options3 = []
+              : [];
+          console.log(target);
+          this.options3 = [];
           if (target.length !== 0) {
             res.forEach((x) => {
               if (target.indexOf(x.province) !== -1) {
-                this.options3.push(...x.citys)
+                this.options3.push(...x.citys);
               }
-            })
+            });
           } else {
-            this.options3 = []
+            this.options3 = [];
           }
 
           // console.log(this.options3)
-          console.log(this.options3)
+          console.log(this.options3);
 
-          console.log('1')
-          this.options = this.options3
+          console.log("1");
+          this.options = this.options3;
 
           // this.options = targetCity2.citys
           // console.log(targetCity2) //省份下的全部市
           // console.log(this.options)
-          this.editFn(data)
-          console.log(this.options2)
-        })
+          this.editFn(data);
+          console.log(this.options2);
+        });
       }
 
       // console.log(JSON.parse(data.rangeAddr).toString())
@@ -2367,9 +2635,9 @@ export default {
         //    }
         //   })
         //  }
-        this.selectValue = data.rangeAddr ? JSON.parse(data.rangeAddr) : []
-        this.options = this.options2
-        this.editFn(data)
+        this.selectValue = data.rangeAddr ? JSON.parse(data.rangeAddr) : [];
+        this.options = this.options2;
+        this.editFn(data);
       }
       // if(data.companyType==3 && this.accountType === 2){
       //     if(data.parentRangeAddr){
@@ -2400,36 +2668,36 @@ export default {
       // }
       if (data.companyType == 3 && this.accountType === 2) {
         if (data.parentRangeAddr) {
-          let options4 = JSON.parse(data.parentRangeAddr)
+          let options4 = JSON.parse(data.parentRangeAddr);
           this.options = options4.map((x) => {
             return {
               label: x,
-              value: x
-            }
-          })
+              value: x,
+            };
+          });
         } else {
-          this.options = []
+          this.options = [];
         }
         // this.options = this.options2
-        this.editFn(data)
+        this.editFn(data);
       }
       if (data.companyType == 3 && this.accountType === 3) {
         if (data.parentRangeAddr) {
-          let options4 = JSON.parse(data.parentRangeAddr)
+          let options4 = JSON.parse(data.parentRangeAddr);
           this.options = options4.map((x) => {
             return {
               label: x,
-              value: x
-            }
-          })
+              value: x,
+            };
+          });
         } else {
-          this.options = []
+          this.options = [];
         }
         // this.options = this.options2
-        this.editFn(data)
+        this.editFn(data);
       }
       if (data.projectName) {
-        this.editProjectFn(data)
+        this.editProjectFn(data);
       }
     },
     deleteOrganizationFn(data) {
@@ -2438,88 +2706,88 @@ export default {
         data.companyType == 3 ||
         data.companyType == 4
       ) {
-        this.deleteFn(data)
+        this.deleteFn(data);
       }
       if (data.projectName) {
-        this.deleteProjectFn(data)
+        this.deleteProjectFn(data);
       }
     },
     //添加一级管理机构
     add(companyType) {
-      console.log(companyType)
-      console.log(this.addCompanyForm)
-      this.addCompanyForm.companyId = ''
-      this.addCompanyForm.companyType = companyType
-      this.addCompanyForm.companyName = ''
-      this.addCompanyForm.longitude = ''
-      this.addCompanyForm.latitude = ''
-      this.addCompanyForm.parentId = 0
-      this.state = ''
-      this.options = this.options4
-      this.selectValue = []
+      console.log(companyType);
+      console.log(this.addCompanyForm);
+      this.addCompanyForm.companyId = "";
+      this.addCompanyForm.companyType = companyType;
+      this.addCompanyForm.companyName = "";
+      this.addCompanyForm.longitude = "";
+      this.addCompanyForm.latitude = "";
+      this.addCompanyForm.parentId = 0;
+      this.state = "";
+      this.options = this.options4;
+      this.selectValue = [];
       // this.addCompanyForm.rangeAddr = ''
       // this.value1 = '',
       // this.dialogTitle = this.$t("message.companyDiagram.addManagementTitle1"); //添加一级管理机构
-      this.dialogTitle = '添加管理机构'
-      this.addCompanyDialog = true
-      this.isAdd = true
+      this.dialogTitle = "添加管理机构";
+      this.addCompanyDialog = true;
+      this.isAdd = true;
       this.$nextTick(() => {
-        this.$refs['addCompanyForm'].clearValidate()
-      })
+        this.$refs["addCompanyForm"].clearValidate();
+      });
     },
     //添加二级管理机构
     add2(data, parentId, companyType) {
-      console.log(data)
-      console.log(this.level4CompanyData)
-      console.log(parentId)
-      console.log(data.companyType)
-      console.log(companyType)
-      console.log(this.addCompanyForm)
-      this.addCompanyForm.companyId = ''
-      this.addCompanyForm.longitude = ''
-      this.addCompanyForm.latitude = ''
+      console.log(data);
+      console.log(this.level4CompanyData);
+      console.log(parentId);
+      console.log(data.companyType);
+      console.log(companyType);
+      console.log(this.addCompanyForm);
+      this.addCompanyForm.companyId = "";
+      this.addCompanyForm.longitude = "";
+      this.addCompanyForm.latitude = "";
       // this.value1 = ''
-      this.selectValue = []
-      this.addCompanyDialog = true
+      this.selectValue = [];
+      this.addCompanyDialog = true;
       if (data.companyType === 4) {
-        console.log
-        this.getGeoJson('/js/mapJson/city.json').then((res) => {
+        console.log;
+        this.getGeoJson("/js/mapJson/city.json").then((res) => {
           let parentPrivnce = this.level4CompanyData.rangeAddr
             ? JSON.parse(this.level4CompanyData.rangeAddr)
-            : ''
-          console.log(parentPrivnce)
-          let citysList = []
-          let allcitys = []
+            : "";
+          console.log(parentPrivnce);
+          let citysList = [];
+          let allcitys = [];
           parentPrivnce.forEach((x) => {
-            citysList = res.filter((y) => y.province === x)
-          })
-          console.log(citysList)
+            citysList = res.filter((y) => y.province === x);
+          });
+          console.log(citysList);
           citysList.forEach((x) => {
-            allcitys.push(...x.citys)
-          })
-          console.log(allcitys)
-          this.options = allcitys
+            allcitys.push(...x.citys);
+          });
+          console.log(allcitys);
+          this.options = allcitys;
           // let childrenCitys = res.filter(x=>x.province === parentPrivnce)
-        })
+        });
       }
       if (companyType === 4 && this.accountType === 4) {
-        console.log('9999')
+        console.log("9999");
         if (this.level4CompanyData.rangeAddr) {
-          let provinceList = JSON.parse(this.level4CompanyData.rangeAddr)
-          console.log(provinceList)
-          this.getGeoJson('/js/mapJson/city.json').then((res) => {
-            let citys = []
-            console.log(res)
+          let provinceList = JSON.parse(this.level4CompanyData.rangeAddr);
+          console.log(provinceList);
+          this.getGeoJson("/js/mapJson/city.json").then((res) => {
+            let citys = [];
+            console.log(res);
             for (let j = 0; j < provinceList.length; j++) {
               for (let i = 0; i < res.length; i++) {
                 if (provinceList[j] === res[i].province) {
-                  citys.push(...res[i].citys)
+                  citys.push(...res[i].citys);
                 }
               }
             }
-            this.options = citys
-            console.log(this.options)
-          })
+            this.options = citys;
+            console.log(this.options);
+          });
           // this.options = JSON.parse(this.level4CompanyData.rangeAddr).map(x=>{
           //   return {
           //     label:x,
@@ -2530,13 +2798,13 @@ export default {
       }
       if (companyType === 3 && this.accountType === 3) {
         if (this.level4CompanyData.rangeAddr) {
-          let provinceList = JSON.parse(this.level4CompanyData.rangeAddr)
+          let provinceList = JSON.parse(this.level4CompanyData.rangeAddr);
           this.options = provinceList.map((x) => {
             return {
               value: x,
-              label: x
-            }
-          })
+              label: x,
+            };
+          });
         }
         //  this.getGeoJson('/js/mapJson/city.json').then(res=>{
         //     province.push(...res)
@@ -2558,14 +2826,14 @@ export default {
       //       this.$t("message.companyDiagram.addManagementMessage1")
       //     ); //请先添加一级管理机构
       //   } else {
-      console.log(this.addCompanyForm)
-      this.addCompanyForm.companyType = companyType
-      this.addCompanyForm.companyName = ''
+      console.log(this.addCompanyForm);
+      this.addCompanyForm.companyType = companyType;
+      this.addCompanyForm.companyName = "";
       if (parentId) {
-        this.addCompanyForm.parentId = parentId
+        this.addCompanyForm.parentId = parentId;
       } else {
-        this.addCompanyForm.parentSn = this.$store.state.userInfo.sn
-        this.addCompanyForm.parentId = ''
+        this.addCompanyForm.parentSn = this.$store.state.userInfo.sn;
+        this.addCompanyForm.parentId = "";
       }
 
       // if (this.level1CompanyData.length > 0) {
@@ -2578,279 +2846,335 @@ export default {
       // this.dialogTitle = this.$t(
       //   "message.companyDiagram.addManagementTitle2"
       // ); //添加二级管理机构
-      this.dialogTitle = '添加管理机构'
-      this.isAdd = true
+      this.dialogTitle = "添加管理机构";
+      this.isAdd = true;
       this.$nextTick(() => {
-        this.$refs['addCompanyForm'].clearValidate()
-      })
+        this.$refs["addCompanyForm"].clearValidate();
+      });
       //   }
     },
     //新增或编辑管理机构
     saveCompanyFn() {
-      console.log(this.addCompanyForm)
-      this.$refs['addCompanyForm'].validate((valid) => {
+      console.log(this.addCompanyForm);
+      this.$refs["addCompanyForm"].validate((valid) => {
         if (valid) {
           if (this.isAdd) {
-            console.log('增加保存')
+            console.log("增加保存");
             // console.log(JSON.stringify(this.value1))
             // console.log(this.value1)
             // let choosePrivnce = this.value1
-            let choosePrivnce = this.selectValue
-            this.addCompanyForm.rangeAddr = JSON.stringify(this.selectValue)
+            let choosePrivnce = this.selectValue;
+            this.addCompanyForm.rangeAddr = JSON.stringify(this.selectValue);
             let newPrivnce = this.options4.filter((x) => {
               if (choosePrivnce.indexOf(x.value) === -1) {
-                return x
+                return x;
               }
-            })
-            this.options4 = newPrivnce
-            console.log(this.addCompanyForm)
+            });
+            this.options4 = newPrivnce;
+            console.log(this.addCompanyForm);
             addCompanyApi(this.addCompanyForm).then((res) => {
-              this.addCompanyDialog = false
-              this.initData()
+              this.addCompanyDialog = false;
+              this.initData();
               this.$message.success(
-                this.$t('message.companyDiagram.addSuccess')
-              )
-            })
+                this.$t("message.companyDiagram.addSuccess")
+              );
+            });
           } else {
-            console.log('编辑保存')
-            console.log(this.addCompanyForm.editType)
-            console.log(this.addCompanyForm)
+            console.log("编辑保存");
+            console.log(this.addCompanyForm.editType);
+            console.log(this.addCompanyForm);
 
             // this.addCompanyForm.rangeAddr = JSON.stringify(this.value1)
-            this.addCompanyForm.rangeAddr = JSON.stringify(this.selectValue)
-            this.value1 = ''
-            this.selectValue = []
-            let obj = this.addCompanyForm
-            obj.editType = 1
+            this.addCompanyForm.rangeAddr = JSON.stringify(this.selectValue);
+            this.value1 = "";
+            this.selectValue = [];
+            let obj = this.addCompanyForm;
+            obj.editType = 1;
             editCompanyApi(obj).then((res) => {
-              console.log(res)
-              this.addCompanyDialog = false
-              this.initData()
+              console.log(res);
+              this.addCompanyDialog = false;
+              this.initData();
               this.$message.success(
-                this.$t('message.companyDiagram.editSuccess')
-              )
-            })
+                this.$t("message.companyDiagram.editSuccess")
+              );
+            });
           }
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
+      });
     },
     //显示添加岗位弹框
     addJobFn() {
       //
-      this.isAdd = true
-      this.jobDialogTitle = '添加岗位' //添加岗位
-      this.addJobForm.jobName = ''
-      this.addJobForm.jobDuty = ''
+      this.isAdd = true;
+      this.jobDialogTitle = "添加岗位"; //添加岗位
+      this.addJobForm.jobName = "";
+      this.addJobForm.jobDuty = "";
 
       if (this.treeSelectData.companyType) {
-        this.addJobForm.sn = this.treeSelectData.companySn
+        this.addJobForm.sn = this.treeSelectData.companySn;
       } else {
-        this.addJobForm.sn = this.treeSelectData.projectSn
+        this.addJobForm.sn = this.treeSelectData.projectSn;
       }
 
-      this.addJobDialog = true
+      this.addJobDialog = true;
       this.$nextTick(() => {
-        this.$refs['addJobForm'].clearValidate()
-      })
+        this.$refs["addJobForm"].clearValidate();
+      });
     },
     //显示编辑岗位弹框
     editJobFn(item) {
-      this.jobDialogTitle = '编辑岗位' //编辑岗位
-      this.addJobForm = JSON.parse(JSON.stringify(item))
-      this.addJobDialog = true
-      this.isAdd = false
+      this.jobDialogTitle = "编辑岗位"; //编辑岗位
+      this.addJobForm = JSON.parse(JSON.stringify(item));
+      this.addJobDialog = true;
+      this.isAdd = false;
       this.$nextTick(() => {
-        this.$refs['addJobForm'].clearValidate()
-      })
+        this.$refs["addJobForm"].clearValidate();
+      });
     },
     // 保存岗位信息
     saveJobFn() {
-      this.$refs['addJobForm'].validate((valid) => {
+      this.$refs["addJobForm"].validate((valid) => {
         if (valid) {
           if (this.isAdd) {
             addorganizationJobApi(this.addJobForm).then((res) => {
-              this.addJobDialog = false
-              this.getJobList()
+              this.addJobDialog = false;
+              this.getJobList();
               this.$message.success(
-                this.$t('message.companyDiagram.addSuccess')
-              ) //添加成功！
-            })
+                this.$t("message.companyDiagram.addSuccess")
+              ); //添加成功！
+            });
           } else {
             editorganizationJobApi(this.addJobForm).then((res) => {
-              this.addJobDialog = false
-              this.getJobList()
+              this.addJobDialog = false;
+              this.getJobList();
               this.$message.success(
-                this.$t('message.companyDiagram.editSuccess')
-              ) //编辑成功！
-            })
+                this.$t("message.companyDiagram.editSuccess")
+              ); //编辑成功！
+            });
           }
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
+      });
     },
     //获取岗位列表
     getJobList() {
-      let data = this.treeSelectData
-      let sn = data.projectSn ? data.projectSn : data.companySn
+      let data = this.treeSelectData;
+      let sn = data.projectSn ? data.projectSn : data.companySn;
       getorganizationJobListApi({ sn: sn }).then((res) => {
-        this.jobList = res.result
-      })
+        this.jobList = res.result;
+      });
+    },
+    // 拒绝申请
+    noPassFn(item) {
+      this.$confirm(
+        "账号xxx拒绝申请后将会发送" + "【注册失败提醒】到注册人邮箱!",
+        this.$t("message.companyDiagram.Tips"),
+        {
+          confirmButtonText: this.$t(
+            "message.companyDiagram.confirmButtonText"
+          ), //确定
+          cancelButtonText: this.$t("message.companyDiagram.cancelButtonText"), //取消
+          type: "warning",
+        }
+      ).then(() => {
+        deleteorganizationJobApi({ id: item.id }).then((res) => {
+          this.getJobList();
+          this.$message.success(
+            this.$t("message.companyDiagram.deleteSuccess")
+          ); //删除成功!
+        });
+      });
+    },
+    // 审批通过
+    auditPass(item) {
+      this.$confirm(
+        "账号xxx审批通过后将会发送" + "【注册成功提醒】到注册人邮箱!",
+        this.$t("message.companyDiagram.Tips"),
+        {
+          confirmButtonText: this.$t(
+            "message.companyDiagram.confirmButtonText"
+          ), //确定
+          cancelButtonText: this.$t("message.companyDiagram.cancelButtonText"), //取消
+          type: "warning",
+        }
+      ).then(() => {
+        deleteorganizationJobApi({ id: item.id }).then((res) => {
+          this.getJobList();
+          this.$message.success(
+            this.$t("message.companyDiagram.deleteSuccess")
+          ); //删除成功!
+        });
+      });
+    },
+    // 关联组织
+    relativeGroupFn(item) {
+      this.relativeGroupDialog = true;
     },
     //删除岗位
     deleteJobFn(item) {
       this.$confirm(
-        this.$t('message.companyDiagram.deleteAccountMsg') +
-        '【' +
-        item.jobName +
-        '】?',
-        this.$t('message.companyDiagram.Tips'),
+        this.$t("message.companyDiagram.deleteAccountMsg") +
+          "【" +
+          item.jobName +
+          "】?",
+        this.$t("message.companyDiagram.Tips"),
         {
           confirmButtonText: this.$t(
-            'message.companyDiagram.confirmButtonText'
+            "message.companyDiagram.confirmButtonText"
           ), //确定
-          cancelButtonText: this.$t('message.companyDiagram.cancelButtonText'), //取消
-          type: 'warning'
+          cancelButtonText: this.$t("message.companyDiagram.cancelButtonText"), //取消
+          type: "warning",
         }
       ).then(() => {
         deleteorganizationJobApi({ id: item.id }).then((res) => {
-          this.getJobList()
-          this.$message.success(this.$t('message.companyDiagram.deleteSuccess')) //删除成功!
-        })
-      })
+          this.getJobList();
+          this.$message.success(
+            this.$t("message.companyDiagram.deleteSuccess")
+          ); //删除成功!
+        });
+      });
     },
     //显示添加账号弹框
     addAccountFn() {
       //
-      this.isAdd = true
-      this.accountDialogTitle = '添加成员' //添加账号
-      this.addAccountForm.account = ''
-      this.addAccountForm.password = ''
-      this.addAccountForm.jobId = ''
-      this.addAccountForm.userTel = ''
-      this.addAccountForm.realName = ''
-      this.addAccountForm.externalAccount = ''
-      delete this.addAccountForm.showPassword
+      this.isAdd = true;
+      this.accountDialogTitle = "添加成员"; //添加账号
+      this.addAccountForm.account = "";
+      this.addAccountForm.password = "";
+      this.addAccountForm.jobId = "";
+      this.addAccountForm.userTel = "";
+      this.addAccountForm.realName = "";
+      this.addAccountForm.externalAccount = "";
+      delete this.addAccountForm.showPassword;
       if (this.treeSelectData.companyType) {
-        this.addAccountForm.accountType = this.treeSelectData.companyType + 1
-        this.addAccountForm.sn = this.treeSelectData.companySn
+        this.addAccountForm.accountType = this.treeSelectData.companyType + 1;
+        this.addAccountForm.sn = this.treeSelectData.companySn;
         if (this.treeSelectData.companyType == 4) {
-          this.addAccountForm.accountType = 7
+          this.addAccountForm.accountType = 7;
         }
       } else {
-        this.addAccountForm.accountType = 5
-        this.addAccountForm.sn = this.treeSelectData.projectSn
+        this.addAccountForm.accountType = 5;
+        this.addAccountForm.sn = this.treeSelectData.projectSn;
       }
 
-      this.addAccountDialog = true
+      this.addAccountDialog = true;
       this.$nextTick(() => {
-        this.$refs['addAccountForm'].clearValidate()
+        this.$refs["addAccountForm"].clearValidate();
         // this.addAccountForm={}
-      })
+      });
+    },
+    // 显示调整组织弹框
+    editGroup() {
+      this.editGroupDialog = true;
     },
     //显示编辑账号弹框
     editAccountFn(item) {
-      this.accountDialogTitle = '编辑成员' //编辑账号
-      this.addAccountForm = JSON.parse(JSON.stringify(item))
-      this.addAccountDialog = true
-      this.isAdd = false
+      this.accountDialogTitle = "编辑成员"; //编辑账号
+      this.addAccountForm = JSON.parse(JSON.stringify(item));
+      this.addAccountDialog = true;
+      this.isAdd = false;
       this.$nextTick(() => {
-        this.$refs['addAccountForm'].clearValidate()
-      })
+        this.$refs["addAccountForm"].clearValidate();
+      });
     },
     //新增或编辑账号
     saveAccountFn() {
       if (this.addAccountForm.userTel) {
         if (!checkPhone(this.addAccountForm.userTel)) {
-          this.$message.error('请输入正确的手机号码')
-          return
+          this.$message.error("请输入正确的手机号码");
+          return;
         }
       }
 
-      this.$refs['addAccountForm'].validate((valid) => {
+      this.$refs["addAccountForm"].validate((valid) => {
         if (valid) {
           if (this.isAdd) {
             addSystemUserApi(this.addAccountForm).then((res) => {
-              this.addAccountDialog = false
-              this.getAccountList()
+              this.addAccountDialog = false;
+              this.getAccountList();
               this.$message.success(
-                this.$t('message.companyDiagram.addSuccess')
-              ) //添加成功！
-            })
+                this.$t("message.companyDiagram.addSuccess")
+              ); //添加成功！
+            });
           } else {
             editSystemUserApi(this.addAccountForm).then((res) => {
-              this.addAccountDialog = false
-              this.getAccountList()
+              this.addAccountDialog = false;
+              this.getAccountList();
               this.$message.success(
-                this.$t('message.companyDiagram.editSuccess')
-              ) //编辑成功！
-            })
+                this.$t("message.companyDiagram.editSuccess")
+              ); //编辑成功！
+            });
           }
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
+      });
     },
     //删除账号
     deleteAccountFn(item) {
       this.$confirm(
-        this.$t('message.companyDiagram.deleteAccountMsg') +
-        '【' +
-        item.account +
-        '】?',
-        this.$t('message.companyDiagram.Tips'),
+        this.$t("message.companyDiagram.deleteAccountMsg") +
+          "【" +
+          item.account +
+          "】?",
+        this.$t("message.companyDiagram.Tips"),
         {
           confirmButtonText: this.$t(
-            'message.companyDiagram.confirmButtonText'
+            "message.companyDiagram.confirmButtonText"
           ), //确定
-          cancelButtonText: this.$t('message.companyDiagram.cancelButtonText'), //取消
-          type: 'warning'
+          cancelButtonText: this.$t("message.companyDiagram.cancelButtonText"), //取消
+          type: "warning",
         }
       ).then(() => {
         deleteSystemUserApi({ id: item.userId }).then((res) => {
-          this.getAccountList()
-          this.$message.success(this.$t('message.companyDiagram.deleteSuccess')) //删除成功!
-        })
-      })
+          this.getAccountList();
+          this.$message.success(
+            this.$t("message.companyDiagram.deleteSuccess")
+          ); //删除成功!
+        });
+      });
     },
     //获取账号列表
     getAccountList() {
-      let data = this.treeSelectData
-      let sn = data.projectSn ? data.projectSn : data.companySn
+      let data = this.treeSelectData;
+      let sn = data.projectSn ? data.projectSn : data.companySn;
       getSystemUserBySnApi({ sn: sn }).then((res) => {
-        this.level1AccountData = res.result
-      })
+        this.level1AccountData = res.result;
+      });
     },
     //删除项目
     deleteProjectFn(item, index) {
       //   console.log("index", index);
       this.$confirm(
-        this.$t('message.companyDiagram.deleteItemMsg') +
-        '【' +
-        item.projectName +
-        '】?',
-        this.$t('message.companyDiagram.Tips'),
+        this.$t("message.companyDiagram.deleteItemMsg") +
+          "【" +
+          item.projectName +
+          "】?",
+        this.$t("message.companyDiagram.Tips"),
         {
           confirmButtonText: this.$t(
-            'message.companyDiagram.confirmButtonText'
+            "message.companyDiagram.confirmButtonText"
           ), //确定
-          cancelButtonText: this.$t('message.companyDiagram.cancelButtonText'), //取消
-          type: 'warning'
+          cancelButtonText: this.$t("message.companyDiagram.cancelButtonText"), //取消
+          type: "warning",
         }
       ).then(() => {
         deleteProjectApi({ projectId: item.projectId }).then((res) => {
           //   if (index <= this.projectIndex && this.projectIndex != 0) {
           //     this.projectIndex--;
           //   }
-          this.initData()
-          this.$message.success(this.$t('message.companyDiagram.deleteSuccess')) //删除成功!
-        })
-      })
+          this.initData();
+          this.$message.success(
+            this.$t("message.companyDiagram.deleteSuccess")
+          ); //删除成功!
+        });
+      });
     },
     //显示添加项目弹框
     addProjectFn(parentSn) {
@@ -2880,73 +3204,73 @@ export default {
       //   } else {
       //     this.addProjectForm.companySn = this.$store.state.userInfo.sn;
       //   }
-      this.addProjectForm.companySn = parentSn
-      this.addProjectDialog = true
-      this.projectDialogTitle = this.$t('message.companyDiagram.addProject') //新增项目
-      this.isAdd = true
+      this.addProjectForm.companySn = parentSn;
+      this.addProjectDialog = true;
+      this.projectDialogTitle = this.$t("message.companyDiagram.addProject"); //新增项目
+      this.isAdd = true;
 
       this.$nextTick(() => {
         setTimeout(() => {
-          this.$refs['addProjectForm'].resetFields()
-          this.$refs.cascader.$refs.panel.activePath = []
-          this.provincesCityArr = []
-        }, 200)
-      })
+          this.$refs["addProjectForm"].resetFields();
+          this.$refs.cascader.$refs.panel.activePath = [];
+          this.provincesCityArr = [];
+        }, 200);
+      });
     },
     //显示编辑项目弹框
     editProjectFn(item) {
-      console.log('编辑页有值吗', item)
-      this.projectDialogTitle = this.$t('message.companyDiagram.editProject') //编辑项目
-      this.isAdd = false
-      this.addProjectForm = JSON.parse(JSON.stringify(item))
-      this.addProjectDialog = true
+      console.log("编辑页有值吗", item);
+      this.projectDialogTitle = this.$t("message.companyDiagram.editProject"); //编辑项目
+      this.isAdd = false;
+      this.addProjectForm = JSON.parse(JSON.stringify(item));
+      this.addProjectDialog = true;
       this.$nextTick(() => {
         setTimeout(() => {
-          this.$refs['addProjectForm'].clearValidate()
-          this.$refs.cascader.$refs.panel.activePath = []
+          this.$refs["addProjectForm"].clearValidate();
+          this.$refs.cascader.$refs.panel.activePath = [];
           this.provincesCityArr = [
             item.provincesCode,
             item.cityCode,
-            item.areaCode
-          ]
-        }, 200)
-      })
+            item.areaCode,
+          ];
+        }, 200);
+      });
     },
     //添加编辑项目
     saveProjectFn() {
       if (this.addProjectForm.projectTel) {
         if (!checkPhone(this.addProjectForm.projectTel)) {
-          this.$message.error('请输入正确的联系电话')
-          return
+          this.$message.error("请输入正确的联系电话");
+          return;
         }
       }
-      this.$refs['addProjectForm'].validate((valid) => {
+      this.$refs["addProjectForm"].validate((valid) => {
         if (valid) {
           if (this.isAdd) {
-            console.log(this.addProjectForm)
+            console.log(this.addProjectForm);
             addProjectApi(this.addProjectForm).then((res) => {
-              console.log('添加成功', res)
-              this.addProjectDialog = false
-              this.initData()
+              console.log("添加成功", res);
+              this.addProjectDialog = false;
+              this.initData();
               this.$message.success(
-                this.$t('message.companyDiagram.addSuccess')
-              ) //添加成功！
-            })
+                this.$t("message.companyDiagram.addSuccess")
+              ); //添加成功！
+            });
           } else {
             editProjectApi(this.addProjectForm).then((res) => {
-              console.log('信息编辑', res)
-              this.addProjectDialog = false
-              this.initData()
+              console.log("信息编辑", res);
+              this.addProjectDialog = false;
+              this.initData();
               this.$message.success(
-                this.$t('message.companyDiagram.editSuccess')
-              ) //编辑成功！
-            })
+                this.$t("message.companyDiagram.editSuccess")
+              ); //编辑成功！
+            });
           }
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
+      });
     },
     //搜索项目
     // loadProjectData() {
@@ -2963,19 +3287,19 @@ export default {
     //   });
     // },
     toGetLocalFn() {
-      this.showMap = true
+      this.showMap = true;
       // window.open("https://lbs.amap.com/console/show/picker");
     },
     loadProvincesCityList() {
       selectProvincesCityListApi().then((res) => {
-        this.provincesCityList = res.result
-      })
+        this.provincesCityList = res.result;
+      });
     },
     changeProvincesCity(val) {
-      console.log(val)
-      this.addProjectForm.provincesCode = val[0]
-      this.addProjectForm.cityCode = val[1]
-      this.addProjectForm.areaCode = val[2]
+      console.log(val);
+      this.addProjectForm.provincesCode = val[0];
+      this.addProjectForm.cityCode = val[1];
+      this.addProjectForm.areaCode = val[2];
     },
     // handleRemove(){
     //     this.addProjectForm.layoutImage=''
@@ -2986,138 +3310,143 @@ export default {
     //   },
     beforeAvatarUpload(file) {
       if (
-        file.type != 'image/jpeg' &&
-        file.type != 'image/png' &&
-        file.type != 'image/jpg' &&
-        file.type != 'image/bmp'
+        file.type != "image/jpeg" &&
+        file.type != "image/png" &&
+        file.type != "image/jpg" &&
+        file.type != "image/bmp"
       ) {
-        this.$message.error(this.$t('message.companyDiagram.uploadMsg')) //只能上传图片
-        return false
+        this.$message.error(this.$t("message.companyDiagram.uploadMsg")); //只能上传图片
+        return false;
       } else {
-        return true
+        return true;
       }
     },
     handleUploadSuccess(res) {
       // console.log(res);
       this.addProjectForm.layoutImage =
-        this.$store.state.FILEURL + res.data[0].imageUrl
+        this.$store.state.FILEURL + res.data[0].imageUrl;
     },
     openAuthorizedConfig(type) {
       this.authorizedConfig = {
         type: type,
-        show: true
-      }
+        show: true,
+      };
     },
     configAccountFn(item, type) {
-      this.isIndeterminate = false
-      this.checkArr = this.yiCheckArr
-      this.checkOptions = this.yiCheckOptions
-      item.moduleId = []
-      this.moduleInfo = JSON.parse(JSON.stringify(item))
-      if (type == 'project') {
-        this.getProjectModuleArr(item.projectSn)
+      this.isIndeterminate = false;
+      this.checkArr = this.yiCheckArr;
+      this.checkOptions = this.yiCheckOptions;
+      item.moduleId = [];
+      this.moduleInfo = JSON.parse(JSON.stringify(item));
+      if (type == "project") {
+        this.getProjectModuleArr(item.projectSn);
       } else {
-        this.getUserModuleArr(item.userId)
+        this.getUserModuleArr(item.userId);
       }
-      this.openAuthorizedConfig(type) //一级管理机构
-      console.log('查看一/二级配置', this.moduleInfo)
+      this.openAuthorizedConfig(type); //一级管理机构
+      console.log("查看一/二级配置", this.moduleInfo);
     },
     getProjectModuleArr(projectSn) {
       getProjectModuleList({ projectSn: projectSn }).then((result) => {
         if (result.success) {
-          console.log('项目配置的模块', result)
+          console.log("项目配置的模块", result);
           result.result.map((item) => {
-            this.moduleInfo.moduleId.push(item.moduleId)
-          })
-          this.handleCheckedCitiesChange(this.moduleInfo.moduleId)
+            this.moduleInfo.moduleId.push(item.moduleId);
+          });
+          this.handleCheckedCitiesChange(this.moduleInfo.moduleId);
         }
-      })
+      });
     },
     getUserModuleArr(userId) {
       getUserModuleList({
         userId: userId,
-        styleType: this.$store.state.userInfo.styleType
+        styleType: this.$store.state.userInfo.styleType,
       }).then((result) => {
         if (result.success) {
-          console.log('一级管理机构配置的模块', result)
+          console.log("一级管理机构配置的模块", result);
           result.result.map((item) => {
-            this.moduleInfo.moduleId.push(item.moduleId)
-          })
-          this.handleCheckedCitiesChange(this.moduleInfo.moduleId)
+            this.moduleInfo.moduleId.push(item.moduleId);
+          });
+          this.handleCheckedCitiesChange(this.moduleInfo.moduleId);
         }
-      })
+      });
     },
     editModule(item) {
-      this.isIndeterminate = false
-      this.checkArr = this.projectCheckArr
-      this.checkOptions = this.projectOptions
-      item.moduleId = []
-      this.moduleInfo = JSON.parse(JSON.stringify(item))
-      console.log('项目item+moduleInfo', this.moduleInfo)
-      this.getProjectModuleArr(item.projectSn)
-      this.openAuthorizedConfig('project')
+      this.isIndeterminate = false;
+      this.checkArr = this.projectCheckArr;
+      this.checkOptions = this.projectOptions;
+      item.moduleId = [];
+      this.moduleInfo = JSON.parse(JSON.stringify(item));
+      console.log("项目item+moduleInfo", this.moduleInfo);
+      this.getProjectModuleArr(item.projectSn);
+      this.openAuthorizedConfig("project");
     },
     getModuleList() {
       getCompanyModuleList({
-        headquartersSn: this.addCompanyForm.headquartersSn
+        headquartersSn: this.addCompanyForm.headquartersSn,
       }).then((result) => {
         if (result.success) {
-          console.log('checkArr', result)
+          console.log("checkArr", result);
           result.result.map((item) => {
-            this.yiCheckArr.push(item)
-            this.yiCheckOptions.push(item.moduleId)
+            this.yiCheckArr.push(item);
+            this.yiCheckOptions.push(item.moduleId);
             if (item.moduleType === 2 || item.moduleType === 4) {
-              this.projectCheckArr.push(item)
-              this.projectOptions.push(item.moduleId)
+              this.projectCheckArr.push(item);
+              this.projectOptions.push(item.moduleId);
             }
-          })
+          });
         }
-      })
+      });
     },
     handleCheckAllChange(val) {
-      this.moduleInfo.moduleId = val ? this.checkOptions : []
-      this.isIndeterminate = false
+      this.moduleInfo.moduleId = val ? this.checkOptions : [];
+      this.isIndeterminate = false;
     },
     handleCheckedCitiesChange(value) {
-      let checkedCount = value.length
-      this.checkAll = checkedCount === this.checkOptions.length
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.checkOptions.length;
       this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.checkOptions.length
+        checkedCount > 0 && checkedCount < this.checkOptions.length;
     },
     saveModuleConfig() {
       let moduleIdStr = this.moduleInfo.moduleId
-        ? JSON.parse(JSON.stringify(this.moduleInfo)).moduleId.join(',')
-        : {}
+        ? JSON.parse(JSON.stringify(this.moduleInfo)).moduleId.join(",")
+        : {};
       if (
-        this.authorizedConfig.type === 'yi' ||
-        this.authorizedConfig.type === 'er'
+        this.authorizedConfig.type === "yi" ||
+        this.authorizedConfig.type === "er"
       ) {
         baseModuleUserEdit({
           moduleIdStr: moduleIdStr,
-          userId: this.moduleInfo.userId
+          userId: this.moduleInfo.userId,
         }).then((result) => {
           if (result.success) {
-            this.$message.success('配置成功！')
-            this.authorizedConfig.show = false
+            this.$message.success("配置成功！");
+            this.authorizedConfig.show = false;
           }
-        })
-        console.log('保存一级配置')
-      } else if (this.authorizedConfig.type === 'project') {
+        });
+        console.log("保存一级配置");
+      } else if (this.authorizedConfig.type === "project") {
         baseModuleProjectEdit({
           headquartersSn: this.addCompanyForm.headquartersSn,
           moduleIdStr: moduleIdStr,
           sn: this.moduleInfo.projectSn,
-          type: '2'
+          type: "2",
         }).then((result) => {
           if (result.success) {
-            this.$message.success('配置成功！')
-            this.authorizedConfig.show = false
+            this.$message.success("配置成功！");
+            this.authorizedConfig.show = false;
           }
-        })
+        });
       }
-    }
-  }
-}
+    },
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+};
 </script>
 <style lang="less" scoped>
 .custom-tree-node {
@@ -3474,7 +3803,37 @@ export default {
     border-radius: 5px;
   }
 }
-
+.select-content {
+  box-sizing: border-box;
+  height: 34px;
+  line-height: 34px !important;
+  border-radius: 3px;
+  border: 1px solid #d7dbe9;
+  padding: 0 15px;
+  position: relative;
+  .tip-text {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    cursor: pointer;
+  }
+  .select-list {
+    width: 100%;
+    position: absolute;
+    top: 34px;
+    left: -3px;
+    z-index: 10;
+    background-color: #fff;
+    border-radius: 4px;
+    box-shadow: 4px 4px 10px #e3e3e3;
+    padding-top: 10px;
+    &-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+  }
+}
 // ::v-deep .el-form-item__label {
 //   text-align: center !important;
 // }
@@ -3484,4 +3843,4 @@ export default {
 // /deep/ .el-checkbox__input{
 //   display: none;
 // }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue
new file mode 100644
index 00000000..c3eee1ea
--- /dev/null
+++ b/src/views/home/login_v2.vue
@@ -0,0 +1,1210 @@
+<template>
+  <!-- 登录 -->
+  <div>
+    <div class="login" v-if="projectType == 'common'">
+      <div class="title flex">
+        <div class="title_l flex2">
+          <img
+            v-if="systemInfo.loginLogo"
+            :src="systemInfo.loginLogo"
+            class="logo"
+          />
+          <img
+            v-else-if="LOGO"
+            :src="'./img/logo/' + LOGO + '.png'"
+            class="logo"
+          />
+          <span v-if="systemInfo.platformName && company != 'nanchang'">{{
+            systemInfo.platformName
+          }}</span
+          ><!--智慧工地云平台-->
+          <span v-if="!systemInfo.platformName && company != 'nanchang'">{{
+            $t("message.login.title")
+          }}</span
+          ><!--智慧工地云平台-->
+
+          <!-- 南昌地铁登录页不显示智慧工地云平台字样 -->
+          <span v-if="company == 'nanchang'"></span>
+        </div>
+        <div class="title_r">
+          <el-button
+            type="primary"
+            plain
+            size="small"
+            class="backBtn"
+            @click="goBackBtn"
+            >返回到首页</el-button
+          >
+        </div>
+      </div>
+      <div class="content flex2">
+        <img
+          class="contentBG"
+          v-if="systemInfo.loginBackgroundImage"
+          :src="systemInfo.loginBackgroundImage"
+          alt=""
+        />
+        <img
+          class="contentBG"
+          v-else
+          src="../../assets/images/login_bg.webp"
+          alt=""
+        />
+        <div class="loginContent" v-if="COMPANY == 'hengtong'">
+          <div>
+            <span style="font-size: 3.8vw">欢</span>迎进入<span
+              style="color: orange"
+              >智建宝</span
+            >云平台
+          </div>
+        </div>
+        <div class="login_info" v-if="isLogin">
+          <div class="info_title flex">
+            <p
+              :class="loginType == 1 ? 'border_bottom' : 'placeholder'"
+              @click="
+                () => {
+                  loginType = 1;
+                }
+              "
+            >
+              用户登录
+            </p>
+            <p
+              :class="loginType == 2 ? 'border_bottom' : 'placeholder'"
+              @click="
+                () => {
+                  loginType = 2;
+                }
+              "
+            >
+              供应商登录
+            </p>
+          </div>
+          <div class="info_content">
+            <el-form :model="form" :rules="rules" ref="form" label-width="0px" 
+              key="form">
+              <el-form-item label="" prop="account">
+                <el-input
+                  v-model="form.account"
+                  style="height: 53px; font-size: 16px"
+                  :placeholder="$t('message.login.account_placeholder')"
+                >
+                  <img
+                    slot="prefix"
+                    src="../../assets/images/accountNumber.png"
+                    class="inputIcon"
+                  />
+                </el-input>
+              </el-form-item>
+              <el-form-item style="margin-top: 25px" label="" prop="password">
+                <!--  @keyup.enter.native="loginFn" -->
+                <el-input
+                  v-model="form.password"
+                  style="height: 53px; font-size: 16px"
+                  type="password"
+                  show-password
+                  :placeholder="$t('message.login.password_placeholder')"
+                >
+                  <img
+                    slot="prefix"
+                    src="../../assets/images/password.png"
+                    class="inputIcon"
+                  />
+                </el-input>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div style="margin-top: 25px">
+            <!-- <el-button type="success" plain class="logo_btn" :disabled="verificateBtn"  @click="verificateFn"
+              >{{ verificateBtn==false?'立即点击验证':'验证成功'}}
+            </el-button> -->
+            <el-button
+              type="success"
+              v-if="verificateBtn == false"
+              plain
+              class="logo_btn"
+              :disabled="verificateBtn"
+              @click="verificateFn"
+            >
+              <div class="point"></div>
+              立即点击验证
+            </el-button>
+            <el-button
+              type="success"
+              v-else
+              plain
+              class="logo_btn"
+              :disabled="verificateBtn"
+              ><i class="el-icon-success"></i> 验证成功
+            </el-button>
+          </div>
+          <div style="margin-top: 25px">
+            <el-button
+              type="primary"
+              :disabled="pass"
+              class="logo_btn"
+              @click="loginFn"
+              >{{ $t("message.login.login") }}
+            </el-button>
+          </div>
+          <div class="register-btn">
+            <el-button type="text" @click="goRegister">{{
+              loginType == 1 ? "用户账号注册" : "供应商账号注册"
+            }}</el-button>
+          </div>
+          <div class="info_bottom">
+            友情提示：win7以上操作系统，浏览器使用Chrome；电脑屏幕分辩率>=1440X900达到最佳浏览视觉
+          </div>
+          <!-- <div class="info_bottom">为了平台效果展示更好，请使用屏幕分辩率>=1440X900</div> -->
+          <div class="info_bottom flex" style="display: none">
+            <div
+              class="flex2"
+              @click="
+                () => {
+                  automaticLogin = !this.automaticLogin;
+                }
+              "
+            >
+              <img
+                src="../../assets/images/no_checked.png"
+                v-if="!automaticLogin"
+              />
+              <img
+                src="../../assets/images/checked.png"
+                v-if="automaticLogin"
+              />
+              <span style="margin-left: 12px">{{
+                $t("message.login.automaticLogon")
+              }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 5px">{{
+                $t("message.login.forgetThePassword")
+              }}</span>
+              <span class="span_placeholder"></span>
+              <el-button type="text" style="margin-left: 5px" @click="goSignIn">
+                {{ $t("message.login.clickRegister") }}
+              </el-button>
+            </div>
+          </div>
+        </div>
+        <div class="login_info-register" v-if="!isLogin">
+          <div class="info_title flex">
+            <p
+              :class="registerType == 1 ? 'border_bottom' : 'placeholder'"
+              @click="
+                () => {
+                  registerType = 1;
+                }
+              "
+            >
+              新用户注册
+            </p>
+            <p
+              :class="registerType == 2 ? 'border_bottom' : 'placeholder'"
+              @click="
+                () => {
+                  registerType = 2;
+                }
+              "
+            >
+              供应商注册
+            </p>
+          </div>
+          <div class="info_content">
+            <el-form
+              :model="registerForm"
+              :rules="registerRules"
+              ref="registerForm"
+              key="registerForm"
+              label-width="0px"
+            >
+              <el-form-item label="" prop="userName">
+                <el-input
+                  v-model="registerForm.userName"
+                  style="height: 53px; font-size: 16px"
+                  placeholder="请输入您的账号"
+                >
+                  <img
+                    slot="prefix"
+                    src="../../assets/images/userNameIcon.png"
+                    class="inputIcon"
+                  />
+                </el-input>
+              </el-form-item>
+              <el-form-item label="" prop="password">
+                <!--  @keyup.enter.native="loginFn" -->
+                <el-input
+                  v-model="registerForm.password"
+                  style="height: 53px; font-size: 16px"
+                  type="password"
+                  show-password
+                  placeholder="请输入您的密码"
+                >
+                  <img
+                    slot="prefix"
+                    src="../../assets/images/password.png"
+                    class="inputIcon"
+                  />
+                </el-input>
+              </el-form-item>
+              <el-form-item
+                label=""
+                prop="enterpriseName"
+                v-if="registerType == 2"
+              >
+                <!--  @keyup.enter.native="loginFn" -->
+                <el-input
+                  v-model="registerForm.enterpriseName"
+                  style="height: 53px; font-size: 16px"
+                  placeholder="请输入您的企业名称"
+                >
+                  <img
+                    slot="prefix"
+                    src="../../assets/images/enterpriseIcon.png"
+                    class="inputIcon"
+                  />
+                </el-input>
+              </el-form-item>
+              <el-form-item label="" prop="email">
+                <!--  @keyup.enter.native="loginFn" -->
+                <el-input
+                  v-model="registerForm.email"
+                  style="height: 53px; font-size: 16px"
+                  placeholder="请输入您的电子邮箱"
+                >
+                  <img
+                    slot="prefix"
+                    src="../../assets/images/emailIcon.png"
+                    class="inputIcon"
+                  />
+                </el-input>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div>
+            <el-button type="primary" class="logo_btn" @click="registerFn"
+              >提交
+            </el-button>
+          </div>
+          <div class="register-btn">
+            <el-button type="text" @click="goLogin">返回登录</el-button>
+          </div>
+        </div>
+        <!-- 滑动验证 -->
+        <div class="mask" v-if="showVerify" @click.self="showVerify = false">
+          <div class="slideContainer">
+            <slide-verify
+              :l="42"
+              :r="10"
+              :w="330"
+              :h="175"
+              :imgs="imageList"
+              slider-text="向右滑动滑块填充拼图"
+              ref="slideverify"
+              @success="onSuccess"
+              @fail="onFail"
+              @refresh="onRefresh"
+            ></slide-verify>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="zjsjLogin" v-if="projectType == 'zjsj'">
+      <div class="zjsjcontent">
+        <img
+          class="contentBGI"
+          src="../../assets/images/zjsj/zjsj_loginBgc.jpg"
+          alt=""
+        />
+        <LoginInfo
+          class="leftContent"
+          ref="LoginInfo"
+          :form="form"
+          :rules="rules"
+          @loginFn="loginFn"
+        ></LoginInfo>
+      </div>
+    </div>
+    <!-- 修改密码弹框 -->
+    <el-dialog
+      :modal-append-to-body="false"
+      title="提示"
+      :visible.sync="addPasswordDialog"
+      width="667px"
+      @close="close"
+    >
+      <div class="dialog_content">
+        <div class="questionText">
+          <i
+            style="color: #e1a439; margin-right: 1%"
+            class="el-icon-question"
+          ></i
+          >密码有效期已超过90天，为确保您的账号安全，请重新修改密码！
+        </div>
+        <el-form
+          size="medium"
+          :model="passwordForm"
+          ref="passwordForm"
+          :rules="passwordFormRules"
+          label-width="120px"
+          class="dialogFormBox"
+          style="margin-left: 20px"
+        >
+          <el-form-item
+            style="margin-bottom: 40px"
+            label="新密码"
+            prop="passWord"
+          >
+            <el-input
+              v-model="passwordForm.passWord"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="确认密码" prop="showPassword">
+            <el-input
+              type="password"
+              show-password
+              v-model="passwordForm.showPassword"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <div class="dialog-footer" style="text-align: center">
+            <el-button
+              style="margin-left: 90px"
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="savePasswordBtn"
+              size="medium"
+              >确定
+            </el-button>
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import vueMatomo from "vue-matomo";
+import {
+  loginPhoneApi,
+  loginApi,
+  loginApiMD5,
+  getUserByUidApi,
+  companyLoginApi,
+  projectLoginApi,
+} from "@/assets/js/api/loginSign";
+import { selectSystemLogoConfigApi } from "@/assets/js/api/jxjadmin";
+import getcode from "@/components/getMsgCode";
+import { getOneComputerAuthApi } from "@/assets/js/api/loginSign";
+import { selectNoticeRemindSoundApi } from "@/assets/js/api/configManage";
+import LoginInfo from "./components/loginInfo.vue";
+import axios from "axios";
+import { MD5 } from "crypto-js";
+
+export default {
+  name: "login",
+  components: { getcode, LoginInfo },
+  data() {
+    return {
+      addPasswordDialog: false,
+      passwordForm: {
+        passWord: "",
+        showPassword: "",
+        token: "",
+      },
+      passwordFormRules: {
+        passWord: [
+          { required: true, message: "请输入新密码", trigger: "blur" },
+          {
+            pattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+~`\-={}[\]:";'<>?,./])[a-zA-Z\d!@#$%^&*()_+~`\-={}[\]:";'<>?,./]{8,}$/,
+            message:
+              "密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数",
+            trigger: "blur",
+          },
+        ],
+        showPassword: [
+          { required: true, message: "请确认密码", trigger: "blur" },
+          { validator: this.validateConfirmPassword, trigger: "blur" },
+        ],
+      },
+      COMPANY: COMPANY,
+      msg: "",
+      oldVal: "",
+      show: false,
+      showVerify: false, // 滑动验证
+      verificateBtn: false, //验证按钮
+      pass: true, // 登录按钮
+      input: "",
+      radio: "",
+      projectType: "",
+      LOGO: LOGO,
+      loginType: 1,
+      registerType: 1,
+      automaticLogin: false,
+      form: {
+        account: "",
+        password: "",
+      },
+      registerForm: {
+        userName: "",
+        password: "",
+        email: "",
+        enterpriseName: "",
+      },
+      rules: {
+        account: [
+          {
+            required: true,
+            message: this.$t("message.login.rules.account_message"),
+            trigger: "blur",
+          },
+        ],
+        password: [
+          {
+            required: true,
+            message: this.$t("message.login.rules.password_message"),
+            trigger: "blur",
+          },
+        ],
+      },
+      registerRules: {
+        userName: [
+          {
+            required: true,
+            message: "请输入",
+            trigger: "blur",
+          },
+        ],
+        password: [
+          {
+            required: true,
+            message: "请输入",
+            trigger: "blur",
+          },
+        ],
+        enterpriseName: [
+          {
+            required: true,
+            message: "请输入",
+            trigger: "blur",
+          },
+        ],
+      },
+      systemInfo: {
+        loginBackgroundImage: "",
+        loginLogo: "",
+        platformLogo: "",
+        platformName: "",
+      },
+      imageList: [
+        require("../../assets/images/login/p1.jpg"),
+        require("../../assets/images/login/p2.jpg"),
+        require("../../assets/images/login/p3.jpg"),
+        require("../../assets/images/login/p4.jpg"),
+        require("../../assets/images/login/p5.jpg"),
+        require("../../assets/images/login/p6.jpg"),
+        require("../../assets/images/login/p7.jpg"),
+        require("../../assets/images/login/p8.jpg"),
+      ],
+      headquartersSnData: "",
+      isLogin: true, // 默认是登录态
+    };
+  },
+  watch: {
+    loginType(newDate, oldDate) {
+      console.log(newDate);
+      console.log(oldDate);
+      if (newDate === 1) {
+        window._paq.push(["trackEvent", "点击", "登录", "使用密码登录"]);
+      } else {
+        window._paq.push(["trackEvent", "点击", "登录", "使用账号登录"]);
+      }
+    },
+    // oldVal:{
+    //   handler(n,o){
+    //     console.log(n,o);
+    //       if(n!= o){
+    //       console.log('====监听不一样')
+    //       this.showVerify = true,
+    //       this.pass = false
+    //      }
+    //   },
+    //   deep:true,
+    //   immediate:false
+    // }
+  },
+  created() {
+    this.company = COMPANY;
+    this.projectType = PROJECT_TYPE;
+    setTimeout(() => {
+      //删除401标识
+      sessionStorage.setItem("errorResponse", null);
+    }, 3000);
+    if (this.$route.query.headquartersSn) {
+      this.headquartersSnData = this.$route.query.headquartersSn;
+    } else {
+      this.headquartersSnData = this.$store.state.userInfo?.headquartersSn
+        ? this.$store.state.userInfo?.headquartersSn
+        : "";
+    }
+  },
+  mounted() {
+    // this.$bus.$on('resetSlideVerify',this.onReset)
+    delete this.$http.defaults.headers.common["Authorization"];
+    if (window.location.href.indexOf("type=lgzbdp") != -1) {
+      window.localStorage.setItem("isIframe", "1");
+    } else {
+      if (window.localStorage.getItem("isIframe")) {
+        window.localStorage.removeItem("isIframe");
+      }
+    }
+    //兼容第三方平台接入 ---做免码登录
+    if (window.location.href.indexOf("UID") != -1) {
+      // debugger;
+      this.$store.commit("setUid", true);
+      // let str = window.location.href.split("UID=")[1];
+      let uid = window.location.href.split("UID=")[1];
+      // let uid = str.substring(0, str.length - 7);
+      let data = {
+        uid,
+      };
+      //获取到用户信息
+      getUserByUidApi(data).then((res) => {
+        if (res.code == 200) {
+          //赋值
+          this.parseLoginData(res.result);
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    }
+    // else if(){}
+    else {
+      this.$store.commit("setUid", false);
+      this.getDetail(this.headquartersSnData);
+      this.getData();
+    }
+  },
+  methods: {
+    // 去登录
+    goLogin() {
+      this.isLogin = true;
+    },
+    // 去注册
+    goRegister() {
+      this.isLogin = false;
+      this.registerForm = {
+        userName: "",
+        password: "",
+        email: "",
+        enterpriseName: "",
+      }
+    },
+    //修改密码提交
+    savePasswordBtn() {
+      this.$refs["passwordForm"].validate((valid) => {
+        if (valid) {
+          axios({
+            method: "post",
+            headers: {
+              Authorization: "Bearer " + this.passwordForm.token,
+              "Content-Type": "application/json", // 设置请求头的 Content-Type
+            },
+            url:
+              this.$http.defaults.baseURL +
+              "xmgl/systemUser/updateUserPassWord",
+            data: {
+              passWord: this.passwordForm.passWord,
+            },
+          }).then((res) => {
+            if (res.data.code == 200) {
+              this.$message.success("密码修改成功，请重新登录");
+              this.addPasswordDialog = false;
+            }
+          });
+        }
+      });
+    },
+    validateConfirmPassword(rule, value, callback) {
+      if (value !== this.passwordForm.passWord) {
+        callback(new Error("两次输入密码不一致"));
+      } else {
+        callback();
+      }
+    },
+    close() {
+      this.passwordForm = {};
+      this.$nextTick(() => {
+        this.$refs.passwordForm.clearValidate();
+      });
+    },
+    onReset() {
+      //重置图片验证组件
+      this.$refs.slideverify.reset();
+    },
+    onSuccess() {
+      this.oldVal = this.form.account;
+      this.verificateBtn = true;
+      this.showVerify = false;
+      this.pass = false;
+    },
+    onFail() {
+      this.msg = "验证失败";
+    },
+    onRefresh() {},
+    getData() {
+      getOneComputerAuthApi().then((res) => {
+        if (res.result) {
+        } else {
+          this.$router.push({ path: "/authorization" });
+        }
+      });
+    },
+    getDetail(val) {
+      selectSystemLogoConfigApi({
+        headquartersSn: val,
+      }).then((res) => {
+        if (res.result) {
+          console.log("查看有没有背景图", res);
+          console.log(window.location.protocol);
+          this.systemInfo = res.result;
+          if (this.systemInfo.loginLogo) {
+            this.systemInfo.loginLogo =
+              window.location.protocol +
+              "//" +
+              res.result.loginLogo.split("//")[1];
+          }
+          localStorage.setItem("systemInfo", JSON.stringify(res.result));
+          if (res.result.fileStorageType !== "0") {
+            this.$store.commit("setFILEURL", "");
+          }
+        }
+      });
+    },
+    goBackBtn() {
+      this.$store.commit("setUserInfo", null);
+      this.$store.commit("setMapBackArr", []);
+      this.$store.commit("setMoudle", null);
+      this.$store.commit("setProDetail", null);
+      window.localStorage.removeItem("isIframe");
+      window.localStorage.removeItem("soundList");
+
+      this.$router.push({ path: "/" });
+    },
+    goSignIn() {
+      this.$router.push({ path: "/sign" });
+    },
+    // 立即验证
+    verificateFn() {
+      this.showVerify = true;
+      // this.$bus.$emit('resetSlideVerify')
+    },
+    loginFn() {
+      // 1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号  6项目子账号   7项目部账号
+      if (this.loginType == 1) {
+        this.$nextTick(() => {
+          if (this.projectType == "zjsj") {
+            this.$refs["LoginInfo"].$refs["form"].validate((valid) => {
+              // console.log("this.$refs['LoginInfo']:", this.$refs["LoginInfo"]);
+              if (valid) {
+                if (LOGINTYPE == 1) {
+                  loginApi(this.form).then((res) => {
+                    console.log("--------------------么么儿们10");
+                    console.log(res.result);
+                    this.parseLoginData(res.result);
+                    this.getDetail(this.headquartersSnData);
+                  });
+                } else if (LOGINTYPE == 2) {
+                  console.log(2222222222222);
+                  companyLoginApi(this.form).then((res) => {
+                    this.parseLoginData(res.result);
+                    this.getDetail(this.headquartersSnData);
+                  });
+                } else if (LOGINTYPE == 5) {
+                  console.log("中建四局项目账号");
+                } else if (LOGINTYPE == 3) {
+                  console.log(333333333);
+
+                  projectLoginApi(this.form).then((res) => {
+                    this.parseLoginData(res.result);
+                    this.getDetail(this.headquartersSnData);
+                  });
+                }
+              } else {
+                console.log("error submit!!");
+                return false;
+              }
+            });
+          } else if (this.projectType == "common") {
+            this.$refs["form"].validate((valid) => {
+              if (valid) {
+                if (LOGINTYPE == 1) {
+                  let timestamp = Date.now();
+                  let md5Password = MD5(
+                    MD5(this.form.password).toString() + timestamp
+                  ).toString();
+                  let dataMD5 = {
+                    account: this.form.account,
+                    md5Password: md5Password,
+                    timestamp: timestamp,
+                  };
+                  // console.log("加密前",this.form);
+                  // console.log("加密后",dataMD5);
+                  loginApiMD5(dataMD5).then((res) => {
+                    //用户登录安全等保
+                    if (res.result.expire) {
+                      this.addPasswordDialog = true;
+                      this.passwordForm.token = res.result.token;
+                    } else {
+                      this.parseLoginData(res.result);
+                      this.getDetail(this.headquartersSnData);
+                    }
+                  });
+                } else if (LOGINTYPE == 2) {
+                  console.log(2222222222222);
+
+                  companyLoginApi(this.form).then((res) => {
+                    this.parseLoginData(res.result);
+                    this.getDetail(this.headquartersSnData);
+                  });
+                } else if (LOGINTYPE == 3) {
+                  console.log(333333333);
+
+                  projectLoginApi(this.form).then((res) => {
+                    this.parseLoginData(res.result);
+                    this.getDetail(this.headquartersSnData);
+                  });
+                }
+              } else {
+                console.log("error submit!!");
+                return false;
+              }
+            });
+          }
+        });
+      } else {
+        this.$refs["form2"].validate((valid) => {
+          if (valid) {
+            loginPhoneApi(this.form2).then((res) => {
+              this.parseLoginData(res.result);
+            });
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
+        });
+      }
+    },
+    registerFn() {
+      // 1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号  6项目子账号   7项目部账号
+      if (this.registerType == 1) {
+        this.$refs["LoginInfo"].$refs["form"].validate((valid) => {
+          // console.log("this.$refs['LoginInfo']:", this.$refs["LoginInfo"]);
+          if (valid) {
+            loginApi(this.form).then((res) => {
+              console.log("--------------------么么儿们10");
+              console.log(res.result);
+              this.parseLoginData(res.result);
+              this.getDetail(this.headquartersSnData);
+            });
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
+        });
+      } else {
+        this.$refs["LoginInfo"].$refs["form"].validate((valid) => {
+          // console.log("this.$refs['LoginInfo']:", this.$refs["LoginInfo"]);
+          if (valid) {
+            loginApi(this.form).then((res) => {
+              console.log("--------------------么么儿们10");
+              console.log(res.result);
+              this.parseLoginData(res.result);
+              this.getDetail(this.headquartersSnData);
+            });
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
+        });
+      }
+    },
+    selectMp3FileList() {
+      selectNoticeRemindSoundApi({
+        projectSn: this.$store.state.projectSn,
+      }).then((res) => {
+        console.log(res);
+        if (res.code == 200) {
+          // this.MP4FileList = res.result
+          localStorage.setItem("soundList", JSON.stringify(res.result));
+          console.log(localStorage.getItem("soundList"));
+        }
+      });
+    },
+    parseLoginData(data) {
+      if (this.projectType == "zjsj") {
+        this.$store.commit("setProjectSn", data.sn);
+      }
+      window._paq.push(["trackEvent", "点击", "登录", "登录账号"]);
+      this.$message.success(this.$t("message.login.login_success_msg")); //登录成功！
+      this.$http.defaults.headers.common["Authorization"] =
+        "Bearer" + " " + data.token;
+      this.$http.defaults.headers.common["operateId"] = data.userId;
+      this.$store.commit("setUserInfo", data);
+      localStorage.setItem("jumpToken", data.token); //储存token到本地
+
+      var moduleList = data.menuAuthority.moduleList
+        ? data.menuAuthority.moduleList
+        : [];
+      var companyModule = [];
+      var projectModule = [];
+      if (moduleList.length == 0 && data.accountType != 1) {
+        this.$message.warning("当前账号还没分配权限");
+        return false;
+      }
+      moduleList.forEach((element) => {
+        if (element.moduleType == 1) {
+          companyModule.push(element);
+        }
+        if (element.moduleType == 5) {
+          projectModule.push(element);
+        }
+      });
+      var menu2 = [
+        {
+          menuName: "企业管理",
+          id: 9199,
+          path: "/registerAudit",
+        },
+        {
+          menuName: "模块菜单管理",
+          id: 9299,
+          path: "/moduleMenuManage",
+        },
+        {
+          menuName: "app版本管理",
+          id: 9297,
+          path: "/operateManage",
+        },
+        {
+          menuName: "字典管理",
+          id: 9298,
+          path: "/dictionaryManaged",
+        },
+        {
+          menuName: "系统设置",
+          id: 9299,
+          path: "/systemSettings",
+        },
+        // {
+        //   menuName: '塔吊模型管理',
+        //   id: 9300,
+        //   path: '/brand'
+        // }
+      ];
+      console.log(data.accountType, "777888");
+      switch (data.accountType) {
+        case 1:
+          this.$store.commit("setMenuList", menu2);
+          this.$store.commit("setProjectManageMenuList", menu2);
+          console.log("-----------", menu2);
+          this.$store.commit("setIsShowBackIndex", false);
+          this.$router.push("/registerAudit");
+          break;
+        case 2:
+          this.$store.commit("setMenuList", companyModule);
+          this.$store.commit("setProjectManageMenuList", companyModule);
+          this.$store.commit("setIsShowBackIndex", false);
+          this.$router.push(companyModule[0].modulePath);
+          break;
+        case 3:
+          this.$store.commit("setMenuList", companyModule);
+          this.$store.commit("setProjectManageMenuList", companyModule);
+          this.$store.commit("setIsShowBackIndex", false);
+          this.$router.push(companyModule[0].modulePath);
+          break;
+        case 4:
+          this.$store.commit("setMenuList", companyModule);
+          this.$store.commit("setProjectManageMenuList", companyModule);
+          this.$store.commit("setIsShowBackIndex", false);
+          this.$router.push(companyModule[0].modulePath);
+          break;
+        case 7:
+          this.$store.commit("setMenuList", companyModule);
+          this.$store.commit("setProjectManageMenuList", companyModule);
+          this.$store.commit("setIsShowBackIndex", false);
+          this.$router.push(companyModule[0].modulePath);
+          break;
+        case 5:
+        case 6:
+          // 中建四局
+          this.$store.commit("setMenuList", projectModule);
+          this.$store.commit("setProjectManageMenuList", projectModule);
+          this.$store.commit("setIsShowBackIndex", false);
+          if (this.projectType == "zjsj") {
+            console.log("是这里吗", data);
+            //看看项目看板内有没有菜单
+            let arr = data.menuAuthority.moduleList;
+            let arr2 = [];
+            arr.forEach((element) => {
+              if (element.moduleType == 4) {
+                arr2.push(element);
+                return;
+              }
+            });
+            console.log("arr2", arr2);
+            // 如果数组为空表示该用户没有权限访问
+            if (!arr2.length) {
+              this.$router.push("/projectIndex");
+            } else {
+              this.$router.push(arr2[0].modulePath);
+            }
+          } else {
+            // styleType == 3 衢州版
+            if (
+              (data.styleType != 2 && data.styleType != 3) ||
+              !data.styleType
+            ) {
+              this.$router.push("/projectIndex");
+            } else if (data.styleType == 2) {
+              this.$router.push("/projectV2/taskList");
+            } else {
+              this.$router.push("/projectV3/taskList");
+            }
+            this.$store.commit("setProjectSn", data.sn);
+            break;
+          }
+      }
+      this.selectMp3FileList();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.zjsjLogin {
+  width: 100%;
+  height: 100%;
+
+  .zjsjcontent {
+    width: 100%;
+    height: 100%;
+    position: relative;
+
+    .contentBGI {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+
+.flex {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.flex2 {
+  display: flex;
+  align-items: center;
+}
+
+.contentBG {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.login {
+  width: 100%;
+  height: 100%;
+  background: #fff;
+
+  .title {
+    padding: 42px 35px 0;
+    font-family: PingFangSC-Semibold;
+    font-size: 24px;
+    color: @--color-black;
+    letter-spacing: 0;
+
+    .logo {
+      // width: 25px;
+      height: 37px;
+      margin-right: 20px;
+    }
+
+    .backBtn {
+      width: 114px;
+      font-size: 14px;
+    }
+  }
+
+  .content {
+    width: 100%;
+    height: 652px;
+    margin-top: 90px;
+    // background-image: url("../../assets/images/login_bg.png");
+    flex-direction: row-reverse;
+    position: relative;
+
+    .mask {
+      position: fixed;
+      left: 0%;
+      top: 0%;
+      width: 100%;
+      height: 100%;
+      z-index: 100;
+      overflow: hidden;
+      background-color: rgba(0, 0, 0, 0.3);
+    }
+
+    .mask .slideContainer {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      position: absolute;
+      left: 55%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+      width: 380px;
+      height: 250px;
+      background-color: rgb(255, 255, 255);
+    }
+
+    .login_info,
+    .login_info-register {
+      width: 444px;
+      height: 475px;
+      background: #ffffff;
+      box-shadow: 0 0 31px 0 rgba(13, 28, 91, 0.28);
+      border-radius: 5px;
+      margin-right: 123px;
+      box-sizing: border-box;
+      padding: 37px 33.5px 0;
+      position: relative;
+      z-index: 2;
+
+      p {
+        width: 50%;
+        margin: 0;
+        box-sizing: border-box;
+        padding-bottom: 13px;
+        font-weight: 600;
+      }
+
+      .border_bottom {
+        border-bottom: 2px solid @--color-primary;
+        color: @--color-primary;
+      }
+
+      .placeholder {
+        padding: 0 0 15px;
+      }
+
+      .info_title {
+        justify-content: space-around;
+        font-family: PingFangSC-Medium;
+        font-size: 16px;
+        color: #aeafb9;
+        text-align: center;
+        cursor: pointer;
+        border-bottom: 1px solid #edeff2;
+      }
+
+      .info_content {
+        margin-top: 25px;
+
+        img {
+          width: 16.8px;
+          height: 24px;
+        }
+      }
+      .register-btn {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+      }
+      .logo_btn {
+        height: 53px;
+        width: 100%;
+        font-family: PingFangSC-Regular;
+        font-size: 20px;
+        // .point::after{
+        //   -webkit-animation-delay: .4s;
+        //   animation-delay: .4s;
+        // }
+
+        // .point::before{
+        //   content: "";
+        //   display: block;
+        //   width: 20px;
+        //   height: 20px;
+        //   background: #67c23a;
+        //   position: absolute;
+        //   left: 30%;
+        //   // -webkit-animation: shield-breathing 1.4s ease infinite;
+        //   // animation: shield-breathing 1.4s ease infinite;
+        //   border-radius: 50%;
+        // }
+      }
+
+      .info_bottom {
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        color: #8e8e8e;
+        cursor: pointer;
+      }
+
+      .span_placeholder {
+        display: inline-block;
+        width: 1px;
+        height: 15px;
+        margin-bottom: -3px;
+        background: rgba(142, 142, 142, 0.8);
+      }
+
+      /deep/ .el-input__inner {
+        height: 53px;
+        height: 53px;
+        padding-left: 45px;
+      }
+    }
+    .login_info-register {
+      width: 444px;
+      height: 500px;
+      /deep/.el-form-item {
+        margin-bottom: 20px !important;
+      }
+    }
+  }
+}
+
+.inputIcon {
+  margin-top: 14px;
+  margin-left: 10px;
+}
+
+.tipsBox {
+  text-align: center;
+  padding: 20px 0;
+  position: fixed;
+  left: 50%;
+  bottom: 0;
+  transform: translateX(-50%);
+}
+
+.loginContent {
+  width: 44%;
+  height: 300px;
+  /* background-color: palevioletred; */
+  position: absolute;
+  right: 42%;
+  /* font-weight: bold; */
+  font-size: 3.6vw;
+  color: #fff;
+  top: 40%;
+}
+</style>
diff --git a/src/views/jxjadmin/systemSettings.vue b/src/views/jxjadmin/systemSettings.vue
index ebf6f6d5..eacb9e5b 100644
--- a/src/views/jxjadmin/systemSettings.vue
+++ b/src/views/jxjadmin/systemSettings.vue
@@ -8,7 +8,7 @@
           :model="form"
           ref="form"
           :rules="rules"
-          label-width="160px"
+          label-width="165px"
         >
           <el-row :gutter="12">
             <el-col :span="6">
@@ -132,6 +132,23 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="默认审批用户注册企业" prop="auditCompany">
+                <div class="select-content">
+                  <div class="tip-text" @click="isSelectCompany = !isSelectCompany">
+                    <span>未选择</span>
+                    <i class="el-icon-arrow-down" v-show="!isSelectCompany"></i>
+                    <i class="el-icon-arrow-up" v-show="isSelectCompany"></i>
+                  </div>
+                  <div class="select-list" v-if="isSelectCompany">
+                    <div class="select-list-item" v-for="(item,index) in companyList" :key="index">
+                        <span>测试企业</span>
+                        <el-checkbox v-model="item.checked" />
+                    </div>
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="12">
             <el-col :span="6">
@@ -275,6 +292,13 @@ export default {
             ),
             trigger: 'blur'
           }
+        ],
+        auditCompany: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          }
         ]
       },
       dialogVisible: false,
@@ -282,7 +306,15 @@ export default {
       fileList: [],
       fileList2: [],
       fileList3: [],
-      fileList4: []
+      fileList4: [],
+      companyList: [
+        {name: '测试企业1',checked: false},
+        {name: '测试企业2',checked: false},
+        {name: '测试企业3',checked: true},
+        {name: '测试企业4',checked: false},
+        {name: '测试企业5',checked: true}
+      ],
+      isSelectCompany: false
     }
   },
   mounted() {
@@ -470,6 +502,38 @@ export default {
   // width: 50%;
   width: 97%;
   // max-width: 430px;
+  .select-content{
+    box-sizing: border-box;
+    width: 150px;
+    height: 34px;
+    line-height: 34px !important;
+    border-radius: 3px;
+    border: 1px solid #D7DBE9;
+    padding: 0 15px;
+    position: relative;
+    .tip-text{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      cursor: pointer;
+    }
+    .select-list{
+      width: 100%;
+      position: absolute;
+      top: 34px;
+      left: -3px;
+      z-index: 10;
+      background-color: #fff;
+      border-radius: 4px;
+      box-shadow: 4px 4px 10px #E3E3E3;
+      padding: 10px 20px;
+      &-item{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      }
+    }
+  }
 }
 .el-upload__tip {
   line-height: 20px;