修复bug

operationSupport/src/assets/css/main.scss

@@ -455,7 +455,7 @@ a {
     .el-date-editor {
         width: 400px;
     }
-    .el-range-separator {
+    .el-date-editor .el-range-separator {
         padding: 0;
     }
     &:after {

operationSupport/src/components/common/buildingTree.vue

@@ -22,6 +22,7 @@
 <script>
 export default {
     name: 'buildingTree',
+    props:['buildingType'],
     data() {
         return {
             filterText: '',
@@ -39,7 +40,7 @@ export default {
     },
     methods: {
         getOrgTreeList() {
-            this.$http.get('/sc-community/assets/tree/community/find').then(({ status, data, msg }) => {
+            this.$http.get('/sc-community/assets/tree/community/find',{buildingType:this.buildingType}).then(({ status, data, msg }) => {
                 if (status === 0 && data) {
                     this.organList = data;
                     this.$nextTick().then(() => {

operationSupport/src/store/store.js

@@ -35,7 +35,7 @@ const store = new Vuex.Store({
     theme: 'light',//控制界面的颜色,
     // 查询的点的坐标
     searchPointInfo: {},
-    //所有小区下拉
+    //所有社区下拉
     areaSelect: [],
     //所有民族
     nationArray: [],

operationSupport/src/views/alarmManagement/baseData.js

@@ -8,7 +8,7 @@
 
 
 /* 系统告警查询参数和待处理、已处理查询|导出API */
-// communityId: '', // 小区ID
+// communityId: '', // 社区ID
 // handleUserName: '', // 处理人
 // handleResultName: '', // 处理结果
 // location: '', // 位置
@@ -78,7 +78,7 @@ export const alarmMeasuringDatasFormat = (val) => {
 export const sysColumnConfig = {
   cols: [
     {
-      label: '所属小区',
+      label: '所属社区',
       prop: 'communityName'
     },
     {

operationSupport/src/views/alarmManagement/details.vue

@@ -94,7 +94,7 @@ export default {
                     }
                 },
                 {
-                    label: '所属小区',
+                    label: '所属社区',
                     prop: 'communityName'
                 },
                 {

operationSupport/src/views/alarmManagement/popups/addoreditalarm.vue

@@ -312,7 +312,7 @@ export default {
             measureOptions: [],
             dictList: [],
             rules: {
-                communityId:this.$valid.selectRequired('小区'),
+                communityId:this.$valid.selectRequired('社区'),
                 productId: this.$valid.selectRequired('产品'),
                 name: [this.$valid.inputRequired('告警名称'), this.$valid.lengthRange(0, 30)],
                 // measuringCode: this.$valid.selectRequired('测点'),

operationSupport/src/views/alarmManagement/popups/util.js

@@ -133,7 +133,7 @@ export const bodyContent = {
 }
 export const addnewCols = [[
   {
-    label: '小区',
+    label: '社区',
     prop: 'communityId',
     slot: 'communityId'
   },
@@ -159,7 +159,7 @@ export const addnewCols = [[
 
 export const addCols = [[
   {
-    label: '小区',
+    label: '社区',
     prop: 'communityId',
     slot: 'communityId'
   },

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

@@ -4,7 +4,7 @@
             <h1>房屋号：{{ detailsData.roomNumber }}<span class="titleType">住户</span></h1>
             <el-button class="right" type="primary" @click="close()">返回</el-button>
             <div class="text">
-                <span>所属小区：{{ detailsData.communityId }}</span> <span>楼栋：{{ detailsData.communityName }}</span>
+                <span>所属社区：{{ detailsData.communityId }}</span> <span>楼栋：{{ detailsData.communityName }}</span>
             </div>
         </div>
         <div class="content">
@@ -83,7 +83,7 @@ export default {
             houseTable: {
                 left: [
                     {
-                        lable: '所属小区',
+                        lable: '所属社区',
                         prop: 'communityId'
                     },
                     {

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

@@ -268,6 +268,7 @@ export default {
         };
 
         this.communityNameList();
+        this.mixins_search('search');
     }
 };
 </script>

operationSupport/src/views/assetManagement/shopManagement/details.vue

@@ -4,7 +4,7 @@
             <h1>房屋号：{{ detailsData.roomNumber }}<span class="titleType">商铺</span></h1>
             <el-button class="right" type="primary" @click="close()">返回</el-button>
             <div class="text">
-                <span>所属小区：{{ detailsData.communityId }}</span> <span>楼栋：{{ detailsData.communityName }}</span>
+                <span>所属社区：{{ detailsData.communityId }}</span> <span>楼栋：{{ detailsData.communityName }}</span>
             </div>
         </div>
         <div class="content">
@@ -66,7 +66,7 @@ export default {
             houseTable: {
                 left: [
                     {
-                        lable: '所属小区',
+                        lable: '所属社区',
                         prop: 'communityId'
                     },
                     {
@@ -213,7 +213,7 @@ export default {
             parkingLotTable: {
                 left: [
                     {
-                        lable: '所属小区',
+                        lable: '所属社区',
                         prop: 'communityName'
                     },
                     {

operationSupport/src/views/assetManagement/shopManagement/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="content">
-        <building-tree @buildingInformation="buildingInformation" v-if="!showaddDialog"></building-tree>
+        <building-tree @buildingInformation="buildingInformation" :buildingType="2" v-if="!showaddDialog"></building-tree>
         <div class="content-right" v-if="!showaddDialog">
             <div class="search">
                 <el-input clearable placeholder="房屋号" class="search-input" v-trim v-model="mixins_query.roomNumber"></el-input>
@@ -268,6 +268,7 @@ export default {
         };
 
         this.communityNameList();
+        this.mixins_search('search');
     }
 };
 </script>

operationSupport/src/views/buildingManagement/index.vue

@@ -109,7 +109,7 @@ export default {
                 },
                 {
                     label: '使用面积',
-                    prop: 'useAre'
+                    prop: 'useArea'
                 },
                 {
                     label: '操作',

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

@@ -64,7 +64,7 @@
                     <div class="head_fr">
                         <div class="head_content head_add">
                             <div class="checkbox_style">
-                                <el-checkbox @change="checkedUnit" v-model="initialUnitList.checkedUnit"></el-checkbox>
+                                <el-checkbox :disabled="!isAdd" @change="checkedUnit" v-model="initialUnitList.checkedUnit"></el-checkbox>
                             </div>
                             <div class="form_content">
                                 <zz-form
@@ -141,7 +141,7 @@
                                                     </el-option>
                                                 </el-select>
                                             </div>
-                                            <div class="last_level">
+                                            <div class="last_level" v-if="isAdd">
                                                 <label class="label_text">房屋类型</label>
                                                 <el-select class="w120" v-model="formdata.houseType" placeholder="请选择每层户数">
                                                     <el-option label="住宅" :value="1"></el-option>
@@ -576,7 +576,7 @@ export default {
         resetForm() {
             this.formdata = {};
             this.formdata = this.copyformdata;
-            this.doorData = [];
+            // this.doorData = [];
             this.$refs.detailform.validateField('communityId');
         },
 
@@ -667,8 +667,6 @@ export default {
                 this.__confirm(txt, '提交')
                     .then((v) => {
                         this.formdata.buildingUnitList = this.doorData;
-
-                        console.log(this.formdata);
                         let url = '/sc-community/assets/building/add';
                         if (!!this.params.id) {
                             url = '/sc-community/assets/building/update';

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

@@ -94,8 +94,7 @@
                     <el-input v-model="ruleForm.telephone"></el-input>
                 </el-form-item>
                 <el-form-item label="备注信息">
-                    <el-input type="textarea" :rows="4" v-model="ruleForm.remarks" maxlength="300"> </el-input>
-                    <span style="position: absolute; bottom: 0; right: 10px">{{ ruleForm.remarks.length }}/300</span>
+                    <el-input type="textarea" :rows="4" v-model="ruleForm.remarks" maxlength="300" show-word-limit> </el-input>
                 </el-form-item>
             </div>
         </el-form>

operationSupport/src/views/deviceManagement/index.vue

@@ -8,7 +8,6 @@
                 }}</el-option>
             </el-select>
             <el-cascader
-               
                 v-model="productIds"
                 :options="productOptions"
                 :props="defaultProps"
@@ -18,9 +17,25 @@
             >
             </el-cascader>
             <el-button type="primary" placeholder="状态" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
+
             <div class="search-icon">
-                <i class="iconfont" @click="deluserbyidFn()" v-txt-tip data-txt="删除">&#xe63b;</i>
-                <i class="iconfont" @click="addOrEdit('add')" v-left-txt-tip data-txt="新增">&#xe641;</i>
+                <el-tooltip class="item" effect="light" placement="bottom" content="删除">
+                    <i class="iconfont" @click="deluserbyidFn()">&#xe63b;</i>
+                </el-tooltip>
+                <el-dropdown type="primary" @command="addCommand">
+                    <span class="iconfont">&#xe641;</span>
+                    <el-dropdown-menu slot="dropdown" hide-on-click="false" class="device-search-dropdown">
+                        <el-dropdown-item command="add">单个添加</el-dropdown-item>
+                        <el-dropdown-item command="batchAdd">
+                            <div class="upload_div">
+                                <xk-upload class="upload_class" @callback="mixins_search" :params="{ importType: 'DEVICE' }">
+                                    <span class="upload_text" slot="content">批量添加</span>
+                                </xk-upload>
+                            </div>
+                        </el-dropdown-item>
+                        <el-dropdown-item command="template">下载模板</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
             </div>
         </div>
         <div class="roles-wrap">
@@ -34,7 +49,7 @@
                 @selection-change="selectionChange"
             >
                 <template slot="deviceQrcode">
-                    <i class="zoniot_font zoniot-icon-erweimachakan" style="cursor: inherit;"></i>
+                    <i class="zoniot_font zoniot-icon-erweimachakan" style="cursor: inherit"></i>
                 </template>
                 <template slot-scope="scope" slot="opt">
                     <div class="opt">
@@ -100,7 +115,7 @@ export default {
             ],
             cols: [
                 {
-                    label: '所属小区',
+                    label: '所属社区',
                     prop: 'communityId',
                     format(val) {
                         let va = '';
@@ -229,15 +244,17 @@ export default {
         Scrap(id) {
             this.$msgBox(`确认提示`, '设备报废后将无法正常接收数据，请问是否继续?')
                 .then(() => {
-                    this.$http.post('/sc-community/device/deviceScrapInterface', { id: id, deviceStatus: 5 }).then(({ status, data, msg }) => {
-                        if (0 === status) {
-                            this.$message({
-                                type: 'success',
-                                message: '报废成功!'
-                            });
-                            this.mixins_search();
-                        }
-                    });
+                    this.$http
+                        .post('/sc-community/device/deviceScrapInterface', { id: id, deviceStatus: 5 })
+                        .then(({ status, data, msg }) => {
+                            if (0 === status) {
+                                this.$message({
+                                    type: 'success',
+                                    message: '报废成功!'
+                                });
+                                this.mixins_search();
+                            }
+                        });
                 })
                 .catch(() => {});
         },
@@ -262,9 +279,7 @@ export default {
         addOrEdit(todo, data = {}) {
             new Promise((resolve) => {
                 let title = '添加设备';
-                if (todo == 'add') {
-                    // title = this.mixins_query.alarmCategory == '2' ? '添加离线规则' : '添加告警';
-                } else {
+                if (todo !== 'add') {
                     title = '修改设备';
                 }
                 this.$store.dispatch('addPopup', {
@@ -283,6 +298,15 @@ export default {
                 this.mixins_search();
             });
         },
+        addCommand(command) {
+            if (command === 'add') {
+                this.addOrEdit('add');
+            }
+            if (command === 'template') {
+                this.__exportExcel('/sc-community/excel/download/template', { importType: 'DEVICE' });
+                return;
+            }
+        },
         selectionChange(val) {
             this.selectRow = val;
         },

operationSupport/src/views/deviceManagement/indexFacilities.vue

@@ -12,8 +12,23 @@
             </el-select>
             <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
             <div class="search-icon">
-                <i class="iconfont" @click="deluserbyidFn()" v-txt-tip data-txt="删除">&#xe63b;</i>
-                <i class="iconfont" @click="addOrEdit('add')" v-left-txt-tip data-txt="新增">&#xe641;</i>
+                <el-tooltip class="item" effect="light" placement="bottom" content="删除">
+                    <i class="iconfont" @click="deluserbyidFn()">&#xe63b;</i>
+                </el-tooltip>
+                <el-dropdown type="primary" @command="addCommand">
+                    <span class="iconfont">&#xe641;</span>
+                    <el-dropdown-menu slot="dropdown" hide-on-click="false" class="device-search-dropdown">
+                        <el-dropdown-item command="add">单个添加</el-dropdown-item>
+                        <el-dropdown-item command="batchAdd">
+                            <div class="upload_div">
+                                <xk-upload class="upload_class" @callback="mixins_search" :params="{ importType: 'FACILITY' }">
+                                    <span class="upload_text" slot="content">批量添加</span>
+                                </xk-upload>
+                            </div>
+                        </el-dropdown-item>
+                        <el-dropdown-item command="template">下载模板</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
             </div>
         </div>
         <div class="roles-wrap">
@@ -27,7 +42,7 @@
                 @selection-change="selectionChange"
             >
                 <template slot="facilityQrcode">
-                    <i class="zoniot_font zoniot-icon-erweimachakan" style="cursor: inherit;"></i>
+                    <i class="zoniot_font zoniot-icon-erweimachakan" style="cursor: inherit"></i>
                 </template>
                 <template slot-scope="scope" slot="opt">
                     <div class="opt">
@@ -83,7 +98,7 @@ export default {
 
             cols: [
                 {
-                    label: '所属小区',
+                    label: '所属社区',
                     prop: 'communityId',
                     format(val) {
                         let va = '';
@@ -235,9 +250,7 @@ export default {
         addOrEdit(todo, data = {}) {
             new Promise((resolve) => {
                 let title = '添加设施';
-                if (todo == 'add') {
-                    // title = this.mixins_query.alarmCategory == '2' ? '添加离线规则' : '添加告警';
-                } else {
+                if (todo !== 'add') {
                     title = '修改设施';
                 }
                 this.$store.dispatch('addPopup', {
@@ -256,6 +269,15 @@ export default {
                 this.mixins_search();
             });
         },
+        addCommand(command) {
+            if (command === 'add') {
+                this.addOrEdit('add');
+            }
+            if (command === 'template') {
+                this.__exportExcel('/sc-community/excel/download/template', { importType: 'FACILITY' });
+                return;
+            }
+        },
         selectionChange(val) {
             this.selectRow = val;
         },

operationSupport/src/views/deviceManagement/indexType.vue

@@ -4,7 +4,9 @@
             <el-input placeholder="设施类型" class="search-input" clearable v-model="mixins_query.name"></el-input>
             <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
             <div class="search-icon">
-                <i class="iconfont" @click="addOrEdit('add')" v-left-txt-tip data-txt="新增">&#xe641;</i>
+                <el-tooltip class="item" effect="light" placement="bottom" content="新增">
+                    <span class="iconfont" @click="addOrEdit('add')">&#xe641;</span>
+                </el-tooltip>
             </div>
         </div>
         <div class="roles-wrap">
@@ -15,7 +17,6 @@
                 :data="mixins_list"
                 :pageset="mixins_pageset"
                 @page-change="pageChange"
-                @selection-change="selectionChange"
             >
                 <template slot-scope="scope" slot="opt">
                     <div class="opt">
@@ -40,7 +41,6 @@ export default {
     mixins: [list],
     data() {
         return {
-            selectRow: [],
             // 数据默认字段
             cols: [
                 {
@@ -86,30 +86,6 @@ export default {
                 })
                 .catch(() => {});
         },
-        deluserbyidsFn() {
-            // 获取选中列表的ids
-            // let ids = [];
-            // if (!this.selectRow.length) {
-            //     this.$message.error('您尚未选择要删除的记录，请选择后再操作批量删除');
-            //     return;
-            // }
-            // this.selectRow.forEach((v) => {
-            //     ids.push(v.id);
-            // });
-            // this.$msgBox(`删除`, '删除后将无法恢复，请问是否继续?')
-            //     .then((_) => {
-            //         this.$http.post('/user/delete', ids).then(({ status, data, msg }) => {
-            //             if (0 === status) {
-            //                 this.$message({
-            //                     type: 'success',
-            //                     message: '删除成功!'
-            //                 });
-            //                 this.mixins_search();
-            //             }
-            //         });
-            //     })
-            //     .catch(() => {});
-        },
         addOrEdit(todo, data = {}) {
             new Promise((resolve) => {
                 let title = '添加设施类型';
@@ -131,9 +107,6 @@ export default {
             }).then(() => {
                 this.mixins_search();
             });
-        },
-        selectionChange(val) {
-            this.selectRow = val;
         }
     }
 };

operationSupport/src/views/deviceManagement/popups/addDeviceManagement.vue

@@ -2,10 +2,16 @@
     <div class="alert-body__main_content">
         <zz-form :cols="formCols" :data="formData" :rules="formRules" :errors="formErrors" labelWidth="120" ref="form">
             <template slot="communityId">
-                <el-select v-model="formData.communityId">
+                <el-select v-model="formData.communityId"     @change="productChange($event)">
                     <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
                 </el-select>
             </template>
+            <template slot="address">
+                <el-input disabled v-model="formData.address">
+                    <i slot="suffix" class="zoniot_font zoniot-icon-dizhi" @click="addressQueryClick"></i>
+                </el-input>
+            </template>
+
             <template slot="productId">
                 <el-cascader
                     v-model="formData.productId"
@@ -13,7 +19,6 @@
                     :props="defaultProps"
                     clearable
                     placeholder="设备类型"
-                    @change="productChange($event)"
                 ></el-cascader>
             </template>
         </zz-form>
@@ -35,7 +40,7 @@ export default {
             formCols: [
                 [
                     {
-                        label: '选择小区',
+                        label: '选择社区',
                         prop: 'communityId',
                         slot: 'communityId'
                     },
@@ -59,13 +64,12 @@ export default {
                     {
                         label: '地址',
                         prop: 'address',
-                        slot: 'address',
-                        input: true
+                        slot: 'address'
                     }
                 ]
             ],
             formRules: {
-                communityId: [this.$valid.selectRequired('选择小区')],
+                communityId: [this.$valid.selectRequired('选择社区')],
                 productId: [this.$valid.selectRequired('设备类型')],
                 deviceNo: [this.$valid.selectRequired('设备编号')],
                 deviceName: [this.$valid.selectRequired('设备名称')]
@@ -86,7 +90,28 @@ export default {
     },
     methods: {
         productChange(va) {
-            
+            console.log(va)
+        },
+        getTenantsTree() {
+            this.$http.get('/sc-community/assets/tree/community/find').then(({ status, data, msg }) => {
+                if (status === 0 && data) {
+                    console.log(data);
+                }
+            });
+        },
+        addressQueryClick() {
+            this.$store.dispatch('addPopup', {
+                url: '/ownerManagement/stepPage/poptreeSelect.vue',
+
+                width: '500px',
+                height: '400px',
+                props: {
+                    list,
+                    tenantsTree,
+                    callback: resolve
+                },
+                title: title
+            });
         },
         submit() {
             new Promise((resolve) => {
@@ -116,6 +141,7 @@ export default {
         }
     },
     created() {
+        this.getTenantsTree()
         this.productOptions = this.params.productOptions;
         if (this.params.todo == 'edit') {
             this.formData = JSON.parse(JSON.stringify(this.params.data));

operationSupport/src/views/deviceManagement/popups/addFacilities.vue

@@ -30,7 +30,7 @@ export default {
             formCols: [
                 [
                     {
-                        label: '选择小区',
+                        label: '选择社区',
                         prop: 'communityId',
                         slot: 'communityId'
                     },
@@ -60,7 +60,7 @@ export default {
                 ]
             ],
             formRules: {
-                communityId: [this.$valid.selectRequired('选择小区')],
+                communityId: [this.$valid.selectRequired('选择社区')],
                 typeId: [this.$valid.selectRequired('设施类型')],
                 facilityNo: [this.$valid.selectRequired('设施编号')],
                 name: [this.$valid.selectRequired('设施名称')]

operationSupport/src/views/deviceManagement/popups/poptreeSelect.vue

@@ -0,0 +1,74 @@
+<template>
+    <el-scrollbar class="el-scrollbar-byself" style="width: 100%">
+        <el-tree
+            :data="tenantsTree"
+            show-checkbox
+            node-key="value"
+            :props="treedefaultProps"
+            :default-checked-keys="defaultcheckedkeys"
+            ref="tenantstree"
+        >
+        </el-tree>
+    </el-scrollbar>
+</template>
+<script>
+export default {
+    props: ['params'],
+    data() {
+        return {
+            tenantsTree: [],
+            treedefaultProps: {
+                children: 'children',
+                label: 'name'
+            },
+            defaultcheckedkeys: []
+        };
+    },
+    computed: {},
+    mounted() {},
+    methods: {
+        submit() {
+            let arrs = this.$refs.tenantstree.getCheckedNodes();
+            let combination = [];
+            arrs.forEach((item, index) => {
+                let thisValue = this.$refs.tenantstree.getNode(item);
+                let objArray = {};
+                if (
+                    (item.children == null || item.children == undefined) &&
+                    !this.defaultcheckedkeys.includes(parseInt(thisValue.data.value))
+                ) {
+                    if (thisValue.data.type === 'room') {
+                        objArray = {
+                            houseId: thisValue.data.value,
+                            buildingName: thisValue.parent.parent.data.name,
+                            unitName: thisValue.parent.data.name,
+                            roomNumber: thisValue.data.name
+                        };
+                    } else if (thisValue.data.type === 'parking') {
+                        objArray = {
+                            parkingId: thisValue.data.value,
+                            parkingNumber: thisValue.data.name
+                        };
+                    }
+                    combination.push(objArray);
+                }
+            });
+
+            this.params.callback && this.params.callback(combination);
+            this.$emit('close');
+        }
+    },
+    created() {
+        if (this.params.list.length !== 0) {
+            this.params.list.forEach((item, index) => {
+                if (this.params.num === 1) {
+                    this.defaultcheckedkeys.push(item.houseId);
+                } else {
+                    this.defaultcheckedkeys.push(item.parkingId);
+                }
+            });
+        }
+        this.tenantsTree = this.params.tenantsTree;
+    }
+};
+</script>

operationSupport/src/views/ownerManagement/details.vue

@@ -152,7 +152,7 @@ export default {
             houseTable: {
                 left: [
                     {
-                        lable: '所属小区',
+                        lable: '所属社区',
                         prop: 'communityName'
                     },
                     {
@@ -233,7 +233,7 @@ export default {
             parkingLotTable: {
                 left: [
                     {
-                        lable: '所属小区',
+                        lable: '所属社区',
                         prop: 'communityName'
                     },
                     {

operationSupport/src/views/ownerManagement/index.vue

@@ -376,7 +376,7 @@ export default {
         this.mixins_query = {
             questParams: ''
         };
-        // this.mixins_search('search');
+        this.mixins_search('search');
     }
 };
 </script>

operationSupport/src/views/parkingLotAdministration/pageJump/parkingLotSaveEdits.vue

@@ -24,8 +24,8 @@
                                 ></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="前缀名称">
-                            <el-input v-model="ruleForm.prefix"></el-input>
+                        <el-form-item label="前缀名称" v-if="codingStatus">
+                            <el-input v-model="ruleForm.prefix" placeholder="如A-，可以不填写"></el-input>
                         </el-form-item>
                         <el-form-item label="起始编号" v-if="codingStatus" prop="parkingBeginNumber">
                             <el-input v-model.trim="ruleForm.parkingBeginNumber" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
@@ -51,7 +51,7 @@
                             <el-radio v-model="ruleForm.parkingType" :label="2">私人车位</el-radio>
                         </el-form-item>
                         <el-form-item label="车位面积">
-                            <el-input v-model="ruleForm.parkingArea"></el-input>
+                            <el-input v-model="ruleForm.parkingArea" placeholder="请输入车位面积"></el-input>
                         </el-form-item>
                         <el-form-item label="结束编号" prop="parkingEndNumber" v-if="codingStatus">
                             <el-input v-model="ruleForm.parkingEndNumber"></el-input>
@@ -61,7 +61,15 @@
                 <el-row>
                     <el-col :span="24">
                         <el-form-item label="备注信息">
-                            <el-input type="textarea" :rows="4" v-model="ruleForm.remarks" maxlength="300"> </el-input>
+                            <el-input
+                                type="textarea"
+                                :rows="4"
+                                v-model="ruleForm.remarks"
+                                maxlength="300"
+                                show-word-limit
+                                placeholder="请输入备注信息"
+                            >
+                            </el-input>
                             <span style="position: absolute; bottom: 0; right: 10px" v-if="ruleForm.remarks"
                                 >{{ ruleForm.remarks.length }}/300</span
                             >

operationSupport/src/views/parkingLotAdministration/parkingSpaceList.vue

@@ -66,10 +66,6 @@ export default {
                     label: '车库名称',
                     prop: 'garageName'
                 },
-                {
-                    label: '所在地区',
-                    prop: 'garageAreaName'
-                },
                 {
                     label: '车库区域',
                     prop: 'garageAreaName'
@@ -80,7 +76,14 @@ export default {
                 },
                 {
                     label: '车位类别',
-                    prop: 'parkingType'
+                    prop: 'parkingType',
+                    format(val) {
+                        if (val == 1) {
+                            return '公共车位';
+                        } else {
+                            return '私人车位';
+                        }
+                    }
                 },
                 {
                     label: '车位面积',

operationSupport/src/views/system/popups/addoreditcommunity.vue

@@ -3,7 +3,7 @@
  * @Date: 2021-08-11 19:59:31
  * @LastEditors: wf
  * @LastEditTime: 2021-07-12 11:24:49
- * @Description: 系统管理--》小区管理--》添加和编辑界面
+ * @Description: 系统管理--》社区管理--》添加和编辑界面
  -->
 <template>
     <div class="sys-pop__community">
@@ -85,7 +85,7 @@ export default {
             cols: [
                 [
                     {
-                        label: '小区名称',
+                        label: '社区名称',
                         prop: 'name',
                         input: true
                     },
@@ -112,7 +112,7 @@ export default {
                 ]
             ],
             rules: {
-                name: [this.$valid.inputRequired('小区名称'), this.$valid.lengthRange(2, 25)],
+                name: [this.$valid.inputRequired('社区名称'), this.$valid.lengthRange(2, 25)],
                 companyOrgId: [this.$valid.selectRequired('所属公司')],
                 area: this.$valid.custome({
                     trigger: 'change',