From 6af75e31571a2bf21a40b17533c0099361158168 Mon Sep 17 00:00:00 2001
From: yjl <1490736767@qq.com>
Date: Wed, 22 Mar 2023 17:35:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E8=81=94=E4=B8=87=E7=89=A9=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE-=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E3=80=81=E8=AE=BE=E5=A4=87=E4=B8=AD=E5=8F=B0=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91-=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/config.js                           |    3 +-
 src/assets/js/http.js                         |    4 +-
 src/views/companyAdmin/companyDiagram.vue     | 3268 +++++++++--------
 .../videoManage/videoConfig.vue               |  249 +-
 4 files changed, 1918 insertions(+), 1606 deletions(-)

diff --git a/public/js/config.js b/public/js/config.js
index a51c2bf6..ab981bdc 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -1,4 +1,4 @@
-var COMPANY = ''; //通用
+// var COMPANY = ''; //通用
 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
 // var COMPANY='hezhan'; //合展-宿迁
 // var COMPANY='nanchang'; //南昌地铁、衢州
@@ -8,6 +8,7 @@ var COMPANY = ''; //通用
 // COMPANY = 'henan' // 河南春笋
 // COMPANY = 'xingxuan'
 // COMPANY = 'hengtong'//瑞士恒通
+COMPANY = 'yunlian'//云联万物
 
 
 
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 910967a9..b2085fab 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -41,7 +41,7 @@ if (process.env.NODE_ENV == 'development') {
   
   // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
   // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
-  axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
   // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
@@ -75,6 +75,8 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上
   // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上
   // axios.defaults.baseURL = 'http://192.168.34.221:8088' //郭圣雄本地
+  // axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地
+  axios.defaults.baseURL = 'http://192.168.34.221:8210' //郭圣雄本地
 
 } else if (process.env.NODE_ENV == 'debug') {
   axios.defaults.baseURL = 'https://www.ceshi.com'
diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue
index 264de870..78049ba7 100644
--- a/src/views/companyAdmin/companyDiagram.vue
+++ b/src/views/companyAdmin/companyDiagram.vue
@@ -1,19 +1,30 @@
 <template>
-<!-- 弃用 -->
   <div class="fullHeight">
     <div class="areaTreeBox fullHeight" id="videoTreeBox">
       <div class="areaTreeInner whiteBlock fullHeight">
-        <p class="pageTitle">组织机构
-            <span v-if="($store.state.userInfo.addProjectType==1&&$store.state.userInfo.accountType!=7)||$store.state.userInfo.addProjectType==0" class="plusBtn" @click="addOrganizationFn2({companyType:$store.state.accountType})">
-                <i class="el-icon-plus"></i>
-            </span>
+        <p class="pageTitle">
+          组织机构
+          <span
+            v-if="
+              ($store.state.userInfo.addProjectType == 1 &&
+                $store.state.userInfo.accountType != 7) ||
+              $store.state.userInfo.addProjectType == 0
+            "
+            class="plusBtn"
+            @click="
+              addOrganizationFn2({ companyType: $store.state.accountType })
+            "
+          >
+            <i class="el-icon-plus"></i>
+          </span>
         </p>
         <div class="treeBox">
           <vue-scroll v-if="level1CompanyData.length > 0">
             <el-tree
               :data="level1CompanyData"
               @node-click="handleNodeClick"
-              :props="defaultProps" default-expand-all
+              :props="defaultProps"
+              default-expand-all
             >
               <span class="custom-tree-node" slot-scope="{ node, data }">
                 <span
@@ -29,82 +40,164 @@
                   >{{ node.label }}</span
                 >
                 <span class="operateBtns">
-                    <i v-if="isShowProject(data.companyType)" class="el-icon-plus" @click.stop="addOrganizationFn(data)"></i>
-                    <i class="el-icon-edit" @click.stop="editOrganizationFn(data)"></i>
-                    <i class="el-icon-delete" @click.stop="deleteOrganizationFn(data)"></i>
+                  <i
+                    v-if="isShowProject(data.companyType)"
+                    class="el-icon-plus"
+                    @click.stop="addOrganizationFn(data)"
+                  ></i>
+                  <i
+                    class="el-icon-edit"
+                    @click.stop="editOrganizationFn(data)"
+                  ></i>
+                  <i
+                    class="el-icon-delete"
+                    @click.stop="deleteOrganizationFn(data)"
+                  ></i>
                 </span>
               </span>
             </el-tree>
           </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>
     </div>
     <div class="rightPanel whiteBlock">
-        <div class="pageTitle">{{treeSelectData.projectName?treeSelectData.projectName:treeSelectData.companyName}}</div>
-        <el-tabs v-model="tabActiveName" type="card" @tab-click="handleTabClick">
-            <el-tab-pane label="组织成员" name="first">
-                <el-button type="primary" size="medium" @click="addAccountFn" v-if="treeSelectData.companySn">添加成员</el-button>
-                <el-button type="primary" size="medium" @click="configAccountFn(treeSelectData,'project')" v-if="treeSelectData.projectName">权限配置</el-button>
-                <el-table class="tables" :data="level1AccountData">
-                    <el-table-column prop="realName" align="center" :label="'姓名'"
-                    ></el-table-column>
-                    <el-table-column prop="account" :label="'登录账号'" align="center"></el-table-column>
-                    <el-table-column prop="userTel" :label="'手机号'" align="center">
-                    </el-table-column>
-                    <el-table-column prop="jobName" :label="'所属岗位'" align="center"></el-table-column>                  
-                    <el-table-column :label="$t('message.deviceManage.operation')" align="center">
-                        <template slot-scope="scope">
-                            <div class="tableBtns">
-                                <div v-if="!treeSelectData.projectName" @click="configAccountFn(scope.row,'yi')" class="operationText">
-                                    <i class="el-icon-setting"></i>
-                                    <span>权限配置</span>
-                                </div>
-                                <div v-if="treeSelectData.projectName && company == 'zhengwu'" @click="uploadAccountFn(scope.row)" class="operationText">
-                                    <el-button size="small" type="primary">上传账号</el-button>
-                                </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>
-                                </div>
-                                <div @click="deleteAccountFn(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="second">
-                <el-button type="primary" size="medium" @click="addJobFn" v-if="treeSelectData.companySn">添加岗位</el-button>
-                <el-table class="tables" :data="jobList">
-                    <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 :label="$t('message.deviceManage.operation')">
-                        <template slot-scope="scope">
-                            <div class="tableBtns">
-                                <div @click="editJobFn(scope.row)" class="operationText">
-                                    <img src="@/assets/images/icon-edit.png" width="15px" height="15px"/>
-                                    <span>{{$t('message.deviceManage.edit')}}</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="third">项目信息</el-tab-pane> -->
-        </el-tabs>
+      <div class="pageTitle">
+        {{
+          treeSelectData.projectName
+            ? treeSelectData.projectName
+            : treeSelectData.companyName
+        }}
+      </div>
+      <el-tabs v-model="tabActiveName" type="card" @tab-click="handleTabClick">
+        <el-tab-pane label="组织成员" name="first">
+          <el-button
+            type="primary"
+            size="medium"
+            @click="addAccountFn"
+            v-if="treeSelectData.companySn"
+            >添加成员</el-button
+          >
+          <el-button
+            type="primary"
+            size="medium"
+            @click="configAccountFn(treeSelectData, 'project')"
+            v-if="treeSelectData.projectName"
+            >权限配置</el-button
+          >
+          <el-table class="tables" :data="level1AccountData">
+            <el-table-column
+              prop="realName"
+              align="center"
+              :label="'姓名'"
+            ></el-table-column>
+            <el-table-column
+              prop="account"
+              :label="'登录账号'"
+              align="center"
+            ></el-table-column>
+            <el-table-column prop="userTel" :label="'手机号'" align="center">
+            </el-table-column>
+            <el-table-column
+              prop="jobName"
+              :label="'所属岗位'"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              :label="$t('message.deviceManage.operation')"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <div class="tableBtns">
+                  <div
+                    v-if="!treeSelectData.projectName"
+                    @click="configAccountFn(scope.row, 'yi')"
+                    class="operationText"
+                  >
+                    <i class="el-icon-setting"></i>
+                    <span>权限配置</span>
+                  </div>
+                  <div
+                    v-if="treeSelectData.projectName && company == 'zhengwu'"
+                    @click="uploadAccountFn(scope.row)"
+                    class="operationText"
+                  >
+                    <el-button size="small" type="primary">上传账号</el-button>
+                  </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>
+                  </div>
+                  <div
+                    @click="deleteAccountFn(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="second">
+          <el-button
+            type="primary"
+            size="medium"
+            @click="addJobFn"
+            v-if="treeSelectData.companySn"
+            >添加岗位</el-button
+          >
+          <el-table class="tables" :data="jobList">
+            <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 :label="$t('message.deviceManage.operation')">
+              <template slot-scope="scope">
+                <div class="tableBtns">
+                  <div @click="editJobFn(scope.row)" class="operationText">
+                    <img
+                      src="@/assets/images/icon-edit.png"
+                      width="15px"
+                      height="15px"
+                    />
+                    <span>{{ $t('message.deviceManage.edit') }}</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="third">项目信息</el-tab-pane> -->
+      </el-tabs>
     </div>
-  
+
     <!-- 管理机构弹框 -->
     <el-dialog
       :title="dialogTitle"
@@ -135,15 +228,12 @@
             :label="$t('message.companyDiagram.dialog_ProjectPop_up.longitude')"
             prop="longitude"
           >
-            <el-input
-              disabled
-              v-model="addCompanyForm.longitude"
-            >
+            <el-input disabled v-model="addCompanyForm.longitude">
               <template slot="append">
                 <el-link type="primary" @click="toGetLocalFn">
                   {{
                     $t(
-                      "message.companyDiagram.dialog_ProjectPop_up.coordinatePicking"
+                      'message.companyDiagram.dialog_ProjectPop_up.coordinatePicking'
                     )
                   }}
                 </el-link>
@@ -154,40 +244,50 @@
             :label="$t('message.companyDiagram.dialog_ProjectPop_up.latitude')"
             prop="latitude"
           >
-            <el-input
-              v-model="addCompanyForm.latitude"
-              disabled
-            ></el-input>
+            <el-input v-model="addCompanyForm.latitude" disabled></el-input>
           </el-form-item>
-          <el-form-item  label="区域划分" prop="rangeAddr">
-             <div class="leftSelect">
-               <div class="title">区域列表</div>
-               <!--   -->
-                <!--  -->
-                <el-autocomplete
-                  class="inline-input"
-                  v-model="state"
-                  suffix-icon="el-icon-search"
-                  placeholder="请输入"
-                  :fetch-suggestions="querySearch"
-                   @select="handleSelect"
-                   size="mini"
-                  :trigger-on-focus="false"
-                ></el-autocomplete>
-                <el-checkbox-group v-model="selectValue">
-                  <el-checkbox :label="item.value" v-for="item in options" :key="item.value"  @change="leftChangeState(item.value)" ></el-checkbox>
-                </el-checkbox-group>
-             </div>
-             <div class="rightSelect">
-               <div class="title">已选择区域</div>
-               <div class="rightAllSelect">
-                 <div class="selectItem" v-for="(item,index) in selectValue" :key="index">
-                   <span>{{item}}</span>
-                   <img src="../../assets/images/delete.png" alt="" @click="deleteItem(index)">
-                 </div>
-               </div>
-             </div>
-              <!-- <el-select  label v-model="value1" multiple filterable>
+          <el-form-item label="区域划分" prop="rangeAddr">
+            <div class="leftSelect">
+              <div class="title">区域列表</div>
+              <!--   -->
+              <!--  -->
+              <el-autocomplete
+                class="inline-input"
+                v-model="state"
+                suffix-icon="el-icon-search"
+                placeholder="请输入"
+                :fetch-suggestions="querySearch"
+                @select="handleSelect"
+                size="mini"
+                :trigger-on-focus="false"
+              ></el-autocomplete>
+              <el-checkbox-group v-model="selectValue">
+                <el-checkbox
+                  :label="item.value"
+                  v-for="item in options"
+                  :key="item.value"
+                  @change="leftChangeState(item.value)"
+                ></el-checkbox>
+              </el-checkbox-group>
+            </div>
+            <div class="rightSelect">
+              <div class="title">已选择区域</div>
+              <div class="rightAllSelect">
+                <div
+                  class="selectItem"
+                  v-for="(item, index) in selectValue"
+                  :key="index"
+                >
+                  <span>{{ item }}</span>
+                  <img
+                    src="../../assets/images/delete.png"
+                    alt=""
+                    @click="deleteItem(index)"
+                  />
+                </div>
+              </div>
+            </div>
+            <!-- <el-select  label v-model="value1" multiple filterable>
                 <el-option
                    v-for="(item,index) in options"
                   :key="index"
@@ -196,7 +296,7 @@
                   >
                 </el-option>
               </el-select> -->
-              <!-- <div class="select" >
+            <!-- <div class="select" >
                   <div v-for="(item,index) in options" :key="index">{{item.value}}</div>
                   <el-tag
                       :key="index"
@@ -219,14 +319,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>
@@ -246,30 +346,26 @@
           :rules="addAccountFormRules"
           label-width="110px"
         >
-        <el-form-item
-            :label="'人员姓名'"
-            prop="realName"
-          >
+          <el-form-item :label="'人员姓名'" prop="realName">
             <el-input
               v-model="addAccountForm.realName"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            :label="'手机号'"
-            prop="userTel"
-          >
+          <el-form-item :label="'手机号'" prop="userTel">
             <el-input
               v-model="addAccountForm.userTel"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            :label="'所属岗位'"
-            prop="jobId"
-          >
-            <el-select v-model="addAccountForm.jobId" style="width:100%">
-                <el-option :value="item.id" :label="item.jobName" v-for="(item,index) in jobList" :key="index"></el-option>
+          <el-form-item :label="'所属岗位'" prop="jobId">
+            <el-select v-model="addAccountForm.jobId" style="width: 100%">
+              <el-option
+                :value="item.id"
+                :label="item.jobName"
+                v-for="(item, index) in jobList"
+                :key="index"
+              ></el-option>
             </el-select>
             <!-- <el-input
               v-model="addAccountForm.jobId"
@@ -309,8 +405,8 @@
               {
                 required: true,
                 message: $t('message.companyDiagram.required'),
-                trigger: 'blur',
-              },
+                trigger: 'blur'
+              }
             ]"
             ><!--必填-->
             <el-input
