Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/routers/modules/base.js

@@ -398,7 +398,7 @@ var routers = [
                 component: () => import('@/views/base/personRoleInfo-list.vue'),
                 meta: {
                         roles: ["admin"],
-                        title: '用户角色管理'
+                        title: '用户身份管理'
                 }
         },
         {

src/views/base/personInfo-list.vue

@@ -21,14 +21,19 @@
     >
       <div>
         <el-form-item label="编号" prop="id">
-          <el-input type="text" size="mini" style="width:120px" v-model="queryModel.id"></el-input>
+          <el-input
+            type="text"
+            size="mini"
+            style="width: 120px"
+            v-model="queryModel.id"
+          ></el-input>
         </el-form-item>
         <el-form-item label="姓名" prop="name">
           <el-input
             type="text"
             size="mini"
             v-model="queryModel.name"
-            style="width:120px"
+            style="width: 120px"
           ></el-input>
         </el-form-item>
         <el-form-item label="手机号" prop="phone">
@@ -36,7 +41,7 @@
             type="text"
             size="mini"
             v-model="queryModel.phone"
-            style="width:120px"
+            style="width: 120px"
           ></el-input>
         </el-form-item>
         <el-form-item label="身份证" prop="idCard">
@@ -44,7 +49,7 @@
             type="text"
             size="mini"
             v-model="queryModel.idCard"
-            style="width:190px"
+            style="width: 190px"
           ></el-input>
         </el-form-item>
         <el-form-item label="绑定设备名称" prop="derviceName">
@@ -52,7 +57,7 @@
             type="text"
             size="mini"
             v-model="queryModel.derviceName"
-            style="width:120px"
+            style="width: 120px"
           ></el-input>
         </el-form-item>
         <el-form-item>
@@ -101,15 +106,6 @@
             >是否包含下级单位</el-checkbox
           >
         </el-form-item>
-        <el-form-item label="园区" prop="parkId">
-          <el-select-tree
-            size="mini"
-            :props="props"
-            :options="parkList"
-            v-model="queryModel.parkId"
-            height="200"
-          ></el-select-tree>
-        </el-form-item>
         <el-form-item label="是否上传照片" prop="isUploadPhoto">
           <el-select
             v-model="queryModel.isUploadPhoto"
@@ -310,35 +306,21 @@
       </el-table-column>
       <el-table-column
         prop="companyName"
-        label="单位"
+        label="主要单位"
         width="250"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="popedomName"
+        label="主要身份"
+        width="120"
+        show-overflow-tooltip
       ></el-table-column>
-      <el-table-column prop="popedomName" label="用户身份" width="200">
-        <!-- <template slot-scope="{ row }">
-          <el-row>
-            <el-col :span="10" v-if="row.popedom.indexOf('1') != -1"
-              >个人用户</el-col
-            >
-            <el-col
-              :span="10"
-              v-if="row.popedom.indexOf('2') != -1 && row.companyType == 1"
-              >单位管理员</el-col
-            >
-            <el-col
-              :span="10"
-              v-if="row.popedom.indexOf('2') != -1 && row.companyType == 2"
-              >班主任</el-col
-            >
-            <el-col :span="10" v-if="row.popedom.indexOf('3') != -1"
-              >监管专员</el-col
-            >
-          </el-row>
-        </template> -->
-      </el-table-column>
       <el-table-column
-        prop="parkName"
-        label="园区"
+        prop="mechanism"
+        label="所有单位身份"
         width="250"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="phone"
@@ -357,36 +339,6 @@
         width="150"
         show-overflow-tooltip
       ></el-table-column>
-      <el-table-column
-        prop="position1"
-        :label="position1"
-        width="180"
-        v-if="position1Show"
-      ></el-table-column>
-      <el-table-column
-        prop="position2"
-        :label="position2"
-        width="180"
-        v-if="position2Show"
-      ></el-table-column>
-      <el-table-column
-        prop="position3"
-        :label="position3"
-        width="180"
-        v-if="position3Show"
-      ></el-table-column>
-      <el-table-column
-        prop="position4"
-        :label="position4"
-        width="180"
-        v-if="position4Show"
-      ></el-table-column>
-      <el-table-column
-        prop="position5"
-        :label="position5"
-        width="180"
-        v-if="position5Show"
-      ></el-table-column>
       <el-table-column prop="openId" label="是否绑定公众号" width="180">
         <template slot-scope="{ row }">{{
           row.openId == null ? "否" : "是"
@@ -419,7 +371,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="刷卡授权">
+      <!-- <el-table-column label="刷卡授权">
         <template slot-scope="{ row }">
           <el-switch
             v-model="row.cardEnabled"
@@ -440,13 +392,13 @@
             :disabled="disabled"
           ></el-switch>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- <el-table-column label="密码">
         <template slot-scope="{row}">
           <el-switch v-model="row.passwordEnabled" @change="enabledTo(row.id,'face')" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
         </template>
       </el-table-column>-->
-      <el-table-column label="访客授权">
+      <!-- <el-table-column label="访客授权">
         <template slot-scope="{ row }">
           <el-switch
             v-model="row.guestEnabled"
@@ -456,7 +408,7 @@
             :disabled="disabled"
           ></el-switch>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="接收微信通知">
         <template slot-scope="{ row }">
           <el-switch
@@ -502,7 +454,7 @@
                   type="primary"
                   :underline="false"
                   @click="bindRole(row)"
-                  >角色管理</el-link
+                  >机构身份管理</el-link
                 >-
                 <span v-if="row.faceBound">
                   <el-link
@@ -677,9 +629,12 @@
         element-loading-background="rgba(0, 0, 0, 0.8)"
       >
         <el-form-item label="设备">
-          <el-select v-model="boundDeviceIds" filterable 
-          placeholder="请选择" multiple
-          style="width:300px;"
+          <el-select
+            v-model="boundDeviceIds"
+            filterable
+            placeholder="请选择"
+            multiple
+            style="width: 300px"
           >
             <el-option
               v-for="devices in deviceResult"
@@ -785,7 +740,7 @@ export default {
         position4: "",
         position5: "",
         derviceName: "",
-        parkId:""
+        parkId: "",
       },
       loading: false,
       tableData: [],
@@ -845,8 +800,8 @@ export default {
       bindWechatVisible: false,
       bindWechatUrl: "",
       bindWechatLoading: false,
-      parkList:[],
-      showRoleModal:false
+      parkList: [],
+      showRoleModal: false,
     };
   },
   created() {
@@ -861,10 +816,10 @@ export default {
       }
     });
 
-    companyInfoApi.list({type:"3"}).then(response => {
-      var jsonData = response.data;
-      this.parkList = jsonData.data;
-    });
+    // companyInfoApi.list({ type: "3" }).then((response) => {
+    //   var jsonData = response.data;
+    //   this.parkList = jsonData.data;
+    // });
 
     deviceInfoApi.list().then(function (response) {
       var jsonData = response.data;
@@ -1123,8 +1078,8 @@ export default {
       //   self.xlsLoading = false;
       //   return false;
       // } else {
-        self.xlsLoading = true;
-        //return true;
+      self.xlsLoading = true;
+      //return true;
       //}
     },
     //批量导入-上传成功
@@ -1383,11 +1338,11 @@ export default {
       //选择设备
       let boundDeviceIds = self.boundDeviceIds;
 
-      var idList = this.multipleSelection.map(record => {
+      var idList = this.multipleSelection.map((record) => {
         return record.id;
       });
 
-      boundDeviceIds.forEach(boundDeviceId=>{
+      boundDeviceIds.forEach((boundDeviceId) => {
         var formData = new FormData();
 
         formData.append("persons", idList);
@@ -1395,7 +1350,7 @@ export default {
 
         personDeviceRelationApi
           .batchBindPerson(formData)
-          .then(function(response) {
+          .then(function (response) {
             var jsonData = response.data;
             //self.loading = false;
             self.boundDeviceDisabled = false;
@@ -1405,14 +1360,14 @@ export default {
               self.boundDeviceId = "";
               self.$message({
                 type: "success",
-                message: "绑定成功!"
+                message: "绑定成功!",
               });
             } else {
               self.$message({
                 showClose: true,
                 dangerouslyUseHTMLString: true,
                 message: `有部分人员绑定失败,<a href="${jsonData.message}" target="_blank">点击下载错误信息报表</a>&nbsp;`,
-                duration: 30000
+                duration: 30000,
               });
             }
           });
@@ -1624,7 +1579,7 @@ export default {
     "personDeviceRelation-BoundList": PersonDeviceRelationBoundList,
     "el-select-tree": SelectTree,
     "lifeRecord-list": LifeRecordList,
-    "personPopedom-list":PersonPopedomList
+    "personPopedom-list": PersonPopedomList,
   },
 };
 </script>

src/views/base/personPopedom-detail.vue

@@ -28,7 +28,7 @@
             height="200"
           ></el-select-tree>
         </el-form-item>
-        <el-form-item label="结构" prop="companyStructureId">
+        <el-form-item label="机构" prop="companyStructureId">
           <el-select-tree
             :props="companyStructureProps"
             :options="companyStructureResult"
@@ -36,7 +36,7 @@
             height="200"
           ></el-select-tree>
         </el-form-item>
-        <el-form-item label="角色" prop="personRoleId">
+        <el-form-item label="身份" prop="personRoleId">
           <el-select
             v-model="formModel.personRoleId"
             filterable

src/views/base/personPopedom-list.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="showDialog"
-    title="查看用户角色"
+    title="查看用户机构身份"
     :modal-append-to-body="false"
     append-to-body
     :modal="true"
@@ -47,12 +47,12 @@
         ></el-table-column>
         <el-table-column
           prop="companyStructureName"
-          label="部门"
+          label="机构"
           width="120"
         ></el-table-column>
         <el-table-column
           prop="roleName"
-          label="角色"
+          label="身份"
           width="150"
         ></el-table-column>
         <!-- <el-table-column

src/views/base/personRoleInfo-detail.vue

@@ -20,14 +20,14 @@
         :rules="ruleValidate"
         :label-width="'20%'"
       >
-        <el-form-item label="用户角色名称" prop="personRoleName">
+        <el-form-item label="用户身份名称" prop="personRoleName">
           <el-input
             v-model="formModel.personRoleName"
-            placeholder="请输入用户角色名称"
+            placeholder="请输入用户身份名称"
             style="width: 300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="适用于与场景id" prop="sceneId">
+        <el-form-item label="适用于与场景" prop="sceneId">
           <el-select
             v-model="formModel.sceneId"
             filterable
@@ -78,12 +78,12 @@ export default {
       ruleValidate: {
         id: [{ required: true, message: "不能为空", trigger: "blur" }],
         personRoleName: [
-          { required: true, message: "用户角色名称不能为空", trigger: "blur" },
+          { required: true, message: "用户身份名称不能为空", trigger: "blur" },
         ],
         sceneId: [
           {
             required: true,
-            message: "适用于与场景id不能为空",
+            message: "适用于与场景不能为空",
             trigger: "blur",
           },
         ],

src/views/base/personRoleInfo-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/personRoleInfo">用户角色管理</a>
+        <a href="/personRoleInfo">用户身份管理</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -97,7 +97,7 @@
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column
         prop="personRoleName"
-        label="角色名称"
+        label="身份名称"
         width="150"
       ></el-table-column>
       <el-table-column