修复bug

login/src/views/Login/index.vue

@@ -63,7 +63,7 @@
                                     :disabled="!!accountNumberData.time"
                                     @click="getCode"
                                 >
-                                    获取验证码</el-button
+                                    4位校验码</el-button
                                 >
                             </div>
                             <div class="remember">

operationSupport/src/assets/css/main.scss

@@ -512,11 +512,11 @@ a {
     }
 
     /*菜单展开*/
-    
+
     .el-submenu.is-opened > .el-submenu__title .el-submenu__icon-arrow {
-        -webkit-transform: rotateZ(90deg)!important;
-        -ms-transform: rotate(90deg)!important;
-        transform: rotateZ(90deg)!important;
+        -webkit-transform: rotateZ(90deg) !important;
+        -ms-transform: rotate(90deg) !important;
+        transform: rotateZ(90deg) !important;
     }
 }
 
@@ -777,3 +777,6 @@ div.box-40 {
 .QRImg {
     text-align: center;
 }
+.width100 {
+    width: 100% !important;
+}

operationSupport/src/components/common/form.vue

@@ -37,6 +37,7 @@
                             type="date"
                             :editable="row.editable || false"
                             placeholder="选择日期"
+                            :class="row.widt ? 'width100':''"
                             @change="(obj) => (row.change ? row.change(obj) : {})"
                         ></el-date-picker>
                         <!-- input输入框 -->

operationSupport/src/views/assetManagement/housingManagement/saveEdits.vue

@@ -5,7 +5,7 @@
             <div class="formContent">
                 <div class="formContent-item">
                     <el-form-item label="社区名称" prop="communityId">
-                        <el-select v-model="ruleForm.communityId" placeholder="请选择社区名称">
+                        <el-select v-model="ruleForm.communityId" placeholder="请选择社区名称" class="width100">
                             <el-option
                                 v-for="(item, index) in communityList"
                                 :label="item.communityName"
@@ -15,7 +15,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="单元">
-                        <el-select v-model="ruleForm.unitName" placeholder="请选择单元">
+                        <el-select v-model="ruleForm.unitName" placeholder="请选择单元"  class="width100">
                             <el-option
                                 v-for="(item, index) in unitList"
                                 :label="item.unitName"
@@ -24,14 +24,14 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="房屋号" prop="roomNumber">
+                    <el-form-item label="房屋号" prop="roomNumber"  >
                         <el-input v-model="ruleForm.roomNumber"></el-input>
                     </el-form-item>
-                    <el-form-item label="使用面积">
+                    <el-form-item label="使用面积" >
                         <el-input v-model="ruleForm.useArea"></el-input>
                     </el-form-item>
                     <el-form-item label="房屋朝向">
-                        <el-select v-model="ruleForm.orientationOfRoom" placeholder="请选择房屋朝向">
+                        <el-select v-model="ruleForm.orientationOfRoom" placeholder="请选择房屋朝向"  class="width100">
                             <el-option label="东" :value="1"></el-option>
                             <el-option label="南" :value="2"></el-option>
                             <el-option label="西" :value="3"></el-option>
@@ -50,7 +50,7 @@
                 </div>
                 <div class="formContent-item">
                     <el-form-item label="楼栋" prop="buildingId">
-                        <el-select v-model="ruleForm.buildingId" placeholder="请选择楼栋">
+                        <el-select v-model="ruleForm.buildingId" placeholder="请选择楼栋"  class="width100">
                             <el-option
                                 v-for="(item, index) in buildingList"
                                 :label="item.buildingName"
@@ -60,7 +60,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="楼层" prop="floorNumber">
-                        <el-select v-model="ruleForm.floorNumber" placeholder="请选择楼层">
+                        <el-select v-model="ruleForm.floorNumber" placeholder="请选择楼层"  class="width100">
                             <el-option
                                 v-for="(item, index) in floorNumberList"
                                 :label="item.floorNumber"
@@ -70,7 +70,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="房屋类型" prop="buildingType">
-                        <el-select v-model="ruleForm.buildingType" disabled placeholder="请选择房屋类型">
+                        <el-select v-model="ruleForm.buildingType" disabled placeholder="请选择房屋类型"  class="width100">
                             <el-option label="住宅" :value="1"></el-option>
                             <el-option label="商用" :value="2"></el-option>
                         </el-select>
@@ -82,7 +82,7 @@
                         <el-input v-model="ruleForm.publicArea"></el-input>
                     </el-form-item>
                     <el-form-item label="装修性质">
-                        <el-select v-model="ruleForm.decorateProperties" placeholder="请选择装修性质">
+                        <el-select v-model="ruleForm.decorateProperties" placeholder="请选择装修性质"  class="width100">
                             <el-option label="毛胚" :value="1"></el-option>
                             <el-option label="简单装修" :value="2"></el-option>
                             <el-option label="中等装修" :value="3"></el-option>

operationSupport/src/views/buildingManagement/mixins/initList.js

@@ -53,6 +53,13 @@ export default {
     close() {
       this.$emit('clerOwnerStatus');
     },
+    toggleUnithOptions(e) {
+      if (e == 1) {
+        this.unithouseOptions = createContinueData('Number', 10)
+      } else {
+        this.unithouseOptions = createContinueData('Number', 60)
+      }
+    },
     //深拷贝
     deepClone(obj) {
       if (typeof obj !== 'object') return;

operationSupport/src/views/buildingManagement/pageJump/addoredit.vue

@@ -9,7 +9,7 @@
                     <el-scrollbar class="app-list-scroll" style="height: 100%">
                         <div class="form_content_disform">
                             <zz-form :cols="detailCols" :data="formdata" :rules="formrules" labelWidth="98" ref="detailform">
-                                <el-select v-model="formdata.communityId" placeholder="请选择社区名称" slot="communityId">
+                                <el-select v-model="formdata.communityId" placeholder="请选择社区名称" slot="communityId" class="width100">
                                     <el-option
                                         v-for="(item, index) in communityArray"
                                         :label="item.communityName"
@@ -17,12 +17,22 @@
                                         :key="index"
                                     ></el-option>
                                 </el-select>
-                                <el-select v-model="formdata.buildingType" placeholder="请选择楼栋类型" slot="buildingTypeList">
+                                <el-select
+                                    v-model="formdata.buildingType"
+                                    placeholder="请选择楼栋类型"
+                                    slot="buildingTypeList"
+                                    class="width100"
+                                >
                                     <el-option label="高层" :value="1"></el-option>
                                     <el-option label="底层" :value="2"></el-option>
                                 </el-select>
 
-                                <el-select v-model="formdata.buildingPurpose" placeholder="请选择楼栋用途" slot="buildingPurpose">
+                                <el-select
+                                    v-model="formdata.buildingPurpose"
+                                    placeholder="请选择楼栋用途"
+                                    slot="buildingPurpose"
+                                    class="width100"
+                                >
                                     <el-option
                                         v-for="(item, index) in buildingPurposeType"
                                         :label="item.label"
@@ -31,7 +41,12 @@
                                     ></el-option>
                                 </el-select>
 
-                                <el-select v-model="formdata.buildingStructure" placeholder="请选择楼栋用途" slot="buildingStructure">
+                                <el-select
+                                    v-model="formdata.buildingStructure"
+                                    placeholder="请选择楼栋用途"
+                                    slot="buildingStructure"
+                                    class="width100"
+                                >
                                     <el-option
                                         v-for="(item, index) in buildingStructureType"
                                         :label="item.label"
@@ -143,7 +158,12 @@
                                             </div>
                                             <div class="last_level" v-if="isAdd">
                                                 <label class="label_text">房屋类型</label>
-                                                <el-select class="w120" v-model="formdata.houseType" placeholder="请选择每层户数">
+                                                <el-select
+                                                    class="w120"
+                                                    v-model="formdata.houseType"
+                                                    @change="toggleUnithOptions"
+                                                    placeholder="请选择每层户数"
+                                                >
                                                     <el-option label="住宅" :value="1"></el-option>
                                                     <el-option label="商业" :value="2"></el-option>
                                                 </el-select>
@@ -438,12 +458,14 @@ export default {
                     {
                         label: '建成日期',
                         prop: 'builtDate',
-                        date: 'true'
+                        date: 'true',
+                        widt: true
                     },
                     {
                         label: '验收日期',
                         prop: 'acceptanceDate',
-                        date: 'true'
+                        date: 'true',
+                        widt: true
                     },
                     {
                         label: '建筑面积',

operationSupport/src/views/communityManagement/pageJump/AddOrEdit.vue

@@ -11,6 +11,7 @@
                     <el-cascader
                         v-model="regionId"
                         :options="locationList"
+                        class="width100"
                         placeholder="请选择区域"
                         :props="{ label: 'name', value: 'code' }"
                         @change="productChange($event)"

operationSupport/src/views/deviceManagement/index.vue

@@ -73,7 +73,7 @@
         <el-dialog title="下载二维码" :visible.sync="centerDialogVisible" width="400px">
             <div class="QRImg">
                 <img :src="QRImg" alt="门禁设备二维码" />
-                <div>门禁设备二维码</div>
+                <div>{{ DeviceName }} - {{ deviceNo }}</div>
             </div>
             <span slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="downImg">下载</el-button>
@@ -269,7 +269,7 @@ export default {
         },
         downImg() {
             let a = document.createElement('a');
-            a.download = `设备编号${this.deviceNo}.png`;
+            a.download = `${this.DeviceName}${this.deviceNo}.png`;
             a.href = this.QRImg;
             document.body.appendChild(a);
             a.click();

operationSupport/src/views/deviceManagement/indexFacilities.vue

@@ -68,7 +68,7 @@
         <el-dialog title="下载二维码" :visible.sync="centerDialogVisible" width="400px">
             <div class="QRImg">
                 <img :src="QRImg" alt="设施二维码" />
-                <div>设施二维码</div>
+                <div>{{ facilityName }} - {{ facilityNo }}</div>
             </div>
             <span slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="downImg">下载</el-button>
@@ -165,7 +165,8 @@ export default {
             TypeOptions: [],
             centerDialogVisible: false,
             QRImg: '',
-            facilityNo: ''
+            facilityNo: '',
+            facilityName:"",
         };
     },
     created() {
@@ -232,6 +233,7 @@ export default {
         },
         lookImg(row) {
             let _this = this;
+            this.facilityName = row.name;
             this.facilityNo = row.facilityNo;
             this.getBinary('/sc-community/device/generateQRCodeImage', { id: row.id, type: 'DEVICE' }, function (data) {
                 _this.QRImg = window.URL.createObjectURL(data);
@@ -240,7 +242,7 @@ export default {
         },
         downImg() {
             let a = document.createElement('a');
-            a.download = `设施编号${this.facilityNo}.png`;
+            a.download = `${this.facilityName}${this.facilityNo}.png`;
             a.href = this.QRImg;
             document.body.appendChild(a);
             a.click();

operationSupport/src/views/ownerManagement/stepPage/add.vue

@@ -73,14 +73,14 @@
                     <!-- 添加编辑 -->
                     <template v-else>
                         <template slot="idType">
-                            <el-select v-model="formData.idType" clearable>
+                            <el-select v-model="formData.idType" clearable class="width100">
                                 <el-option v-for="(item, index) in idTypeArray" :key="index" :label="item.label" :value="item.status">{{
                                     item.label
                                 }}</el-option>
                             </el-select>
                         </template>
                         <template slot="nationality">
-                            <el-select v-model="formData.nationality" clearable>
+                            <el-select v-model="formData.nationality" clearable class="width100">
                                 <el-option
                                     v-for="(item, index) in nationalityArray"
                                     :key="index"
@@ -92,14 +92,14 @@
                         </template>
 
                         <template slot="nativePlace">
-                            <el-select v-model="formData.nativePlace" clearable>
+                            <el-select v-model="formData.nativePlace" clearable class="width100">
                                 <el-option v-for="(item, index) in nativePlaceArray" :key="index" :label="item.name" :value="item.code">{{
                                     item.name
                                 }}</el-option>
                             </el-select>
                         </template>
                         <template slot="nation">
-                            <el-select v-model="formData.nation" clearable>
+                            <el-select v-model="formData.nation" clearable class="width100">
                                 <el-option v-for="(item, index) in nationArray" :key="index" :label="item.name" :value="item.code">{{
                                     item.name
                                 }}</el-option>
@@ -108,6 +108,7 @@
 
                         <template slot="birthDate">
                             <el-date-picker
+                                class="width100"
                                 v-model="formData.birthDate"
                                 value-format="yyyy-MM-dd HH:mm:ss"
                                 type="date"
@@ -118,6 +119,7 @@
                         </template>
                         <template slot="effectiveDate">
                             <el-date-picker
+                                class="width100"
                                 v-model="effectiveDate"
                                 value-format="yyyy-MM-dd HH:mm:ss"
                                 type="daterange"

operationSupport/src/views/payService/ChargebackRecord.vue

@@ -11,6 +11,12 @@
                 @change="effectiveDateToggle"
             ></el-date-picker>
             <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
+
+            <div class="search-icon">
+                <el-tooltip class="item" effect="light" placement="bottom" content="返回">
+                    <i class="zoniot_font zoniot-icon-fanhui" @click="close()"></i>
+                </el-tooltip>
+            </div>
         </div>
         <div class="table-top">
             <div class="name">
@@ -99,6 +105,17 @@ export default {
     },
     mounted() {},
     methods: {
+        close() {
+            let activeRout = this.$route;
+            let tagsList = this.$store.getters['getTagsList'];
+            tagsList.forEach((item, index) => {
+                if (item.title == activeRout.meta.title || item.path == activeRout.path) {
+                    tagsList.splice(index, 1);
+                    history.go(-1);
+                    return true;
+                }
+            });
+        },
         getSun() {
             this.$http
                 .post('/sc-charge/payment/record/sum/amount', this.publicData)

operationSupport/src/views/payService/RechargeRecord.vue

@@ -25,6 +25,12 @@
                 @change="effectiveDateToggle"
             ></el-date-picker>
             <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
+
+            <div class="search-icon">
+                <el-tooltip class="item" effect="light" placement="bottom" content="返回">
+                    <i class="zoniot_font zoniot-icon-fanhui" @click="close()"></i>
+                </el-tooltip>
+            </div>
         </div>
         <div class="table-top">
             <div class="name">
@@ -130,6 +136,17 @@ export default {
     },
     mounted() {},
     methods: {
+        close() {
+            let activeRout = this.$route;
+            let tagsList = this.$store.getters['getTagsList'];
+            tagsList.forEach((item, index) => {
+                if (item.title == activeRout.meta.title || item.path == activeRout.path) {
+                    tagsList.splice(index, 1);
+                    history.go(-1);
+                    return true;
+                }
+            });
+        },
         getSun() {
             this.$http
                 .post('/sc-charge/payment/record/sum/amount', this.publicData)

operationSupport/src/views/payService/propertyFee/stepPage/single.vue

@@ -16,6 +16,9 @@
                         <template v-else>
                             {{ thisItem[item.prop] || '--' }}
                         </template>
+                        <template v-if="item.slot === 'payEndTime'">
+                            <div style="white-space: nowrap">{{ thisItem.payBeginTime }} - {{ thisItem.payEndTime }}</div>
+                        </template>
                     </el-form-item>
                 </el-col>
             </template>
@@ -92,7 +95,8 @@ export default {
                 },
                 {
                     label: '账单收费日期:',
-                    prop: 'payEndTime'
+                    prop: 'payEndTime',
+                    slot: 'payEndTime'
                 }
             ],
             thisItem: {},

userCenter/src/assets/css/main.scss

@@ -730,3 +730,7 @@ div.box-40 {
         }
     }
 }
+
+.width100 {
+    width: 100% !important;
+}

userCenter/src/components/common/Sidebar.vue

@@ -18,7 +18,8 @@
                 router
                 :style="collapse ? 'width:84px' : 'width:220px'"
             >
-                <template v-for="item in thisMenuList">
+                <menu-tree :menuList="thisMenuList" :collapse="collapse" :openArray="openArray"></menu-tree>
+                <!-- <template v-for="item in thisMenuList">
                     <template v-if="item.children">
                         <el-submenu :index="item.linkPath" :key="item.linkPath">
                             <template slot="title">
@@ -52,14 +53,13 @@
                             </template>
                         </el-submenu>
                     </template>
-                    <!-- 一级菜单 -->
                     <template v-else>
                         <el-menu-item :index="item.linkPath" :key="item.linkPath">
                             <img :src="envConfig.baseImgApi + item.menuImage" style="width: 14px; height: 14px; margin-right: 10px" />
                             <span slot="title">{{ item.name }}</span>
                         </el-menu-item>
                     </template>
-                </template>
+                </template> -->
             </el-menu>
         </div>
         <div class="menu-footer" :class="theme == 'dark' ? 'dark' : 'light'" :style="collapse ? 'width:84px' : 'width:220px'">
@@ -77,6 +77,7 @@
 
 <script>
 import envConfig from '@/config';
+import MenuTree from './MenuTree.vue';
 import { mapState, mapGetters, mapMutations, mapActions } from 'vuex';
 const darkTheme = new Set(['/dispatchCenter', '/waterSupplyMap', '/operation/video', '/operation/pipe-network']);
 const collapsePages = new Set(['/viewDetail', '/installplanView']);
@@ -86,14 +87,19 @@ export default {
             envConfig: envConfig,
             siderMenuList: [],
             btnCollpaseright: require('@assets/img/btn_collpaseright.png'),
-            btnCollpaseleft: require('@assets/img/btn_collpaseleft.png')
+            btnCollpaseleft: require('@assets/img/btn_collpaseleft.png'),
+            openList: []
         };
     },
+    components: {
+        MenuTree
+    },
     computed: {
         thisMenuList() {
             return this.$store.getters['getThisMenuList'];
         },
         onRoutes() {
+            return this.$route.path;
             if (this.$route.path) {
                 let theme = darkTheme.has(this.$route.path) ? 'dark' : 'light';
                 this.$store.commit('setTheme', darkTheme.has(this.$route.path) ? 'dark' : 'light');
@@ -107,6 +113,9 @@ export default {
         },
         theme() {
             return this.$store.getters.getTheme;
+        },
+        openArray() {
+            return this.openList;
         }
     },
 
@@ -114,14 +123,39 @@ export default {
         // 侧边栏折叠
         collapseChage() {
             this.$store.dispatch('collapse', !this.collapse);
+        },
+        thisfindMen(arr, indexPath) {
+            
+            let status = [];
+            arr.map((v) => {
+                if (v.children) {
+                    v.children.map((s) => {
+                        if ('/' + s.linkPath === indexPath) {
+                            status.push(v.linkPath, s.linkPath);
+                        }
+                    });
+                } else {
+                    if ('/' + v.linkPath === indexPath) {
+                        status.push(v.linkPath);
+                    }
+                }
+            });
+            return status;
+        }
+    },
+    watch: {
+        $route(newValue, oldValue) {
+            this.openList = this.thisfindMen(this.thisMenuList, newValue.path);
         }
     },
-    created() {}
+    created() {
+        this.openList = this.thisfindMen(this.thisMenuList, this.$route.path);
+    }
 };
 </script>
 
+
 <style  lang="scss">
-@import '@assets/css/public-style.scss';
 .sidebar {
     width: 220px;
     display: flex;
@@ -129,7 +163,6 @@ export default {
     background: #171f32;
     border-radius: 0px 30px 30px 0px;
     z-index: 2;
-    // background:  #222B41 url('../../assets/img/bg_img.png') no-repeat bottom right;
     .logo {
         width: 100%;
         height: 110px;
@@ -171,16 +204,13 @@ export default {
         overflow: auto;
         flex: 1;
         scrollbar-width: 0;
-        // background: #171F32;
     }
     .menu-footer.dark {
-        // position: absolute;
         bottom: 0;
         left: 0;
         width: 220px;
         height: 30px;
-        // border-radius: 0px 30px 30px 0px;
-        // background-color: #f4f7f9;
+
         div {
             width: 100%;
             height: 100%;
@@ -192,27 +222,12 @@ export default {
             background-color: #070f22 !important;
             z-index: 1;
         }
-        //     div{
-        //         width: 100%;
-        //         height: 100%;
-        //         border-radius: 0px 30px 30px 0px;
-        //         background: #171F32;
-        //         border: none;
-        //     }
-        // }
+
         &.light {
             background-color: #f4f7f9 !important;
             z-index: 1;
         }
     }
-    // .menu-footer.light{
-    //     bottom: 0;
-    //     left: 0;
-    //     width: 220px;
-    //     height: 30px;
-    //     background-color: #f4f7f9 !important;
-    //     z-index: 1;
-    // }
     .footer {
         position: absolute;
         bottom: 30px;
@@ -226,20 +241,13 @@ export default {
             height: 24px;
             cursor: pointer;
         }
-        .expandhover:hover {
-            background: url('../../assets/img/btn_collpaseright.png') no-repeat;
-            // background-color: rgba(39, 135, 241,0.4);
-            background-size: 100% 100%;
-        }
-        .packuphover:hover {
-            background: url('../../assets/img/btn_collpaseleft.png') no-repeat;
-            // background-color: rgba(39, 135, 241,0.4);
-            background-size: 100% 100%;
-        }
     }
 }
+.el-menu {
+    border: none;
+}
 
-.sidebar-el-menu > .el-submenu.is-opened > .el-submenu__title {
+.sidebar-el-menu .el-submenu.is-opened > .el-submenu__title {
     //设置一级菜单点开后的状态
     color: #fff !important;
     background: rgb(44, 53, 74);
@@ -248,28 +256,27 @@ export default {
 .sidebar-el-menu > .el-submenu.is-opened > .el-menu--inline > .el-submenu.is-opened > .el-submenu__title {
     color: #fff !important;
 }
-.sidebar-el-menu > .el-submenu.is-opened.is-active > .el-submenu__title {
+.sidebar-el-menu > div > .el-submenu.is-opened.is-active > .el-submenu__title {
     background: #2c354a !important;
     border-radius: 32px 0px 0px 32px;
-    color: $mainTextColor !important;
-
-    border-right: 2px solid $mainTextColor;
+    color: rgb(39, 135, 241) !important;
+    border-right: 2px solid #2787f1;
     .el-submenu__icon-arrow::before {
-        color: $mainTextColor;
+        color: rgb(39, 135, 241);
     }
 }
 .el-menu-item.is-active {
-    //   color:rgb(39, 135, 241);
-    color: $mainTextColor;
+    color: rgb(39, 135, 241);
 }
-// .el-submenu.is-active > div > span {
-//     color: rgb(39, 135, 241);
-// }
+.el-submenu.is-active > div > span {
+    color: rgb(39, 135, 241);
+}
+
 .sidebar .logo.shrink {
     display: flex;
     font-size: 16px;
     justify-content: center;
-    color: $mainTextColor;
+    // color: $mainTextColor;
     border-bottom: 2px solid #2a335c;
     margin-bottom: 20px;
     align-items: flex-start;
@@ -283,19 +290,35 @@ export default {
     }
 }
 
+// .sidebar .logo.shrink {
+//     display: flex;
+//     justify-content: center;
+//     color: #2787f1;
+//     border-bottom: 2px solid #2a335c;
+//     margin-bottom: 20px;
+//     align-items: flex-start;
+//     .text {
+//         width: 48px;
+//         height: 48px;
+//         background: rgba(255, 255, 255, 0.1);
+//         border-radius: 4px;
+//         border: 1px solid rgba(255, 255, 255, 0.4);
+//         text-align: center;
+//     }
+// }
+
 .el-menu--collapse > .is-active {
-    color: $mainTextColor;
+    color: #2787f1;
+
     background: #2c354a;
     border-radius: 32px 0px 0px 32px;
-    //   margin:0;
 }
+
 .el-menu--collapse > .is-active > .el-submenu__title {
     background: transparent !important;
 }
 .el-submenu > .el-submenu__title:hover {
     //设置一级菜单的鼠标经过时候的样式
-    //   background: linear-gradient(to right, rgba(39,135,241,0.2) 20%, black 100%);
-    //   border-radius: 0;
     background: rgb(44, 53, 74) !important;
     border-radius: 32px 0px 0px 32px !important;
 }

userCenter/src/views/system/menus/index.vue

@@ -121,6 +121,21 @@ export default {
                 isAdmin: 1, //超级管理员菜单
                 isTenant: 1 //租户菜单
             },
+            initRightData: {
+                id: '',
+                parentMenuId: '', //上级菜单
+                name: '', //名称
+                englishName: '', //英文名称
+                seq: '', //排序
+                linkPath: '', //链接
+                menuImage: '', //图标
+                menuDynamicImage: '', //动态图标
+                permissionFlag: '', //功能码
+                showState: 1, //状态
+                remark: '', //备注
+                isAdmin: 1, //超级管理员菜单
+                isTenant: 1 //租户菜单
+            },
             familyArr: [],
             familyOptions: [{ id: 0, name: '顶级菜单' }],
             isEdit: false,
@@ -161,24 +176,24 @@ export default {
                     this.isEdit = 'add';
                     this.familyArr = [{ name: '添加子菜单模块' }];
                     this.familyOptions = [{ id: data.id, name: data.name }];
-                    const params = JSON.parse(
-                        JSON.stringify({
-                            id: '',
-                            parentMenuId: data.id, //上级菜单
-                            name: '', //名称
-                            englishName: '', //英文名称
-                            seq: '', //排序
-                            linkPath: '', //链接
-                            menuImage: '', //图标
-                            menuDynamicImage: '', //动态图标
-                            permissionFlag: '', //功能码
-                            showState: 1, //状态
-                            remark: '', //备注
-                            isAdmin: 0, //超级管理员菜单
-                            isTenant: 1 //租户菜单
-                        })
-                    );
-                    this.rightData = params;
+                    // const params = JSON.parse(
+                    //     JSON.stringify({
+                    //         id: '',
+                    //         parentMenuId: data.id, //上级菜单
+                    //         name: '', //名称
+                    //         englishName: '', //英文名称
+                    //         seq: '', //排序
+                    //         linkPath: '', //链接
+                    //         menuImage: '', //图标
+                    //         menuDynamicImage: '', //动态图标
+                    //         permissionFlag: '', //功能码
+                    //         showState: 1, //状态
+                    //         remark: '', //备注
+                    //         isAdmin: 0, //超级管理员菜单
+                    //         isTenant: 1 //租户菜单
+                    //     })
+                    // );
+                    this.rightData = JSON.parse(JSON.stringify(this.initRightData));
                     this.$nextTick(() => {
                         this.$refs.tree.setCurrentKey(data.id);
                     });
@@ -253,6 +268,7 @@ export default {
                 isTenant = 1 //租户菜单
             } = params;
             this.setFamily(id);
+            this.rightData = JSON.parse(JSON.stringify(this.initRightData));
             Object.assign(this.rightData, {
                 id,
                 parentMenuId, //上级菜单

userCenter/src/views/system/menus/popups/EditForm.vue

@@ -95,7 +95,7 @@
                 </div>
             </zz-form>
             <zz-form :cols="formTwoCols" :data="formData" labelWidth="110" ref="form1" :disabled="!isEdit">
-                <el-select slot="showState" v-model="formData.showState" clearable>
+                <el-select slot="showState" v-model="formData.showState" clearable class="width100">
                     <el-option :value="0" label="隐藏"></el-option>
                     <el-option :value="1" label="显示"></el-option>
                 </el-select>
@@ -108,8 +108,7 @@
                     <el-radio v-model="formData.isTenant" :label="0">否</el-radio>
                 </template>
                 <div slot="remark" style="position: relative">
-                    <el-input type="textarea" v-model="formData.remark" maxlength="50" placeholder="请输入备注"> </el-input>
-                    <span style="position: absolute; bottom: 0; right: 10px" v-if="formData.remark">{{ formData.remark.length }}/50</span>
+                    <el-input type="textarea" v-model="formData.remark" maxlength="50" placeholder="请输入备注" show-word-limit> </el-input>
                 </div>
             </zz-form>
         </div>

userCenter/src/views/system/organs/popups/EditForm.vue

@@ -11,6 +11,7 @@
                 :disabled="!isEdit"
             >
                 <el-select
+                    class="width100"
                     @change="selectChanged"
                     slot="orgType"
                     v-model="formData.orgType"
@@ -22,6 +23,7 @@
                 </el-select>
 
                 <el-input
+                    class="width100"
                     v-if="isEdit !== 'edit' && isEdit !== 'add' && formData.parentOrgId == ''"
                     slot="parentOrgId"
                     type="text"
@@ -42,32 +44,24 @@
 
                 <el-cascader
                     slot="orgAreaId"
+                    class="width100"
                     v-model="formData.orgAreaId"
                     :options="areaList"
                     placeholder="请选择区域"
                     :props="{ label: 'name', value: 'code' }"
                 ></el-cascader>
-                <el-select slot="orgState" v-model="formData.orgState" clearable>
+                <el-select slot="orgState" v-model="formData.orgState" clearable class="width100">
                     <el-option :value="0" label="停用"></el-option>
                     <el-option :value="1" label="启用"></el-option>
                 </el-select>
-                <el-select slot="orgLeaderSex" v-model="formData.orgLeaderSex" placeholder="请选择性别">
-                    <el-option value="0" label="女"></el-option>
-                    <el-option value="1" label="男"></el-option>
-                </el-select>
-                <div slot="remark" style="position: relative">
-                    <el-input type="textarea" v-model="formData.remark" maxlength="50" placeholder="请输入备注"> </el-input>
-                    <span style="position: absolute; bottom: 0; right: 10px" v-if="formData.remark">{{ formData.remark.length }}/50</span>
-                </div>
             </zz-form>
             <zz-form :cols="formTwoCols" :data="formData" :errors="formErrors" ref="form1" labelWidth="100" :disabled="!isEdit">
-                <el-select slot="orgLeaderSex" v-model="formData.orgLeaderSex" placeholder="请选择性别">
+                <el-select slot="orgLeaderSex" v-model="formData.orgLeaderSex" placeholder="请选择性别" class="width100">
                     <el-option value="0" label="女"></el-option>
                     <el-option value="1" label="男"></el-option>
                 </el-select>
                 <div slot="remark" style="position: relative">
-                    <el-input type="textarea" v-model="formData.remark" maxlength="50" placeholder="请输入备注"> </el-input>
-                    <span style="position: absolute; bottom: 0; right: 10px" v-if="formData.remark">{{ formData.remark.length }}/50</span>
+                    <el-input type="textarea" v-model="formData.remark" maxlength="50" placeholder="请输入备注" show-word-limit> </el-input>
                 </div>
             </zz-form>
         </div>
@@ -78,11 +72,7 @@
     </div>
 </template>
 <script>
-// import SelectTree from '@/components/common/SelectTree.vue';
 export default {
-    components: {
-        // SelectTree
-    },
     props: ['formData', 'isEdit'],
     data() {
         return {
@@ -338,7 +328,7 @@ export default {
     }
 }
 .buttons {
-    text-align: center;
+    text-align: right;
 }
 .new-select-tree {
     vertical-align: top;

userCenter/src/views/system/roles/index.vue

@@ -204,6 +204,8 @@ export default {
                     notip: true,
                     width: '600px',
                     height: '400px',
+                    showCancelButton:true,
+                    showConfirmButton:true,
                     props: {
                         data: JSON.parse(JSON.stringify(row)),
                         callback: resolve

userCenter/src/views/system/users/popups/AddOrEditUserInfo.vue

@@ -35,8 +35,6 @@
                 slot="companyOrgId"
                 class="new-select-tree"
                 selectTreeTitle="组织机构"
-                width="320"
-                treeWidth="320"
                 :options="organListCompany"
                 @selected="selectedcompanyOrgId"
                 v-model="formData.companyOrgId"
@@ -47,8 +45,6 @@
                 slot="deptOrgId"
                 class="new-select-tree"
                 selectTreeTitle="组织机构"
-                width="320"
-                treeWidth="320"
                 :options="organListdepartment"
                 @selected="selecteddeptOrgId"
                 v-model="formData.deptOrgId"

userCenter/src/views/system/users/popups/edituser.vue

@@ -29,8 +29,6 @@
                 slot="companyOrgId"
                 class="new-select-tree"
                 selectTreeTitle="组织机构"
-                width="320"
-                treeWidth="320"
                 :options="organListCompany"
                 @selected="selectedcompanyOrgId"
                 v-model="formData.companyOrgId"
@@ -41,8 +39,6 @@
                 slot="deptOrgId"
                 class="new-select-tree"
                 selectTreeTitle="组织机构"
-                width="320"
-                treeWidth="320"
                 :options="organListdepartment"
                 @selected="selecteddeptOrgId"
                 v-model="formData.deptOrgId"