@@ -321,16 +417,12 @@
             ></el-input>
           </el-form-item>
 
-            <el-form-item
-            label="外部登录标识"
-            prop="externalAccount"
-          >
+          <el-form-item label="外部登录标识" prop="externalAccount">
             <el-input
               v-model="addAccountForm.externalAccount"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-
         </el-form>
         <div class="dialog-footer">
           <el-button
@@ -338,14 +430,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>
@@ -432,15 +524,12 @@
             :label="$t('message.companyDiagram.dialog_ProjectPop_up.longitude')"
             prop="longitude"
           >
-            <el-input
-              disabled
-              v-model="addProjectForm.longitude"
-            >
+            <el-input disabled v-model="addProjectForm.longitude">
               <template slot="append">
                 <el-link type="primary" @click="toGetLocalFn">
                   {{
                     $t(
-                      "message.companyDiagram.dialog_ProjectPop_up.coordinatePicking"
+                      'message.companyDiagram.dialog_ProjectPop_up.coordinatePicking'
                     )
                   }}
                 </el-link>
@@ -451,10 +540,7 @@
             :label="$t('message.companyDiagram.dialog_ProjectPop_up.latitude')"
             prop="latitude"
           >
-            <el-input
-              v-model="addProjectForm.latitude"
-              disabled
-            ></el-input>
+            <el-input v-model="addProjectForm.latitude" disabled></el-input>
           </el-form-item>
           <el-form-item
             :label="
@@ -627,20 +713,64 @@
               "
             ></el-input>
           </el-form-item>
+          <!-- 云联万物项目新增字段 -->
           <el-form-item
-            :label="
-              '是否重点工程'
+            v-if="COMPANY == 'yunlian'"
+            label="
+            施工许可证
             "
-            prop="majorProjectType"
+            prop="constructionPermit"
           >
-            <div style="width:280px">
-              <el-radio v-model="addProjectForm.majorProjectType" :label="1">是</el-radio>
-              <el-radio v-model="addProjectForm.majorProjectType" :label="0">否</el-radio>
+            <el-input
+              v-model="addProjectForm.constructionPermit"
+              placeholder="
+              请输入  
+              "
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            v-if="COMPANY == 'yunlian'"
+            label="
+             街（乡）镇
+            "
+            prop="streetTownshipTown"
+          >
+            <el-input
+              v-model="addProjectForm.streetTownshipTown"
+              placeholder="
+              请输入  
+              "
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            style="text-align: center !important"
+            v-if="COMPANY == 'yunlian'"
+            label="
+            街（乡）镇机构编码
+            "
+            prop="streetTownshipTownCode"
+          >
+            <el-input
+              v-model="addProjectForm.streetTownshipTownCode"
+              placeholder="
+              请输入  
+              "
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item :label="'是否重点工程'" prop="majorProjectType">
+            <div style="width: 280px">
+              <el-radio v-model="addProjectForm.majorProjectType" :label="1"
+                >是</el-radio
+              >
+              <el-radio v-model="addProjectForm.majorProjectType" :label="0"
+                >否</el-radio
+              >
             </div>
           </el-form-item>
-          
+
           <el-form-item
-          v-if="projectType2 == 'hengqin'"
+            v-if="projectType2 == 'hengqin'"
             :label="'id'"
             prop="placeCode"
           >
@@ -679,14 +809,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>
@@ -697,7 +827,12 @@
       <img width="100%" :src="bigImageUrl" alt />
     </el-dialog>
     <!--高德地图-->
-    <gd-map v-if="showMap" :addProjectForm="addProjectForm" @closeMap="closeMap" @save="getLngLat"></gd-map>
+    <gd-map
+      v-if="showMap"
+      :addProjectForm="addProjectForm"
+      @closeMap="closeMap"
+      @save="getLngLat"
+    ></gd-map>
     <!--配置模块-->
     <el-dialog
       title="授权配置"
@@ -710,7 +845,7 @@
         <br />
         <el-checkbox
           :style="{
-            marginBottom: authorizedConfig.type === 'project' ? '15px' : '',
+            marginBottom: authorizedConfig.type === 'project' ? '15px' : ''
           }"
           :indeterminate="isIndeterminate"
           v-model="checkAll"
@@ -732,7 +867,7 @@
             企业模块
           </div>
           <el-checkbox
-            v-if="i.moduleType === 1&&authorizedConfig.type!='project'"
+            v-if="i.moduleType === 1 && authorizedConfig.type != 'project'"
             v-for="i in checkArr"
             :key="i.moduleId"
             :label="i.moduleId"
@@ -747,7 +882,7 @@
             企业后台模块
           </div>
           <el-checkbox
-            v-if="i.moduleType === 3&&authorizedConfig.type!='project'"
+            v-if="i.moduleType === 3 && authorizedConfig.type != 'project'"
             v-for="i in checkArr"
             :key="i.moduleId"
             :label="i.moduleId"
@@ -803,19 +938,13 @@
           :rules="addJobFormRules"
           label-width="80px"
         >
-        <el-form-item
-            :label="'岗位名称'"
-            prop="jobName"
-          >
+          <el-form-item :label="'岗位名称'" prop="jobName">
             <el-input
               v-model="addJobForm.jobName"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            :label="'岗位职责'"
