门禁问题

accessControlSystem/src/components/common/organTree.vue

@@ -151,7 +151,7 @@ export default {
     padding: rem(20);
     box-sizing: border-box;
     float: left;
-    height: 100%;
+    height: calc(100vh - #{rem(100)});
     overflow: auto;
     &::before {
         clear: both;

accessControlSystem/src/views/alarmInformation/stepPage/communityTree.vue

@@ -66,13 +66,12 @@ export default {
 <style lang="scss" scoped>
 @import '@assets/css/public-style.scss';
 .organ-tree {
-    width: 260px;
+    width: rem(260);
     background: #ffffff;
     padding: rem(20);
     box-sizing: border-box;
     float: left;
-    height: 100%;
-    height: vh(970);
+    height: calc(100vh - #{rem(100)});
     overflow: auto;
     &::before {
         clear: both;

accessControlSystem/src/views/deviceManagement/propertyManagementMachine/index.vue

@@ -195,7 +195,7 @@ export default {
 
 .content-right {
     font-size: 12px;
-    height: calc(100% - 100px);
+    height: calc(100% - #{rem(100)});
     .item-title {
         /deep/ .el-input {
             display: inline-block;

accessControlSystem/src/views/deviceManagement/stepPage/communityTree.vue

@@ -66,20 +66,18 @@ export default {
 <style lang="scss" scoped>
 @import '@assets/css/public-style.scss';
 .organ-tree {
-    width: 260px;
+    width: rem(260);
     background: #ffffff;
     padding: rem(20);
     box-sizing: border-box;
     float: left;
-    height: 100%;
-    height: vh(970);
+    height: calc(100vh - #{rem(100)});
     overflow: auto;
     &::before {
         clear: both;
     }
     .tree-style-box {
         margin-top: 20px;
-        max-height: calc(100vh - 200px);
         overflow: scroll;
     }
     /deep/ .el-icon-caret-right {

accessControlSystem/src/views/sysSet/stepPage/communityTree.vue

@@ -66,13 +66,12 @@ export default {
 <style lang="scss" scoped>
 @import '@assets/css/public-style.scss';
 .organ-tree {
-    width: 260px;
+    width: rem(260);
     background: #ffffff;
     padding: rem(20);
     box-sizing: border-box;
     float: left;
-    height: 100%;
-    height: vh(970);
+    height: calc(100vh - #{rem(100)});
     overflow: auto;
     &::before {
         clear: both;

accessControlSystem/src/views/system/edituser.vue

@@ -22,33 +22,9 @@
                     item.dictValue
                 }}</el-option>
             </el-select>
-            <select-tree
-                :props="defaultProps"
-                slot="companyOrgId"
-                class="new-select-tree"
-                selectTreeTitle='组织机构'
-                width="320"
-                treeWidth="320"
-                :options="organListCompany"
-                @selected="selectedcompanyOrgId"
-                v-model="formData.companyOrgId"
-                :labelModel="formData.companyOrgName"
-            />
-            <select-tree
-                :props="defaultProps"
-                slot="deptOrgId"
-                class="new-select-tree"
-                selectTreeTitle='组织机构'
-                width="320"
-                treeWidth="320"
-                :options="organListdepartment"
-                @selected="selecteddeptOrgId"
-                v-model="formData.deptOrgId"
-            />
             <div class="imgdis-div" slot="companylogo" v-show="formData.photo">
                 <i class="el-icon-delete" @click="delformphoto"></i>
                 <img :src="envConfig.baseImgApi + formData.photo" alt="" width="60" height="60" />
-                <!-- <div class="tips"><img  style="width:12px;height:12px;vertical-align: middle;" src="@assets/img/icon-warning.png"/><span>支持jpg,jpeg,gif,png,bmp格式的图片</span></div> -->
             </div>
             <el-upload
                 v-show="!formData.photo"
@@ -56,7 +32,7 @@
                 ref="uploaduserlogo"
                 class="mini-upload"
                 slot="companylogo"
-                limit="1"
+                :limit="1"
                 action="/user-center/user/addUserPhoto"
                 list-type="picture-card"
                 :on-success="uploadsuccess"
@@ -67,35 +43,27 @@
                 <div slot="file" slot-scope="{ file }">
                     <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
                     <span class="el-upload-list__item-actions">
-                        <!-- <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                            <i class="el-icon-zoom-in"></i>
-                        </span> -->
-                        <!-- <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleDownload(file)">
-                            <i class="el-icon-download"></i>
-                        </span> -->
                         <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
                             <i class="el-icon-delete"></i>
                         </span>
                     </span>
                 </div>
-                <div class="tips"><img  style="width:12px;height:12px;vertical-align: middle;" src="@assets/img/icon-warning.png"/><span>支持jpg,jpeg,gif,png,bmp格式的图片</span></div>
+                <div class="tips">
+                    <img style="width: 12px; height: 12px; vertical-align: middle" src="@assets/img/icon-warning.png" /><span
+                        >支持jpg,jpeg,gif,png,bmp格式的图片</span
+                    >
+                </div>
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
                 <img width="100%" :src="dialogImageUrl" alt="" />
             </el-dialog>
-            
         </zz-form>
     </div>
 </template>
 <script>
 import envConfig from '@/config';
-import SelectTree from '@/components/common/SelectTree.vue';
 export default {
     props: ['params'],
-    components: {
-        SelectTree
-    },
-
     data() {
         return {
             token: {
@@ -112,9 +80,9 @@ export default {
                     display: true
                 }
             ],
-            organListCompany:[],
-            organListdepartment:[],
-            phoneNumber:'',
+            organListCompany: [],
+            organListdepartment: [],
+            phoneNumber: '',
             defaultProps: {
                 value: 'id', // 唯一标识
                 label: 'orgName', // 标签显示
@@ -188,8 +156,6 @@ export default {
                 ]
             ],
             formRules: {
-                companyOrgId: [this.$valid.selectRequired('所属公司')],
-                // deptOrgId: [this.$valid.selectRequired('所属部门')],
                 username: [this.$valid.inputRequired('用户名')],
                 phone: [this.$valid.patternPhone()],
                 enableState: [this.$valid.inputRequired('状态')]
@@ -203,7 +169,6 @@ export default {
             this.formData.photo = '';
             this.$refs.uploaduserlogo.clearFiles();
         },
-        getselectAll() {},
         submit() {
             new Promise((resolve) => {
                 this.$refs.form.validate(resolve);
@@ -216,21 +181,21 @@ export default {
                         loading.close();
                         if (0 == status) {
                             this.$message.success(msg);
-                            if(this.phoneNumber!==this.formData.phone){
+                            if (this.phoneNumber !== this.formData.phone) {
                                 this.$alert('你的手机号已变更，需重新登录', '提示', {
                                     confirmButtonText: '确定',
-                                    showClose:false,
-                                }).then(()=>{
+                                    showClose: false
+                                }).then(() => {
                                     window.open('http://114.135.61.186:21020/sc-login/', '_self');
                                     window.relogin = false;
                                     localStorage.removeItem('UMIS_token');
-                                    sessionStorage.removeItem("tabs");
+                                    sessionStorage.removeItem('tabs');
                                     return;
                                 });
-                            }else{
+                            } else {
                                 this.params.callback && this.params.callback();
                                 this.$emit('close');
-                                if(this.$route.path==='/userInfo'){
+                                if (this.$route.path === '/userInfo') {
                                     this.$router.go(0);
                                 }
                             }
@@ -253,9 +218,7 @@ export default {
         }
     },
     created() {
-        this.getselectAll();
-        // this.getcompanyTree();
-        this.phoneNumber=this.params.data.phone;
+        this.phoneNumber = this.params.data.phone;
         this.formData = this.params.data ? this.params.data : this.formData;
         this.organList = this.params.organList ? this.params.organList : this.organList;
         this.organListCompany = this.params.organListCompany ? this.params.organListCompany : this.organListCompany;
@@ -316,7 +279,7 @@ export default {
     top: 0;
     right: 0;
     font-size: 12px;
-    color: #7D7F87;
+    color: #7d7f87;
     // font-size: 12px;
     // span{
     //     position: absolute;
@@ -327,6 +290,5 @@ export default {
     //     right: 0px;
     // }
 }
-    
 </style>
 

accessControlSystem/src/views/trafficRecord/stepPage/communityTree.vue

@@ -66,13 +66,12 @@ export default {
 <style lang="scss" scoped>
 @import '@assets/css/public-style.scss';
 .organ-tree {
-    width: 260px;
+    width: rem(260);
     background: #ffffff;
     padding: rem(20);
     box-sizing: border-box;
     float: left;
-    height: 100%;
-    height: vh(970);
+    height: calc(100vh - #{rem(100)});
     overflow: auto;
     &::before {
         clear: both;