1、

src/api/system/custommenu.js

@@ -59,4 +59,12 @@ export const getLazyList = (parentId, params) => {
   })
 }
 
+export const save = (row) => {
+  return request({
+    url: '/api/blade-system-expand/custommenu/submit',
+    method: 'post',
+    data: row
+  })
+}
+
 

src/util/validator.js

@@ -345,6 +345,22 @@ export function validatMoney(rule, value, callback) {
       }
   }, 100);
 }
+
+/* 数值范围*/
+export function validatNum(rule, value, callback) {
+  if (!value) {
+    callback();
+  }
+  setTimeout(() => {
+    const reg = /^-?\d{1,10}(?:\.\d{1,2})?$/;
+    if(reg.test(value)){
+      callback();
+    }else{
+      callback(new Error('请正确输入数值'));
+    }
+  }, 100);
+}
+
 /* 小写字母*/
 export function validateLowerCase(str) {
   const reg = /^[a-z]+$/;

src/views/community/building.vue

@@ -147,7 +147,7 @@ export default {
             search: true,
             searchFilterable: true,
             // cascaderItem: ['buildingId'],
-            dicUrl: "/api/cyzh-community/residential/select?size=9999",
+            dicUrl: "/api/cyzh-community/residential/select?size=100",
             // dicFormatter:(res)=>{
             //   return res.data.records;//返回字典的层级结构
             // },

src/views/community/residentialManage.vue

@@ -201,7 +201,7 @@ import Log from '../../api/tool/MyLog.js';
 import ArrUtil from '../../api/tool/ArrUtil.js';
 
 import {batchAddSubmit} from "@/api/community/building";
-import {validatePhone} from "../../util/validator";
+import {validatePhone, validatNum} from "../../util/validator";
 
 export default {
   props:{
@@ -682,11 +682,11 @@ export default {
             dicData: [
               {
                 label: "有",
-                value: 1
+                value: "1"
               },
               {
                 label: "无",
-                value: 0
+                value: "0"
               }
             ],
             rules: [{
@@ -847,59 +847,70 @@ export default {
             }]
           },
           {
-            label: "房屋面积",
+            label: "房屋面积(平方米)",
             prop: "area",
             hide: true,
+            labelWidth: 140,
+            rules: [{
+              required: false,
+              message: "房屋面积(平方米)",
+              trigger: "blur"
+            },{
+              validator: validatNum,
+              trigger: "blur"
+            }]
           },{
             label: "入住用户数量",
             prop: "userCount",
             display: false,
           },
-          {
-            label: "户型",
-            prop: "houseType",
-            hide: true,
-            type: "select",
-            // search: true,
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=house_type",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-          },
-          {
-            label: "楼层",
-            prop: "floor",
-            hide: true,
-          },
+          // {
+          //   label: "户型",
+          //   prop: "houseType",
+          //   hide: true,
+          //   type: "select",
+          //   // search: true,
+          //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=house_type",
+          //   props: {
+          //     label: "dictValue",
+          //     value: "dictKey"
+          //   },
+          // },
+          // {
+          //   label: "楼层",
+          //   prop: "floor",
+          //   hide: true,
+          // },
           {
             label: "装饰",
             prop: "ornament",
             hide: true,
           },
+          // {
+          //   label: "房屋朝向",
+          //   prop: "orientation",
+          //   hide: true,
+          // },
+          // {
+          //   label: "序号",
+          //   prop: "serial",
+          //   value: 1,
+          //   hide: true,
+          //   display: false,
+          // },
           {
-            label: "房屋朝向",
-            prop: "orientation",
-            hide: true,
-          },{
-            label: "序号",
-            prop: "serial",
-            value: 1,
-            hide: true,
-            display: false,
-          }, {
             label: "备注",
             prop: "remark",
             hide: true,
           },
-          {
-            label: "创建时间",
-            prop: "createTime",
-            hide: true,
-            type: "datetime",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-            display: false,
-          },
+          // {
+          //   label: "创建时间",
+          //   prop: "createTime",
+          //   hide: true,
+          //   type: "datetime",
+          //   valueFormat: "yyyy-MM-dd HH:mm:ss",
+          //   display: false,
+          // },
           {
             prop: 'type',
             valueDefault: 'bed',
@@ -1179,7 +1190,6 @@ export default {
       }else{
         this.form.pic = "/img/default/building.png"
       }
-      debugger
       done();
     },
 

src/views/device/doordevice.vue

@@ -39,6 +39,10 @@
           </el-dialog>
         </div>
       </template>
+      <template slot="residentialId" slot-scope="scope">{{scope.row.residentialName}}</template>
+      <template slot="residentialIdForm" slot-scope="scope">
+        <select-dialog-residential :id="form.residentialId" :name="form.residentialName" :callback="selectCallback"></select-dialog-residential>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -48,8 +52,10 @@ import {getList, getDetail, add, update, remove} from "../../api/device/doordevi
 import {mapGetters} from "vuex";
 import customAvueMap from "../../components/residential/customAvueMap.vue"
 import editPolygonMap from "../../components/residential/editPolygonMap.vue";
+import SelectDialogResidential from "../../components/select-dialog/select-dialog-residential";
 export default {
   components:{
+    SelectDialogResidential,
     customAvueMap,editPolygonMap
   },
   data() {
@@ -77,17 +83,6 @@ export default {
         dialogClickModal: false,
         menuWidth:350,
         column: [
-          {
-            label: "门禁设备",
-            prop: "id",
-            hide: true,
-            display:false,
-            rules: [{
-              required: true,
-              message: "请输入门禁设备",
-              trigger: "blur"
-            }]
-          },
           {
             label: "名称",
             prop: "name",
@@ -100,101 +95,29 @@ export default {
             }]
           },
           {
-            label: "设备厂商",
-            prop: "deviceFactory",
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=door_device_factory",
-            props:{
-              label: "dictValue",
-              value: "dictKey"
-            },
-            width: 135,
+            label: "Mac编码",
+            prop: "macAddress",
+            width: 200,
             rules: [{
               required: true,
-              message: "请输入设备编号",
+              message: "请输入Mac编码",
               trigger: "blur"
             }]
           },
-
-          // {
-          //   label: "所属省",
-          //   prop: "provinceCode",
-          //   // hide: true,
-          //   width: 150,
-          //   type: "select",
-          //   dicUrl: "/api/blade-system/region/lazy-tree?parentCode=000000",
-          //   cascaderItem:["cityCode"],
-          //   props:{
-          //     label:"title",
-          //     value: "id"
-          //   },
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入省行政编码",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "所属市",
-          //   prop: "cityCode",
-          //   hide: true,
-          //   type: "select",
-          //   width: 150,
-          //   cascaderItem: ["areaCode"],
-          //   dicUrl: `/api/blade-system/region/lazy-tree?parentCode={{key}}`,
-          //   props:{
-          //     label: "title",
-          //     value: "id"
-          //   },
-          //   dicFlag: true,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入市行政编码",
-          //     trigger: "blur"
-          //   }]
-          // },
-          // {
-          //   label: "所属区",
-          //   prop: "areaCode",
-          //   type: "select",
-          //    width: 150,
-          //   dicFlag: true,
-          //   cascaderItem: ["residentialId"],
-          //   dicUrl: `/api/blade-system/region/lazy-tree?parentCode={{key}}`,
-          //   props:{
-          //     label: "title",
-          //     value: "id"
-          //   },
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入区行政编码",
-          //     trigger: "blur"
-          //   }]
-          // },
-          {
-            label: "所属小区",
-            prop: "residentialName",
-             width: 250,
-             display: false,
-
-          },
-
           {
             label: "所属小区",
             prop: "residentialId",
-            width: 250,
-            hide: true,
             dicFlag: true,
             type: "select",
             search: true,
             searchFilterable: true,
+            slot: true,
+            formslot: true,
             dataType: "number",
             dicUrl: "/api/cyzh-community/residential/list?size=500&name={{key}}",
             dicFormatter:(res)=>{
-              console.log(JSON.stringify(res))
               return res.data.records;//返回字典的层级结构
             },
-
             props: {
               label: "name",
               value: "id"
@@ -203,7 +126,7 @@ export default {
               required: true,
               message: "请选择所属小区",
               trigger: "blur"
-            }]
+            }],
           },
           {
             label: "具体地址",
@@ -217,35 +140,11 @@ export default {
               trigger: "blur"
             }]
           },
-
-          {
-            label: "Mac编码",
-            prop: "macAddress",
-            width: 200,
-            rules: [{
-              required: true,
-              message: "请输入Mac编码",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "创建时间",
-            prop: "createTime",
-            display: false,
-            hide: true,
-            width: 150,
-            rules: [{
-              required: true,
-              message: "请输入创建时间",
-              trigger: "blur"
-            }]
-          },
           {
             label: "设备状态",
             prop: "deviceStatus",
-            hide: true,
             type: "select",
-            width: 80,
+            hide: true,
             dicUrl:"/api/blade-system/dict-biz/dictionary?code=face_device_status",
             props: {
               label: 'dictValue',
@@ -254,9 +153,10 @@ export default {
             dataType: "number",
             rules: [{
               required: true,
-              message: "请输入设备状态：0-离线 2-mac异常",
+              message: "请输入设备状态：离线 异常",
               trigger: "blur"
-            }]
+            }],
+            display: false
           },
           {
             label:'',
@@ -291,9 +191,89 @@ export default {
               trigger: "blur"
             }]
           },
+          // {
+          //   label: "门禁设备",
+          //   prop: "id",
+          //   hide: true,
+          //   display:false,
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入门禁设备",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "设备厂商",
+          //   prop: "deviceFactory",
+          //   type: "select",
+          //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=door_device_factory",
+          //   props:{
+          //     label: "dictValue",
+          //     value: "dictKey"
+          //   },
+          //   width: 135,
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入设备编号",
+          //     trigger: "blur"
+          //   }]
+          // },
 
-
-
+          // {
+          //   label: "所属省",
+          //   prop: "provinceCode",
+          //   // hide: true,
+          //   width: 150,
+          //   type: "select",
+          //   dicUrl: "/api/blade-system/region/lazy-tree?parentCode=000000",
+          //   cascaderItem:["cityCode"],
+          //   props:{
+          //     label:"title",
+          //     value: "id"
+          //   },
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入省行政编码",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "所属市",
+          //   prop: "cityCode",
+          //   hide: true,
+          //   type: "select",
+          //   width: 150,
+          //   cascaderItem: ["areaCode"],
+          //   dicUrl: `/api/blade-system/region/lazy-tree?parentCode={{key}}`,
+          //   props:{
+          //     label: "title",
+          //     value: "id"
+          //   },
+          //   dicFlag: true,
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入市行政编码",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "所属区",
+          //   prop: "areaCode",
+          //   type: "select",
+          //    width: 150,
+          //   dicFlag: true,
+          //   cascaderItem: ["residentialId"],
+          //   dicUrl: `/api/blade-system/region/lazy-tree?parentCode={{key}}`,
+          //   props:{
+          //     label: "title",
+          //     value: "id"
+          //   },
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入区行政编码",
+          //     trigger: "blur"
+          //   }]
+          // },
         ]
       },
       data: []
@@ -332,11 +312,9 @@ export default {
   created() {
     const tenantType = localStorage.getItem("tenantType");
     if (tenantType == 0){
-      this.option.column[3].label = "所属小区"
-      this.option.column[4].label = "所属小区"
+      this.option.column[2].label = "所属小区"
     }else if (tenantType == 1){
-      this.option.column[3].label = "所属区域"
-      this.option.column[4].label = "所属区域"
+      this.option.column[2].label = "所属区域"
     }
   },
   /*mounted() {
@@ -349,6 +327,10 @@ export default {
     }
   },*/
   methods: {
+    selectCallback(row){
+      this.form.residentialId = row.id;
+      this.form.residentialName = row.name;
+    },
     rowSave(row, done, loading) {
       add(row).then(() => {
         this.onLoad(this.page);

src/views/device/iotalarm.vue

@@ -57,7 +57,6 @@ export default {
       selectionList: [],
       option: {
         submitBtn:false,
-        emptyBtn:false,
         // menuWidth: 200,
         menuAlign:'center',
         height: 'auto',

src/views/device/iotalarmgroup.vue

@@ -15,6 +15,10 @@
           <template slot="residentialId" slot-scope="scope">
             <div>{{scope.row.residentialName}}</div>
           </template>
+          <template slot="residentialId" slot-scope="scope">{{scope.row.residentialName}}</template>
+          <template slot="residentialIdForm" slot-scope="scope">
+            <select-dialog-residential :id="formParent.residentialId" :name="formParent.residentialName" :callback="selectCallback"></select-dialog-residential>
+          </template>
         </avue-crud>
       </basic-container>
     </el-col>
@@ -31,7 +35,6 @@
                        @click="handleDeleteChild">删 除
             </el-button>
           </template>
-
         </avue-crud>
       </basic-container>
     </el-col>
@@ -59,6 +62,7 @@ import {
   mapGetters
 } from "vuex";
 import {validatePhone} from "../../util/validator";
+import SelectDialogResidential from "../../components/select-dialog/select-dialog-residential";
 
 var DIC = {
   yes_no: [{
@@ -71,8 +75,10 @@ var DIC = {
 }
 
 export default {
+  components: {SelectDialogResidential},
   data() {
     return {
+      form:{},
       formParent: {},
       query: {},
       loading: true,
@@ -118,7 +124,9 @@ export default {
             // remote: true,
             //回显的时候有问题，如果所选不在前十条内，下拉框只会显示id
             remote: true,
-            dicUrl: "/api/cyzh-community/residential/list?size=999&name={{key}}",
+            slot: true,
+            formslot: true,
+            dicUrl: "/api/cyzh-community/residential/list?size=100&name={{key}}",
             dicFormatter:(res)=>{
               return res.data.records;//返回字典的层级结构
             },
@@ -128,7 +136,6 @@ export default {
             },
             searchFilterable: true,
             search: true,
-            slot: true,
             rules: [{
               required: true,
               message: "请输入",
@@ -273,6 +280,10 @@ export default {
     }
   },
   methods: {
+    selectCallback(row){
+      this.formParent.residentialId = row.id;
+      this.formParent.residentialName = row.name;
+    },
     rowSave(row, done, loading) {
       add(row).then(() => {
         this.onLoadParent(this.pageParent);

src/views/estate/parkingspace.vue

@@ -252,7 +252,6 @@
       "form.residentialId"() {
         getResidentialList(1, 10, {id: this.form.residentialId}).then(res => {
           this.form.residentialName = res.data.data.records[0].name;
-          JSON.stringify()
         })
       }
     },

src/views/party/activity.vue

@@ -168,7 +168,7 @@
               label: "活动时间",
               prop: "activityTime",
               type: "datetimerange",
-              format: "yyyy-MM-dd hh:mm:ss",
+              format: "yyyy-MM-dd HH:mm:ss",
               valueFormat: "yyyy-MM-dd HH:mm:ss",
               width: 320,
               row: true,