-            prop="jobDuty"
-          >
+          <el-form-item :label="'岗位职责'" prop="jobDuty">
             <el-input
               v-model="addJobForm.jobDuty"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
@@ -828,14 +957,14 @@
             @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>
@@ -843,7 +972,7 @@
   </div>
 </template>
 <script>
-import gdMap from "../../components/map/gd-map";
+import gdMap from '../../components/map/gd-map'
 import {
   getCompanyProjectListApi,
   addCompanyApi,
@@ -851,58 +980,60 @@ import {
   editCompanyApi,
   getChildCompanyProjectListApi,
   getSecondCompanyProjectListApi,
-  addorganizationJobApi,editorganizationJobApi,
-  deleteorganizationJobApi,getorganizationJobListApi,
+  addorganizationJobApi,
+  editorganizationJobApi,
+  deleteorganizationJobApi,
+  getorganizationJobListApi,
   sendSafetyHatAccountDataApi
-} from "@/assets/js/api/companyDiagram.js";
-import {
-  getComapnyStatisticsListApi
-} from "@/assets/js/api/company/project";
+} 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";
+  deleteSystemUserApi,
+  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";
+  baseModuleUserEdit
+} from '@/assets/js/api/jxjadmin'
 import axios from 'axios'
 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 {
-      projectType2:'',//全局的项目类型 （eg:hengqin）
+      COMPANY: COMPANY,
+      projectType2: '', //全局的项目类型 （eg:hengqin）
       yiCheckArr: [],
       yiCheckOptions: [],
       projectCheckArr: [],
       projectOptions: [],
       authorizedConfig: {
-        type: "",
-        show: false,
+        type: '',
+        show: false
       },
       checkAll: false,
       isIndeterminate: false,
@@ -921,714 +1052,698 @@ 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: this.$t("message.companyDiagram.addAccount"), //添加账号
+      accountDialogTitle: this.$t('message.companyDiagram.addAccount'), //添加账号
       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'
+          }
+        ]
       },
-      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: "",
-        majorProjectType:0
+        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: ''
       },
       addProjectFormRules: {
+        streetTownshipTown: [
+          {
+            required: true,
+            message: this.$t('message.companyDiagram.required'),
+            trigger: 'blur'
+          }
+        ],
+        streetTownshipTownCode: [
+          {
+            required: true,
+            message: this.$t('message.companyDiagram.required'),
+            trigger: 'blur'
+          }
+        ],
+        constructionPermit: [
+          {
+            required: true,
+            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',
-      treeSelectData:{},
-      addJobForm:{
-          jobName:'',
-          jobDuty:'',
-          sn:''
+      tabActiveName: 'first',
+      treeSelectData: {},
+      addJobForm: {
+        jobName: '',
+        jobDuty: '',
+        sn: ''
       },
-      addJobDialog:false,
-      jobDialogTitle:'',
-      addJobFormRules:{
+      addJobDialog: false,
+      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:[],
-      addArea:false,
-      options:[
-          {
-            id:1,
-            label:'河南省',
-            value:'河南省'
-          },
-          {
-            id:2,
-            label:'河北省',
-            value:'河北省'
-          },
-          {
-            id:3,
-            label:'安徽省',
-            value:'安徽省'
-          },
-          {
-            id:4,
-            label:'湖北省',
-            value:'湖北省'
-          },
-          {
-            id:5,
-            label:'湖南省',
-            value:'湖南省'
-          },
-          {
-            id:6,
-            label:'江苏省',
-            value:'江苏省'
-          },
-          {
-            id:7,
-            label:'浙江省',
-            value:'浙江省'
-          },
-          {
-            id:8,
-            label:'四川省',
-            value:'四川省'
-          },
-          {
-            id:9,
-            label:"内蒙古自治区",
-            value:"内蒙古自治区"
-          },
-          {
-            id:10,
-            label:'新疆维吾尔自治区',
-            value:'新疆维吾尔自治区'
-          },
-          {
-            id:11,
-            label:'甘肃省',
-            value:'甘肃省'
-          },
-          {
-            id:12,
-            label:'青海省',
-            value:'青海省'
-          },
-          {
-            id:13,
-            label:'西藏自治区',
-            value:'西藏自治区'
-          },
-          {
-            id:14,
-            label:'云南省',
-            value:'云南省'
-          },
-          {
-            id:15,
-            label:'贵州省',
-            value:'贵州省'
-          },
-          {
-            id:16,
-            label:'广西壮族自治区',
-            value:'广西壮族自治区'
-          },
-          {
-            id:17,
-            label:'广东省',
-            value:'广东省'
-          },
-          {
-            id:18,
-            label:'江西省',
-            value:'江西省'
-          },
-          {
-            id:19,
-            label:'福建省',
-            value:'福建省'
-          },
-          {
-            id:20,
-            label:'山东省',
-            value:'山东省'
-          },
-          {
-            id:21,
-            label:'陕西省',
-            value:'陕西省'
-          },
-          {
-            id:22,
-            label:'北京市',
-            value:'北京市'
-          },
-          {
-            id:23,
-            label:'天津市',
-            value:'天津市'
-          },
-          {
-            id:24,
-            label:'海南省',
-            value:'海南省'
-          },
-          {
-            id:25,
-            label:'重庆市',
-            value:'重庆市'
-          },
-          {
-            id:26,
-            label:'上海市',
-            value:'上海市'
-          },
-          {
-            id:27,
-            label:'黑龙江省',
-            value:'黑龙江省'
-          },
-          {
-            id:28,
-            label:'吉林省',
-            value:'吉林省'
-          },
-          {
-            id:29,
-            label:'辽宁省',
-            value:'辽宁省'
-          },
-          {
-            id:30,
-            label:'宁夏回族自治区',
-            value:'宁夏回族自治区'
-          },
-          {
-            id:31,
-            label:'山西省',
-            value:'山西省'
-          },
-          {
-            id:32,
-            label:'台湾省',
-            value:'台湾省'
-          },
-           {
-            id:33,
-            label:'香港特别行政区',
-            value:'香港特别行政区'
-          },
-          {
-            id:34,
-            label:'澳门特别行政区',
-            value:'澳门特别行政区'
-          },
-          
-      ], //下拉选择
-      selectProvince2:[
+      jobList: [],
+      selectProvince: [],
+      addArea: false,
+      options: [
         {
-        key:1,
-        label:'河南省',
-        disabled:false,
+          id: 1,
+          label: '河南省',
+          value: '河南省'
         },
         {
-        key:2,
-        label:'河北省',
-        disabled:false
+          id: 2,
+          label: '河北省',
+          value: '河北省'
+        },
+        {
+          id: 3,
+          label: '安徽省',
+          value: '安徽省'
+        },
+        {
+          id: 4,
+          label: '湖北省',
+          value: '湖北省'
+        },
+        {
+          id: 5,
+          label: '湖南省',
+          value: '湖南省'
+        },
+        {
+          id: 6,
+          label: '江苏省',
+          value: '江苏省'
+        },
+        {
+          id: 7,
+          label: '浙江省',
+          value: '浙江省'
+        },
+        {
+          id: 8,
+          label: '四川省',
+          value: '四川省'
+        },
+        {
+          id: 9,
+          label: '内蒙古自治区',
+          value: '内蒙古自治区'
+        },
+        {
+          id: 10,
+          label: '新疆维吾尔自治区',
+          value: '新疆维吾尔自治区'
+        },
+        {
+          id: 11,
+          label: '甘肃省',
+          value: '甘肃省'
+        },
+        {
+          id: 12,
+          label: '青海省',
+          value: '青海省'
+        },
+        {
+          id: 13,
+          label: '西藏自治区',
+          value: '西藏自治区'
+        },
+        {
+          id: 14,
+          label: '云南省',
+          value: '云南省'
+        },
+        {
+          id: 15,
+          label: '贵州省',
+          value: '贵州省'
+        },
+        {
+          id: 16,
+          label: '广西壮族自治区',
+          value: '广西壮族自治区'
+        },
+        {
+          id: 17,
+          label: '广东省',
+          value: '广东省'
+        },
+        {
+          id: 18,
+          label: '江西省',
+          value: '江西省'
+        },
+        {
+          id: 19,
+          label: '福建省',
+          value: '福建省'
+        },
+        {
+          id: 20,
+          label: '山东省',
+          value: '山东省'
+        },
+        {
+          id: 21,
+          label: '陕西省',
+          value: '陕西省'
+        },
+        {
+          id: 22,
+          label: '北京市',
+          value: '北京市'
+        },
+        {
+          id: 23,
+          label: '天津市',
+          value: '天津市'
+        },
+        {
+          id: 24,
+          label: '海南省',
+          value: '海南省'
+        },
+        {
+          id: 25,
+          label: '重庆市',
+          value: '重庆市'
+        },
+        {
+          id: 26,
+          label: '上海市',
+          value: '上海市'
+        },
+        {
+          id: 27,
+          label: '黑龙江省',
+          value: '黑龙江省'
+        },
+        {
+          id: 28,
+          label: '吉林省',
+          value: '吉林省'
+        },
+        {
+          id: 29,
+          label: '辽宁省',
+          value: '辽宁省'
+        },
+        {
+          id: 30,
+          label: '宁夏回族自治区',
+          value: '宁夏回族自治区'
+        },
+        {
+          id: 31,
+          label: '山西省',
+          value: '山西省'
+        },
+        {
+          id: 32,
+          label: '台湾省',
+          value: '台湾省'
+        },
+        {
+          id: 33,
+          label: '香港特别行政区',
+          value: '香港特别行政区'
+        },
+        {
+          id: 34,
+          label: '澳门特别行政区',
+          value: '澳门特别行政区'
+        }
+      ], //下拉选择
+      selectProvince2: [
+        {
+          key: 1,
+          label: '河南省',
+          disabled: false
+        },
+        {
+          key: 2,
+          label: '河北省',
+          disabled: false
         }
       ],
-      selectValue:[],
-      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:'澳门特别行政区'
-          },
-          
+      selectValue: [],
+      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: '澳门特别行政区'
+        }
       ], //下拉选择
-      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:'澳门特别行政区'
-          },
-          
+      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: '澳门特别行政区'
+        }
       ], //下拉选择
-     
-      
-      options3:[],
-      value1:"",
-      company: "",
-      cityList:[],
-      parentPrivnce:[], //父级省的名字
-      accountType:0,
-    };
+
+      options3: [],
+      value1: '',
+      company: '',
+      cityList: [],
+      parentPrivnce: [], //父级省的名字
+      accountType: 0
+    }
   },
-  created(){
+  created() {
     this.accountType = this.$store.state.userInfo.accountType
     this.company = COMPANY
     this.projectType2 = PROJECT_TYPE
@@ -1652,105 +1767,108 @@ export default {
     // })
   },
   mounted() {
-    this.addCompanyForm.headquartersSn = this.$store.state.userInfo.headquartersSn;
-    this.getModuleList();
-    this.initData();
-    this.loadProvincesCityList();
+    this.addCompanyForm.headquartersSn =
+      this.$store.state.userInfo.headquartersSn
+    this.getModuleList()
+    this.initData()
+    this.loadProvincesCityList()
   },
   methods: {
-    leftChangeState(item){
+    leftChangeState(item) {
       console.log(item)
       console.log(this.selectValue)
     },
     querySearch(queryString, cb) {
       console.log(queryString)
       console.log(cb)
-        var restaurants = this.options;
-        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
-        // 调用 callback 返回建议列表的数据
-        cb(results);
-      },
-      createFilter(queryString) {
-        return (restaurant) => {
-          return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
-        };
-      },
-       handleSelect(item) {
-        console.log(item);
-        if(this.selectValue.indexOf(item.value) === -1){
-          this.selectValue.push(item.value)
-        }
-        
-      },
+      var restaurants = this.options
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        )
+      }
+    },
+    handleSelect(item) {
+      console.log(item)
+      if (this.selectValue.indexOf(item.value) === -1) {
+        this.selectValue.push(item.value)
+      }
+    },
     // 关闭选择的省
     // handleClose(index){
     //   console.log(index)
     //   this.options.splice(index,1)
     // },
-    deleteItem(index){
+    deleteItem(index) {
       console.log(index)
-      this.selectValue.splice(index,1)
+      this.selectValue.splice(index, 1)
       console.log(this.selectValue)
     },
-    uploadAccountFn(val){
+    uploadAccountFn(val) {
       console.log(val)
       sendSafetyHatAccountDataApi({
         userId: val.userId
-      }).then(res=>{
+      }).then((res) => {
         console.log(res.code)
-        if(res.code==200){
+        if (res.code == 200) {
           this.$message.success('上传成功！')
         }
       })
     },
-    isShowProject(companyType){
-      if(this.$store.state.userInfo.addProjectType==0){
-        if(companyType){
+    isShowProject(companyType) {
+      if (this.$store.state.userInfo.addProjectType == 0) {
+        if (companyType) {
           return true
         }
-        
-      }else{
-        if(companyType==2||companyType==3){
+      } else {
+        if (companyType == 2 || companyType == 3) {
           return true
-        }else{
+        } else {
           return false
         }
-        
       }
     },
-      handleTabClick(tab, event) {
-        console.log(tab, event);
-        // if(this.tabActiveName=='first'){
-        //     this.getAccountList()
-            
-        // }else if(this.tabActiveName=='second'){
-        //     this.getJobList()
-        // }
-      },
-      handleNodeClick(data){
-        this.tabActiveName='first'
-        this.treeSelectData=data
-        this.getAccountList()
-        this.getJobList()
-      },
+    handleTabClick(tab, event) {
+      console.log(tab, event)
+      // if(this.tabActiveName=='first'){
+      //     this.getAccountList()
+
+      // }else if(this.tabActiveName=='second'){
+      //     this.getJobList()
+      // }
+    },
+    handleNodeClick(data) {
+      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();
@@ -1765,37 +1883,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; // 展示项目列表
-        if(this.$store.state.userInfo.addProjectType==1){
-          projectType=0 // 不展示项目列表
-        }
+      let sn = this.$store.state.userInfo.sn
+      let projectType = 1 // 展示项目列表
+      if (this.$store.state.userInfo.addProjectType == 1) {
+        projectType = 0 // 不展示项目列表
+      }
       getComapnyStatisticsListApi({
-        sn: sn,projectType:projectType
+        sn: sn,
+        projectType: projectType
       }).then((res) => {
-        this.level1CompanyData = res.result.companyList?res.result.companyList:res.result.projectList;
-        this.level4CompanyData = res.result.companyInfo?res.result.companyInfo:res.result.companyList
+        this.level1CompanyData = res.result.companyList
+          ? res.result.companyList
+          : res.result.projectList
+        this.level4CompanyData = res.result.companyInfo
+          ? res.result.companyInfo
+          : res.result.companyList
         // if (this.level1CompanyData.length > 0) {
         //   this.changeLevel1();
         // }
-      });
+      })
 
-    console.log(this.level1CompanyData)
+      console.log(this.level1CompanyData)
     },
     // loadData2() {
     //   getChildCompanyProjectListApi({
@@ -1852,7 +1975,7 @@ export default {
     //     this.$refs.singleTable.setCurrentRow(
     //       this.projectData[this.projectIndex]
     //     );
-    //     // 
+    //     //
     //     this.changeProject();
     //   } else {
     //     this.projectData = [];
@@ -1869,7 +1992,7 @@ export default {
     //       }
     //     });
     //   }
-    //   // 
+    //   //
     //   if (this.projectData.length > 0) {
     //     if (this.projectData[this.projectIndex].accountList != "") {
     //       this.projectAccountData = this.projectData[
@@ -1883,68 +2006,66 @@ export default {
     //删除管理机构信息
     deleteFn(item, index) {
       this.$confirm(
-        this.$t("message.companyDiagram.deleteManagementMsg") +
-          "【" +
+        this.$t('message.companyDiagram.deleteManagementMsg') +
+          '【' +
           item.companyName +
-          "】?",
-        this.$t("message.companyDiagram.Tips"),
+          '】?',
+        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) => {
-        //   if (
-        //     index <= this.level1Index &&
-        //     this.level1Index != 0 &&
-        //     item.companyType == 2
-        //   ) {
-        //     this.level1Index--;
-        //   }
-        //   if (
-        //     index <= this.level2Index &&
-        //     this.level2Index != 0 &&
-        //     item.companyType == 3
-        //   ) {
-        //     this.level2Index--;
-        //   }
+          //   if (
+          //     index <= this.level1Index &&
+          //     this.level1Index != 0 &&
+          //     item.companyType == 2
+          //   ) {
+          //     this.level1Index--;
+          //   }
+          //   if (
+          //     index <= this.level2Index &&
+          //     this.level2Index != 0 &&
+          //     item.companyType == 3
+          //   ) {
+          //     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){
+    async getGeoJson(url) {
       // window.location.href='http://geo.datav.aliyun.com/areas_v3/bound'+url
       return await $.getJSON(url)
     },
     //编辑管理机构信息
-    editFn(item) {  
-        // $.getJSON('/public/js/mapJson/city.json').then(res=>{
-        //   console.log(res)
-        // })
+    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):''
-      if(selectValue2 instanceof Array){
+      let selectValue2 = item.rangeAddr ? JSON.parse(item.rangeAddr) : ''
+      if (selectValue2 instanceof Array) {
         this.selectValue = selectValue2
-      }else{
+      } else {
         this.selectValue = []
       }
       console.log(this.selectValue)
       // this.addCompanyForm = JSON.parse(JSON.stringify(item))
       console.log(this.addCompanyForm)
-      this.addCompanyForm = item;
+      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"
@@ -1955,181 +2076,180 @@ 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();
+        this.$refs['addCompanyForm'].clearValidate()
         console.log(this.options)
-      });
+      })
     },
-    addOrganizationFn2(){
+    addOrganizationFn2() {
       let accountType = this.$store.state.userInfo.accountType
       switch (Number(accountType)) {
         case 2:
           this.add(accountType)
-          break;
+          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;
+          break
       }
     },
-    addOrganizationFn(data){
+    addOrganizationFn(data) {
       this.state = ''
-      console.log('----------',data)
-        // if(data.companyType==2){
-        //     this.add2(data.companyId,data.companyType)
-        // }
-        // if(data.companyType==3){
-        //     this.addProjectFn(data.companySn,data.companyType)
-        // }
-        if(data.companyType==3){
-           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)
-                if(target.indexOf(x.province) !== -1){
-                  this.options3 = this.options3.concat(x.citys)
-                }
-              })
-              // 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
-              }else{
-                this.options = []
-              }
-              // this.options = targetCity2.citys
-              // console.log(targetCity2) //省份下的全部市
-              // console.log(this.options)
-             
-              console.log(this.options3)
+      console.log('----------', data)
+      // if(data.companyType==2){
+      //     this.add2(data.companyId,data.companyType)
+      // }
+      // if(data.companyType==3){
+      //     this.addProjectFn(data.companySn,data.companyType)
+      // }
+      if (data.companyType == 3) {
+        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)
+            if (target.indexOf(x.province) !== -1) {
+              this.options3 = this.options3.concat(x.citys)
+            }
           })
-          //  this.value1 = ''
-            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):[]
-           if(options4.length !== 0){
-             this.options = options4.map(x=>{
-               return {
-                 label:x,
-                 value:x
-               }
-             })
-           }else{
-             this.options = []
-           }
-           this.add2(data,data.companyId,data.companyType+1)
-        }
-        if(data.companyType==2 && this.accountType !== 2){
-          console.log()
-            // this.value1 = ''
-            this.selectValue = []
-            let options4 = []
-            this.getGeoJson('/js/mapJson/city.json').then(res=>{
-            
-            res.forEach(x=>{
-                let target =data.rangeAddr!== ''?JSON.parse(data.rangeAddr):[]
-                if(target.indexOf(x.province) !== -1){
-                  options4.push(...x.citys)
-                }
-              })
-              // console.log(this.options3)
-              if(options4.length !== 0){
-                console.log('1')
-                this.options = options4
-              }
-              // this.options = targetCity2.citys
-              // console.log(targetCity2) //省份下的全部市
-              // console.log(this.options)
-             
-              console.log(options4)
+          // 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
+          } else {
+            this.options = []
+          }
+          // this.options = targetCity2.citys
+          // console.log(targetCity2) //省份下的全部市
+          // console.log(this.options)
+
+          console.log(this.options3)
+        })
+        //  this.value1 = ''
+        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) : []
+        if (options4.length !== 0) {
+          this.options = options4.map((x) => {
+            return {
+              label: x,
+              value: x
+            }
           })
-            let target = data.rangeAddr?JSON.parse(data.rangeAddr):[]
-            options4 = target.map((x,y)=>{
-               return {
-                  id:y,
-                 label:x,
-                 value:x
-               }
-            })
+        } else {
+          this.options = []
+        }
+        this.add2(data, data.companyId, data.companyType + 1)
+      }
+      if (data.companyType == 2 && this.accountType !== 2) {
+        console.log()
+        // this.value1 = ''
+        this.selectValue = []
+        let options4 = []
+        this.getGeoJson('/js/mapJson/city.json').then((res) => {
+          res.forEach((x) => {
+            let target = data.rangeAddr !== '' ? JSON.parse(data.rangeAddr) : []
+            if (target.indexOf(x.province) !== -1) {
+              options4.push(...x.citys)
+            }
+          })
+          // console.log(this.options3)
+          if (options4.length !== 0) {
+            console.log('1')
             this.options = options4
-            this.add2(data,data.companyId,data.companyType+1)
-        }
-        if(data.companyType==4){
-            this.addProjectFn(data.companySn,data.companyType)
-        }
+          }
+          // this.options = targetCity2.citys
+          // console.log(targetCity2) //省份下的全部市
+          // console.log(this.options)
+
+          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)
+      }
+      if (data.companyType == 4) {
+        this.addProjectFn(data.companySn, data.companyType)
+      }
     },
-    editOrganizationFn(data){
+    editOrganizationFn(data) {
       this.state = ''
-      console.log('-----编辑的logo',data)
+      console.log('-----编辑的logo', data)
       // console.log(data.parentId)
       // console.log(data.companyType)
-      if(data.companyType === 4 ){
-        
-          // this.parentPrivnce = []
-          // this.options3 = []
-          // console.log(this.level1CompanyData)
-          // this.level1CompanyData.forEach(x=>{
-          //   this.parentPrivnce.push(...x.list)
-          // })
-          // 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.companyType === 4) {
+        // this.parentPrivnce = []
+        // this.options3 = []
+        // console.log(this.level1CompanyData)
+        // this.level1CompanyData.forEach(x=>{
+        //   this.parentPrivnce.push(...x.list)
+        // })
+        // console.log(this.parentPrivnce)
+        // let targetCity = this.parentPrivnce.filter(x=> x.companyId === data.parentId)
+        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 target =
+            targetCity.parentRangeAddr !== ''
+              ? JSON.parse(targetCity.parentRangeAddr)
+              : []
+          console.log(target)
+          this.options3 = []
+          if (target.length !== 0) {
+            res.forEach((x) => {
+              if (target.indexOf(x.province) !== -1) {
+                this.options3.push(...x.citys)
+              }
+            })
+          } else {
+            this.options3 = []
           }
-            let targetCity = []
-            targetCity = data
-           console.log(targetCity)
-          this.getGeoJson('/js/mapJson/city.json').then(res=>{
-            console.log(targetCity)
-            let target = targetCity.parentRangeAddr !==''?JSON.parse(targetCity.parentRangeAddr):[]
-             console.log(target)
-             this.options3 = []
-             if(target.length !== 0){
-                res.forEach(x=>{
-                if(target.indexOf(x.province) !== -1){
-                  this.options3.push(...x.citys)
-                }
-              })
-             }else{
-               this.options3 = []
-             }
-           
-              // console.log(this.options3)
-              console.log(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)
-       })
-       }
-    
-      
+
+          // console.log(this.options3)
+          console.log(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)
+        })
+      }
+
       // console.log(JSON.parse(data.rangeAddr).toString())
       //  let choose = this.cityList.filter(x=>{
       //    console.log(JSON.parse(data.rangeAddr).toString())
@@ -2139,120 +2259,121 @@ export default {
       //     }
       //  })
       //  console.log(choose)
-        if(data.companyType == 2 ){
-          // this.options = [] 
-          //  let choosePrivnce = data.rangeAddr?JSON.parse(data.rangeAddr):[]
-          //  console.log(choosePrivnce.length)
-          //  console.log(choosePrivnce instanceof Array)
-          //  if(choosePrivnce.length>0 && choosePrivnce instanceof Array ){
-          //     this.options = choosePrivnce.map(x=>{
-          //    return {
-          //      label:x,
-          //      value:x
-          //    }
-          //   })
-          //  }
-           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){
-        //       let options4 = []
-        //       this.getGeoJson('/js/mapJson/city.json').then(res=>{
-            
-        //     res.forEach(x=>{
-        //         let target =data.parentRangeAddr!== ''?JSON.parse(data.parentRangeAddr):[]
-        //         if(target.indexOf(x.province) !== -1){
-        //          options4.push(...x.citys)
-        //         }
-        //       })
-        //       // console.log(this.options3)
-             
-        //       if(options4.length !== 0){  
-        //         this.options = options4
-        //       }
-        //       // this.options = targetCity2.citys
-        //       // console.log(targetCity2) //省份下的全部市
-        //       // console.log(this.options)
-             
+      if (data.companyType == 2) {
+        // this.options = []
+        //  let choosePrivnce = data.rangeAddr?JSON.parse(data.rangeAddr):[]
+        //  console.log(choosePrivnce.length)
+        //  console.log(choosePrivnce instanceof Array)
+        //  if(choosePrivnce.length>0 && choosePrivnce instanceof Array ){
+        //     this.options = choosePrivnce.map(x=>{
+        //    return {
+        //      label:x,
+        //      value:x
+        //    }
         //   })
-        //     }else{
-        //        this.options = []
-        //     }
-        //     // this.options = this.options2
-        //     this.editFn(data)
-        // }
-        if(data.companyType==3 && this.accountType === 2 ){
-          
-            if(data.parentRangeAddr){
-              let options4 = JSON.parse(data.parentRangeAddr)
-              this.options = options4.map(x=>{
-                return {
-                  label:x,
-                  value:x
-                }
-              })
+        //  }
+        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){
+      //       let options4 = []
+      //       this.getGeoJson('/js/mapJson/city.json').then(res=>{
 
-            }else{
-               this.options = []
-            }
-            // this.options = this.options2
-            this.editFn(data)
-        }
-        if(data.companyType==3 && this.accountType === 3 ){
-            if(data.parentRangeAddr){
-              let options4 = JSON.parse(data.parentRangeAddr)
-              this.options = options4.map(x=>{
-                return {
-                  label:x,
-                  value:x
-                }
-              })
+      //     res.forEach(x=>{
+      //         let target =data.parentRangeAddr!== ''?JSON.parse(data.parentRangeAddr):[]
+      //         if(target.indexOf(x.province) !== -1){
+      //          options4.push(...x.citys)
+      //         }
+      //       })
+      //       // console.log(this.options3)
 
-            }else{
-               this.options = []
+      //       if(options4.length !== 0){
+      //         this.options = options4
+      //       }
+      //       // this.options = targetCity2.citys
+      //       // console.log(targetCity2) //省份下的全部市
+      //       // console.log(this.options)
+
+      //   })
+      //     }else{
+      //        this.options = []
+      //     }
+      //     // this.options = this.options2
+      //     this.editFn(data)
+      // }
+      if (data.companyType == 3 && this.accountType === 2) {
+        if (data.parentRangeAddr) {
+          let options4 = JSON.parse(data.parentRangeAddr)
+          this.options = options4.map((x) => {
+            return {
+              label: x,
+              value: x
             }
-            // this.options = this.options2
-            this.editFn(data)
+          })
+        } else {
+          this.options = []
         }
-        if(data.projectName){
-            this.editProjectFn(data)
+        // this.options = this.options2
+        this.editFn(data)
+      }
+      if (data.companyType == 3 && this.accountType === 3) {
+        if (data.parentRangeAddr) {
+          let options4 = JSON.parse(data.parentRangeAddr)
+          this.options = options4.map((x) => {
+            return {
+              label: x,
+              value: x
+            }
+          })
+        } else {
+          this.options = []
         }
+        // this.options = this.options2
+        this.editFn(data)
+      }
+      if (data.projectName) {
+        this.editProjectFn(data)
+      }
     },
-    deleteOrganizationFn(data){
-        if(data.companyType==2||data.companyType==3||data.companyType==4){
-            this.deleteFn(data)
-        }
-        if(data.projectName){
-            this.deleteProjectFn(data)
-        }
+    deleteOrganizationFn(data) {
+      if (
+        data.companyType == 2 ||
+        data.companyType == 3 ||
+        data.companyType == 4
+      ) {
+        this.deleteFn(data)
+      }
+      if (data.projectName) {
+        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.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) {
+    add2(data, parentId, companyType) {
       console.log(data)
       console.log(this.level4CompanyData)
       console.log(parentId)
@@ -2260,44 +2381,45 @@ export default {
       console.log(companyType)
       console.log(this.addCompanyForm)
       this.addCompanyForm.companyId = ''
-      this.addCompanyForm.longitude = "";
-      this.addCompanyForm.latitude = "";
+      this.addCompanyForm.longitude = ''
+      this.addCompanyForm.latitude = ''
       // this.value1 = ''
       this.selectValue = []
-      this.addCompanyDialog = true;
-      if(data.companyType === 4){
+      this.addCompanyDialog = true
+      if (data.companyType === 4) {
         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 = []
-            parentPrivnce.forEach(x=>{
-               citysList =  res.filter(y=>y.province === x)
-            })
-            console.log(citysList)
-            citysList.forEach(x=>{
-                allcitys.push(...x.citys)
-            })
-            console.log(allcitys)
-            this.options = allcitys
-            // let childrenCitys = res.filter(x=>x.province === parentPrivnce)
-           
-         })
+        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 = []
+          parentPrivnce.forEach((x) => {
+            citysList = res.filter((y) => y.province === x)
+          })
+          console.log(citysList)
+          citysList.forEach((x) => {
+            allcitys.push(...x.citys)
+          })
+          console.log(allcitys)
+          this.options = allcitys
+          // let childrenCitys = res.filter(x=>x.province === parentPrivnce)
+        })
       }
-      if(companyType === 4 && this.accountType ===4){
+      if (companyType === 4 && this.accountType === 4) {
         console.log('9999')
-        if(this.level4CompanyData.rangeAddr){
+        if (this.level4CompanyData.rangeAddr) {
           let provinceList = JSON.parse(this.level4CompanyData.rangeAddr)
           console.log(provinceList)
-          this.getGeoJson('/js/mapJson/city.json').then(res=>{
+          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)
-                  }
+            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)
+                }
               }
             }
             this.options = citys
@@ -2309,20 +2431,18 @@ export default {
           //     value:x
           //   }
           // })
-          
         }
       }
-      if(companyType === 3 && this.accountType === 3){
-         
-          if(this.level4CompanyData.rangeAddr){
-            let provinceList = JSON.parse(this.level4CompanyData.rangeAddr)
-            this.options = provinceList.map(x=>{
-             return {
-                value:x,
-                label:x
-             }
-            })
-          }
+      if (companyType === 3 && this.accountType === 3) {
+        if (this.level4CompanyData.rangeAddr) {
+          let provinceList = JSON.parse(this.level4CompanyData.rangeAddr)
+          this.options = provinceList.map((x) => {
+            return {
+              value: x,
+              label: x
+            }
+          })
+        }
         //  this.getGeoJson('/js/mapJson/city.json').then(res=>{
         //     province.push(...res)
         //     console.log(province)
@@ -2335,46 +2455,45 @@ export default {
         //     })
         //  })
       }
-    //   if (
-    //     this.level1CompanyData.length == 0 &&
-    //     this.$store.state.userInfo.accountType == 2
-    //   ) {
-    //     this.$message.error(
-    //       this.$t("message.companyDiagram.addManagementMessage1")
-    //     ); //请先添加一级管理机构
-    //   } else {
+      //   if (
+      //     this.level1CompanyData.length == 0 &&
+      //     this.$store.state.userInfo.accountType == 2
+      //   ) {
+      //     this.$message.error(
+      //       this.$t("message.companyDiagram.addManagementMessage1")
+      //     ); //请先添加一级管理机构
+      //   } else {
       console.log(this.addCompanyForm)
-        this.addCompanyForm.companyType = companyType;
-        this.addCompanyForm.companyName = "";
-        if(parentId){
-          this.addCompanyForm.parentId = parentId;
-        }else{
-          this.addCompanyForm.parentSn = this.$store.state.userInfo.sn;
-          this.addCompanyForm.parentId=''
-        }
-        
+      this.addCompanyForm.companyType = companyType
+      this.addCompanyForm.companyName = ''
+      if (parentId) {
+        this.addCompanyForm.parentId = parentId
+      } else {
+        this.addCompanyForm.parentSn = this.$store.state.userInfo.sn
+        this.addCompanyForm.parentId = ''
+      }
 
-        // if (this.level1CompanyData.length > 0) {
-          
-        // } else {
-        //   this.addCompanyForm.parentSn = this.$store.state.userInfo.sn;
-        //   this.addCompanyForm.parentId = "";
-        // }
+      // if (this.level1CompanyData.length > 0) {
 
-        // this.dialogTitle = this.$t(
-        //   "message.companyDiagram.addManagementTitle2"
-        // ); //添加二级管理机构
-        this.dialogTitle='添加管理机构'
-        this.isAdd = true;
-        this.$nextTick(() => {
-          this.$refs["addCompanyForm"].clearValidate();
-        });
-    //   }
+      // } else {
+      //   this.addCompanyForm.parentSn = this.$store.state.userInfo.sn;
+      //   this.addCompanyForm.parentId = "";
+      // }
+
+      // this.dialogTitle = this.$t(
+      //   "message.companyDiagram.addManagementTitle2"
+      // ); //添加二级管理机构
+      this.dialogTitle = '添加管理机构'
+      this.isAdd = true
+      this.$nextTick(() => {
+        this.$refs['addCompanyForm'].clearValidate()
+      })
+      //   }
     },
     //新增或编辑管理机构
     saveCompanyFn() {
       console.log(this.addCompanyForm)
-      this.$refs["addCompanyForm"].validate((valid) => {
+      this.$refs['addCompanyForm'].validate((valid) => {
         if (valid) {
           if (this.isAdd) {
             console.log('增加保存')
@@ -2383,28 +2502,25 @@ export default {
             // let choosePrivnce = this.value1
             let choosePrivnce = this.selectValue
             this.addCompanyForm.rangeAddr = JSON.stringify(this.selectValue)
-            let newPrivnce = this.options4.filter(x=>{
-              if(choosePrivnce.indexOf(x.value) === -1){
+            let newPrivnce = this.options4.filter((x) => {
+              if (choosePrivnce.indexOf(x.value) === -1) {
                 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")
-              );
-            });
-            
-          } 
-          else {
+                this.$t('message.companyDiagram.addSuccess')
+              )
+            })
+          } else {
             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 = ''
@@ -2413,323 +2529,315 @@ export default {
             obj.editType = 1
             editCompanyApi(obj).then((res) => {
               console.log(res)
-              this.addCompanyDialog = false;
-              this.initData();
+              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 = "";
-     
-      if(this.treeSelectData.companyType){
-          this.addJobForm.sn=this.treeSelectData.companySn
-      }else{
-          this.addJobForm.sn=this.treeSelectData.projectSn
+      //
+      this.isAdd = true
+      this.jobDialogTitle = '添加岗位' //添加岗位
+      this.addJobForm.jobName = ''
+      this.addJobForm.jobDuty = ''
+
+      if (this.treeSelectData.companyType) {
+        this.addJobForm.sn = this.treeSelectData.companySn
+      } else {
+        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) => {
+    saveJobFn() {
+      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
-        getorganizationJobListApi({ sn: sn }).then((res) => {
-          this.jobList=res.result
-          
-        });
+    getJobList() {
+      let data = this.treeSelectData
+      let sn = data.projectSn ? data.projectSn : data.companySn
+      getorganizationJobListApi({ sn: sn }).then((res) => {
+        this.jobList = res.result
+      })
     },
     //删除岗位
     deleteJobFn(item) {
       this.$confirm(
-        this.$t("message.companyDiagram.deleteAccountMsg") +
-          "【" +
+        this.$t('message.companyDiagram.deleteAccountMsg') +
+          '【' +
           item.jobName +
-          "】?",
-        this.$t("message.companyDiagram.Tips"),
+          '】?',
+        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.$t("message.companyDiagram.addAccount"); //添加账号
-      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
-          if(this.treeSelectData.companyType==4){
-            this.addAccountForm.accountType=7
-          }
-      }else{
-          this.addAccountForm.accountType=5
-          this.addAccountForm.sn=this.treeSelectData.projectSn
+      //
+      this.isAdd = true
+      this.accountDialogTitle = this.$t('message.companyDiagram.addAccount') //添加账号
+      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
+        if (this.treeSelectData.companyType == 4) {
+          this.addAccountForm.accountType = 7
+        }
+      } else {
+        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()
+      })
     },
     //显示编辑账号弹框
     editAccountFn(item) {
-      this.accountDialogTitle = this.$t("message.companyDiagram.editAccount"); //编辑账号
-      this.addAccountForm = JSON.parse(JSON.stringify(item));
-      this.addAccountDialog = true;
-      this.isAdd = false;
+      this.accountDialogTitle = this.$t('message.companyDiagram.editAccount') //编辑账号
+      this.addAccountForm = JSON.parse(JSON.stringify(item))
+      this.addAccountDialog = true
+      this.isAdd = false
       this.$nextTick(() => {
-        this.$refs["addAccountForm"].clearValidate();
-      });
+        this.$refs['addAccountForm'].clearValidate()
+      })
     },
     //新增或编辑账号
     saveAccountFn() {
-      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") +
-          "【" +
+        this.$t('message.companyDiagram.deleteAccountMsg') +
+          '【' +
           item.account +
-          "】?",
-        this.$t("message.companyDiagram.Tips"),
+          '】?',
+        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
-        getSystemUserBySnApi({ sn: sn }).then((res) => {
-          this.level1AccountData=res.result
-          
-        });
+    getAccountList() {
+      let data = this.treeSelectData
+      let sn = data.projectSn ? data.projectSn : data.companySn
+      getSystemUserBySnApi({ sn: sn }).then((res) => {
+        this.level1AccountData = res.result
+      })
     },
     //删除项目
     deleteProjectFn(item, index) {
-    //   console.log("index", index);
+      //   console.log("index", index);
       this.$confirm(
-        this.$t("message.companyDiagram.deleteItemMsg") +
-          "【" +
+        this.$t('message.companyDiagram.deleteItemMsg') +
+          '【' +
           item.projectName +
-          "】?",
-        this.$t("message.companyDiagram.Tips"),
+          '】?',
+        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")
-          ); //删除成功!
-        });
-      });
+          //   if (index <= this.projectIndex && this.projectIndex != 0) {
+          //     this.projectIndex--;
+          //   }
+          this.initData()
+          this.$message.success(this.$t('message.companyDiagram.deleteSuccess')) //删除成功!
+        })
+      })
     },
     //显示添加项目弹框
     addProjectFn(parentSn) {
-    //   if (
-    //     this.level1CompanyData.length == 0 &&
-    //     this.$store.state.userInfo.accountType == 2
-    //   ) {
-    //     this.$message.error(
-    //       this.$t("message.companyDiagram.addManagementMessage1")
-    //     ); //请先添加一级管理机构
-    //     return;
-    //   }
-    //   if (
-    //     this.level2CompanyData.length == 0 &&
-    //     this.$store.state.userInfo.accountType == 3
-    //   ) {
-    //     this.$message.error(
-    //       this.$t("message.companyDiagram.addManagementMessage2")
-    //     ); //请先添加二级管理机构
-    //     return;
-    //   }
-   
-    //   if (this.level2CompanyData.length > 0) {
-    //     this.addProjectForm.companySn = this.level2CompanyData[
-    //       this.level2Index
-    //     ].companySn;
-    //   } else {
-    //     this.addProjectForm.companySn = this.$store.state.userInfo.sn;
-    //   }
+      //   if (
+      //     this.level1CompanyData.length == 0 &&
+      //     this.$store.state.userInfo.accountType == 2
+      //   ) {
+      //     this.$message.error(
+      //       this.$t("message.companyDiagram.addManagementMessage1")
+      //     ); //请先添加一级管理机构
+      //     return;
+      //   }
+      //   if (
+      //     this.level2CompanyData.length == 0 &&
+      //     this.$store.state.userInfo.accountType == 3
+      //   ) {
+      //     this.$message.error(
+      //       this.$t("message.companyDiagram.addManagementMessage2")
+      //     ); //请先添加二级管理机构
+      //     return;
+      //   }
+
+      //   if (this.level2CompanyData.length > 0) {
+      //     this.addProjectForm.companySn = this.level2CompanyData[
+      //       this.level2Index
+      //     ].companySn;
+      //   } 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.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() {
-      this.$refs["addProjectForm"].validate((valid) => {
+      this.$refs['addProjectForm'].validate((valid) => {
         if (valid) {
           if (this.isAdd) {
             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() {
@@ -2746,19 +2854,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=''
@@ -2769,149 +2877,149 @@ 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);
-      }else{
-        this.getUserModuleArr(item.userId);
+      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.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}).then((result) => {
+      getUserModuleList({
+        userId: userId,
+        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
           }
-        });
+        })
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style lang="less" scoped>
-
-
 .custom-tree-node {
   width: 100%;
 }
 
 .projectName {
   // color: #191e3d;
-//   font-size: 15px;
-//   margin-bottom: 8px;
-//   font-weight: 500;
+  //   font-size: 15px;
+  //   margin-bottom: 8px;
+  //   font-weight: 500;
 }
 
 .el-icon-view {
@@ -2968,9 +3076,9 @@ export default {
 /deep/ .projectDialog .el-dialog {
   margin-top: 20px !important;
   margin-bottom: 0;
-  .el-input--medium .el-input__inner{
-  // height: 65px;
-}
+  .el-input--medium .el-input__inner {
+    // height: 65px;
+  }
 }
 .el-icon-setting {
   font-size: 15px;
@@ -2998,8 +3106,8 @@ export default {
 }
 
 .areaTreeBox {
-    float: left;
-    position: relative;
+  float: left;
+  position: relative;
   /deep/.el-tree {
     font-size: 15px;
     width: 100%;
@@ -3009,7 +3117,7 @@ export default {
       &:focus > .el-tree-node__content {
         background-color: transparent;
       }
-      &.is-current > .el-tree-node__content{
+      &.is-current > .el-tree-node__content {
         background-color: rgba(81, 129, 246, 0.14);
         color: #5181f6;
       }
@@ -3024,7 +3132,6 @@ export default {
       &:hover {
         background-color: rgba(81, 129, 246, 0.14);
         color: #5181f6;
-        
       }
 
       .videoName {
@@ -3048,14 +3155,14 @@ export default {
       }
     }
     .treeTitle {
-        background-color: #f7f7f7;
-        margin-bottom: 10px;
+      background-color: #f7f7f7;
+      margin-bottom: 10px;
     }
   }
 }
 
 .areaTreeInner {
-//   background-color: rgba(0, 0, 0, 0.7);
+  //   background-color: rgba(0, 0, 0, 0.7);
   width: 300px;
   padding: 20px 15px;
   height: calc(100% - 40px);
@@ -3065,33 +3172,33 @@ export default {
   background-color: rgba(216, 216, 216, 0.2);
   padding-top: 10px;
 }
-.rightPanel{
-    float: left;
-    width: calc(100% - 330px - 20px - 30px);
-    margin-left: 20px;
-    padding: 20px 15px;
-    height: calc(100% - 40px);
+.rightPanel {
+  float: left;
+  width: calc(100% - 330px - 20px - 30px);
+  margin-left: 20px;
+  padding: 20px 15px;
+  height: calc(100% - 40px);
 }
-.operateBtns{
-    float: right;
-    
-    i{
-        margin-right: 10px;
-        cursor: pointer;
-    }
-}
-.plusBtn{
-    float: right;
-    background-color: #409eff;
-    color: white;
-    padding: 2px 6px;
-    border-radius: 3px;
-    margin-top: -6px;
+.operateBtns {
+  float: right;
+
+  i {
+    margin-right: 10px;
     cursor: pointer;
+  }
+}
+.plusBtn {
+  float: right;
+  background-color: #409eff;
+  color: white;
+  padding: 2px 6px;
+  border-radius: 3px;
+  margin-top: -6px;
+  cursor: pointer;
 }
 // /deep/.el-select__tags{
 //   width: 350px;
-//   top: 58%; 
+//   top: 58%;
 //   overflow: auto;
 //   height: 100px;
 //   // display: flex;
@@ -3115,15 +3222,15 @@ export default {
 // /deep/.el-select__tags::-webkit-scrollbar-thumb{
 //   background-color: #fbfbfc;
 // }
-.add{
+.add {
   display: flex;
   align-items: center;
   cursor: pointer;
-  :nth-child(2){
+  :nth-child(2) {
     margin-left: 5px;
   }
 }
-.select{
+.select {
   display: flex;
   width: 500px;
   max-height: 380px;
@@ -3133,88 +3240,88 @@ export default {
   // div{
   //   margin: 3px 15px;
   // }
-  .el-tag{
+  .el-tag {
     margin: 5px 10px;
   }
 }
-.select::-webkit-scrollbar{
+.select::-webkit-scrollbar {
   background-color: rgb(132, 132, 133);
   width: 4px;
 }
-.select::-webkit-scrollbar-thumb{
+.select::-webkit-scrollbar-thumb {
   background-color: rgb(80, 78, 252);
 }
-/deep/ .el-transfer__buttons{
+/deep/ .el-transfer__buttons {
   display: none;
 }
-/deep/ .el-transfer-panel{
+/deep/ .el-transfer-panel {
   width: 200px;
   margin: 5px 22px;
 }
-.leftSelect{
+.leftSelect {
   width: 230px;
   height: 300px;
   display: inline-block;
   position: relative;
   margin: 5px 15px 5px 0;
-  border: 1px solid #F4F2F4;
-  .title{
+  border: 1px solid #f4f2f4;
+  .title {
     position: absolute;
     top: 0;
     left: 0;
     right: 0;
-    padding-left:20px ;
-    background-color: #F5F5F5;
+    padding-left: 20px;
+    background-color: #f5f5f5;
   }
-  .el-autocomplete{
+  .el-autocomplete {
     position: absolute;
     top: 50px;
     left: 25px;
     right: 30px;
-    /deep/ .el-input--medium .el-input__inner{
+    /deep/ .el-input--medium .el-input__inner {
       border-radius: 10px;
       padding: 0 10px;
     }
   }
-  
-  .el-checkbox-group{
+
+  .el-checkbox-group {
     height: 190px;
     width: 90%;
     overflow: auto;
     position: absolute;
     top: 95px;
     left: 25px;
-    .el-checkbox{
+    .el-checkbox {
       display: block;
-     margin: 0;
+      margin: 0;
     }
   }
-  .el-checkbox-group::-webkit-scrollbar{
-    background-color:#fff ;
+  .el-checkbox-group::-webkit-scrollbar {
+    background-color: #fff;
     width: 4px;
     border-radius: 5px;
   }
-  .el-checkbox-group::-webkit-scrollbar-thumb{
-    background-color:#E0E1E3;
-     border-radius: 5px;
+  .el-checkbox-group::-webkit-scrollbar-thumb {
+    background-color: #e0e1e3;
+    border-radius: 5px;
   }
 }
-.rightSelect{
+.rightSelect {
   width: 230px;
   height: 300px;
   display: inline-block;
   position: relative;
   margin: 5px 10px 5px 0;
-  border: 1px solid #F4F2F4;
-  .title{
+  border: 1px solid #f4f2f4;
+  .title {
     position: absolute;
     top: 0;
     left: 0;
     right: 0;
-    padding-left:20px ;
-    background-color: #F5F5F5;
+    padding-left: 20px;
+    background-color: #f5f5f5;
   }
-  .rightAllSelect{
+  .rightAllSelect {
     width: 100%;
     height: 230px;
     overflow: auto;
@@ -3222,38 +3329,43 @@ export default {
     flex-direction: column;
     position: absolute;
     top: 50px;
-    .selectItem{
+    .selectItem {
       width: 100%;
       display: flex;
       justify-content: space-between;
       align-items: center;
-      span{
+      span {
         margin-left: 30px;
       }
-      img{
+      img {
         cursor: pointer;
         display: none;
         margin-right: 20px;
       }
     }
-    .selectItem:hover{
-    background-color: #ECF4FD;
+    .selectItem:hover {
+      background-color: #ecf4fd;
     }
-    .selectItem:hover img{
+    .selectItem:hover img {
       display: inline-block;
     }
   }
-   .rightAllSelect::-webkit-scrollbar{
-    background-color:#fff ;
+  .rightAllSelect::-webkit-scrollbar {
+    background-color: #fff;
     width: 4px;
     border-radius: 5px;
   }
-  .rightAllSelect::-webkit-scrollbar-thumb{
-    background-color:#E0E1E3;
-     border-radius: 5px;
+  .rightAllSelect::-webkit-scrollbar-thumb {
+    background-color: #e0e1e3;
+    border-radius: 5px;
   }
-  
 }
+// ::v-deep .el-form-item__label {
+//   text-align: center !important;
+// }
+// ::v-deep .el-form-item--medium .el-form-item__content {
+//   margin-left: -20px !important;
+// }
 // /deep/ .el-checkbox__input{
 //   display: none;
 // }
diff --git a/src/views/equipmentCenter/videoManage/videoConfig.vue b/src/views/equipmentCenter/videoManage/videoConfig.vue
index 05bd84d0..c6aa2cd0 100644
--- a/src/views/equipmentCenter/videoManage/videoConfig.vue
+++ b/src/views/equipmentCenter/videoManage/videoConfig.vue
@@ -584,26 +584,7 @@
               :placeholder="$t('message.videoManage.placeholder')"
             ></el-input>
           </el-form-item>
-          <!-- 视频封面 -->
-          <el-form-item :label="$t('message.videoManage.videoCover')">
-            <el-upload
-              class="avatar-uploader"
-              :action="$store.state.UPLOADURL"
-              :show-file-list="false"
-              :before-upload="beforeAvatarUpload"
-              :on-success="handleUploadSuccess"
-              name="files"
-            >
-              <div v-if="currentVideoTypeDetail.coverUrl" class="imgBox">
-                <img :src="currentVideoTypeDetail.coverUrl" class="avatar" />
-                <i
-                  class="el-icon-error redText"
-                  @click.stop="currentVideoTypeDetail.coverUrl = ''"
-                ></i>
-              </div>
-              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
-          </el-form-item>
+
           <!-- 报警推送人 -->
           <el-form-item
             :label="$t('message.videoManage.alarmPusher')"
@@ -655,8 +636,90 @@
               </el-option>
             </el-select>
             <!-- <el-input
-                                  v-model="currentVideoTypeDetail.nvrId"
-                                  :placeholder="$t('message.videoManage.placeholder')"></el-input> -->
+            v-model="currentVideoTypeDetail.nvrId"
+            :placeholder="$t('message.videoManage.placeholder')">-->
+          </el-form-item>
+          <!-- 云联万物项目字段 -->
+          <el-form-item
+            v-if="COMPANY == 'yunlian'"
+            label="监控点编号（结构化数据）"
+            prop="monitoringPointCode"
+          >
+            <el-input
+              v-model="currentVideoTypeDetail.monitoringPointCode"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item
+            v-if="COMPANY == 'yunlian'"
+            label="监控点位置（结构化数据）"
+            prop="monitoringPointLocation"
+          >
+            <el-select
+              v-model="currentVideoTypeDetail.monitoringPointLocation"
+              placeholder="请选择"
+              :clearable="true"
+            >
+              <el-option
+                v-for="item in monitorinList"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <!-- 经度 -->
+          <el-form-item
+            v-if="COMPANY == 'yunlian'"
+            label="经度位置"
+            prop="longitude"
+          >
+            <el-input disabled v-model="currentVideoTypeDetail.longitude">
+              <template slot="append">
+                <el-link type="primary" @click="toGetLocalFn">
+                  {{
+                    $t(
+                      'message.companyDiagram.dialog_ProjectPop_up.coordinatePicking'
+                    )
+                  }}
+                </el-link>
+              </template>
+            </el-input>
+          </el-form-item>
+
+          <!-- 纬度 -->
+          <el-form-item
+            v-if="COMPANY == 'yunlian'"
+            label="纬度位置"
+            prop="latitude"
+          >
+            <el-input
+              v-model="currentVideoTypeDetail.latitude"
+              disabled
+            ></el-input>
+          </el-form-item>
+          <!-- 视频封面 -->
+          <el-form-item :label="$t('message.videoManage.videoCover')">
+            <el-upload
+              class="avatar-uploader"
+              :action="$store.state.UPLOADURL"
+              :show-file-list="false"
+              :before-upload="beforeAvatarUpload"
+              :on-success="handleUploadSuccess"
+              name="files"
+            >
+              <div v-if="currentVideoTypeDetail.coverUrl" class="imgBox">
+                <img :src="currentVideoTypeDetail.coverUrl" class="avatar" />
+                <i
+                  class="el-icon-error redText"
+                  @click.stop="currentVideoTypeDetail.coverUrl = ''"
+                ></i>
+              </div>
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
           </el-form-item>
         </el-form>
         <div class="dialog-footer">
@@ -947,9 +1010,17 @@
         </el-form>
       </div>
     </el-dialog>
+    <!--高德地图-->
+    <gd-map
+      v-if="showMap"
+      :addProjectForm="addProjectForm"
+      @closeMap="closeMap"
+      @save="getLngLat"
+    ></gd-map>
   </div>
 </template>
 <script>
+import gdMap from '@/components/map/gd-map.vue'
 import {
   addVideoItemApi,
   editVideoItemApi,
@@ -1107,7 +1178,9 @@ export default {
         groupId: '',
         ip: '',
         nvrId: '',
-        aiFunctionType: 0
+        aiFunctionType: 0,
+        latitude: '', //纬度
+        longitude: '' //经度
         // appSecret: '0a5836c68a7edabcc78e6a18f05bb317'
       },
       isCreateNewUser: [
@@ -1121,7 +1194,36 @@ export default {
             message: this.$t('message.videoManage.required'),
             trigger: 'blur'
           } // 必填
+        ],
+        latitude: [
+          {
+            required: true,
+            message: this.$t('message.videoManage.required'),
+            trigger: 'blur'
+          } // 必填
+        ],
+        longitude: [
+          {
+            required: true,
+            message: this.$t('message.videoManage.required'),
+            trigger: 'blur'
+          } // 必填
+        ],
+        monitoringPointCode: [
+          {
+            required: true,
+            message: this.$t('message.videoManage.required'),
+            trigger: 'blur'
+          } // 必填
+        ],
+        monitoringPointLocation: [
+          {
+            required: true,
+            message: this.$t('message.videoManage.required'),
+            trigger: 'blur'
+          } // 必填
         ]
+
         // ip:[
         //     { required: true, message: this.$t('message.videoManage.required'), trigger: 'blur' }, // 必填
         // ],
@@ -1150,7 +1252,72 @@ export default {
           } // 必填
         ]
       },
-      projectSn: ''
+      projectSn: '',
+      monitorinList: [
+        {
+          label: '作业面',
+          value: 'JKDWZ001'
+        },
+        {
+          label: '料场',
+          value: 'JKDWZ002'
+        },
+        {
+          label: '车辆出入口',
+          value: 'JKDWZ003'
+        },
+        {
+          label: '人员出入口',
+          value: 'JKDWZ004'
+        },
+        {
+          label: '洗轮机',
+          value: 'JKDWZ00'
+        },
+        {
+          label: '围墙',
+          value: 'JKDWZ006'
+        },
+        {
+          label: '塔吊',
+          value: 'JKDWZ007'
+        },
+        {
+          label: '其他',
+          value: 'JKDWZ008'
+        }
+      ], //监控点位置（结构化数据）
+      showMap: 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: '',
+        majorProjectType: 0,
+        constructionPermit: '',
+        streetTownshipTownCode: '',
+        streetTownshipTown: ''
+      },
+      COMPANY: COMPANY
     }
   },
   created() {
@@ -1160,8 +1327,26 @@ export default {
     this.getVideoGroup()
     this.getAll()
   },
-  components: { cameraList, cameraListLc },
+  components: { cameraList, cameraListLc, gdMap },
   methods: {
+    getLngLat(v) {
+      this.showMap = false
+      if (this.Popup.newVideo) {
+        this.currentVideoTypeDetail.longitude = v.lng
+        this.currentVideoTypeDetail.latitude = v.lat
+      } else {
+        this.addProjectForm.longitude = v.lng
+        this.addProjectForm.latitude = v.lat
+      }
+    },
+    closeMap(val) {
+      this.showMap = val
+      console.log('打印子组件', val)
+    },
+    //打开地图
+    toGetLocalFn() {
+      this.showMap = true
+    },
     // nvr设备管理弹窗
     nvrDeviceManage() {
       this.nvrDevice = true
@@ -1606,7 +1791,12 @@ export default {
         sortNum: this.currentVideoTypeDetail.sortNum,
         aiFunctionType: this.currentVideoTypeDetail.aiFunctionType,
         ip: this.currentVideoTypeDetail.ip,
-        nvrId: this.currentVideoTypeDetail.nvrId
+        nvrId: this.currentVideoTypeDetail.nvrId,
+        monitoringPointCode: this.currentVideoTypeDetail.monitoringPointCode,
+        monitoringPointLocation:
+          this.currentVideoTypeDetail.monitoringPointLocation,
+        latitude: this.currentVideoTypeDetail.latitude,
+        longitude: this.currentVideoTypeDetail.longitude
       }
       console.log('传入的参数', params)
       console.log(this.currentVideoTypeDetail.aiFunctionType)
@@ -1906,4 +2096,11 @@ export default {
   display: flex;
   align-items: center;
 }
+::v-deep .el-form-item__label {
+  width: 110px !important;
+  text-align: center !important;
+}
+::v-deep .el-input-number .el-input-number--medium {
+  margin-left: -10px !important;
+}
 </style>