Эх сурвалжийг харах

Merge remote-tracking branch 'origin/master'

LIDEXI 4 жил өмнө
parent
commit
f28130b961

+ 1 - 1
src/api/community/room.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/cyzh-community/room/list',
+    url: '/api/cyzh-community/room/page',
     method: 'get',
     params: {
       ...params,

+ 9 - 0
src/api/device/iotdevice.js

@@ -79,3 +79,12 @@ export const getDetailByDeviceId = (imei) => {
   })
 }
 
+export const getIotDeviceStaticVo = (params) => {
+  return request({
+    url: '/api/cyzh-smart-device/iotdevice/getIotDeviceStaticVo',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}

+ 16 - 15
src/components/excel/cy-excel-import.vue

@@ -2,26 +2,27 @@
     <span>
       <el-button icon="el-icon-download" @click="dialogVisible = true" size="small" plain>导入</el-button>
       <el-dialog title="导入" :visible.sync="dialogVisible" width="30%" :modal-append-to-body="false" append-to-body center>
-        <div style="text-align: center;">
-          <el-button style="margin-right: 10px;" icon="el-icon-download" size="small" plain @click="download">下载模板</el-button>
+          <el-row type="flex" justify="center">
+            <el-col :span="5">
+              <el-button style="margin-right: 10px" icon="el-icon-download" size="small" plain @click="download">下载模板</el-button>
+            </el-col>
+            <el-col :span="10">
+              <el-upload
+                :multiple="false"
+                :auto-upload="false"
+                :before-upload="beforeUpload"
+                :on-success="onSuccess"
+                :on-error="onError"
+                :disabled="importDisabled"
+                :on-change="selectFile"
 
-          <el-upload
-            :show-file-list="false"
-            :multiple="false"
-            :auto-upload="false"
-            :before-upload="beforeUpload"
-            :on-success="onSuccess"
-            :on-error="onError"
-            :disabled="importDisabled"
-            :on-change="selectFile"
-
-            style="display: inline-flex;margin-right: 10px;"
-            action="/api/common/excel/importExcel">
+                action="/api/common/excel/importExcel">
 
             <el-button slot="trigger" size="small" type="primary" icon="el-icon-document-add">选取文件</el-button>
             <el-button style="margin-left: 10px;" size="small" type="success" :disabled="!file" :icon="importDataIcon" @click="submitUpload">{{importDataText}}</el-button>
           </el-upload>
-          </div>
+            </el-col>
+          </el-row>
       </el-dialog>
 
     </span>

+ 685 - 669
src/views/community/residential.vue

@@ -1,21 +1,20 @@
-
 <template>
   <basic-container>
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :modal-append-to-body="false" :visible.sync="manageVisible"
-               title="管理" fullscreen="true" @close="closeManage">
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :modal-append-to-body="false"
+      :visible.sync="manageVisible" title="管理" fullscreen="true" @close="closeManage">
 
       <residentialManage ref="resMang" :residentialId="selectedResidentialId" :residentialName="selectedResidentialName"
-                         :visible="manageVisible">
+        :visible="manageVisible">
 
       </residentialManage>
 
     </el-dialog>
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :modal-append-to-body="false" :visible.sync="detailVisible"
-               title="详情" width="80%">
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :modal-append-to-body="false"
+      :visible.sync="detailVisible" title="详情" width="80%">
       <residential-detail :form="detailForm" ref="residentialDetail"></residential-detail>
     </el-dialog>
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :modal-append-to-body="false" :visible.sync="editVisible"
-               title="编辑" width="80%">
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :modal-append-to-body="false"
+      :visible.sync="editVisible" title="编辑" width="80%">
       <avue-form v-model="editForm" :option="option" @submit="submitResidential">
         <template slot="mapSelect">
           <!--          <input class="el-input&#45;&#45;small el-input__inner" placeholder="选择地址" @click="mapVisible = true">-->
@@ -23,18 +22,23 @@
         </template>
       </avue-form>
     </el-dialog>
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :modal-append-to-body="false" :visible.sync="mapVisible"
-               title="编辑地址" width="80%">
-      <editPolygonMap v-if="mapVisible" :editForm.sync="editForm" :region.sync="editForm.address" :latitude.sync="editForm.latitude" :longitude.sync="editForm.longitude" :visible.sync="mapVisible"></editPolygonMap>
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :modal-append-to-body="false"
+      :visible.sync="mapVisible" title="编辑地址" width="80%">
+      <editPolygonMap v-if="mapVisible" :editForm.sync="editForm" :region.sync="editForm.address"
+        :latitude.sync="editForm.latitude" :longitude.sync="editForm.longitude" :visible.sync="mapVisible">
+      </editPolygonMap>
     </el-dialog>
     <avue-crud :option="option" :table-loading="loading" :data="data" :page="page" :permission="permissionList"
-               :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
-               @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
-               @size-change="sizeChange" @refresh-change="refreshChange" @submit="handleSubmit" @on-load="onLoad">
+      :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @submit="handleSubmit"
+      @on-load="onLoad" >
       <template slot="menuLeft">
-        <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.residential_delete" @click="handleDelete">删除
+        <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.residential_delete"
+          @click="handleDelete">删除
         </el-button>
-        <cy-excel-import :flag="2" file-name="小区信息导入模板" v-if="permission.residential_add" @success="onLoad(page)"></cy-excel-import>
+        <cy-excel-import :flag="2" file-name="小区信息导入模板" v-if="permission.residential_add" @success="onLoad(page)">
+        </cy-excel-import>
         <!--        <el-button type="success" size="small" icon="el-icon-refresh" v-if="permission.residential_add" plain @click="refreshNumber">计算统计</el-button>-->
         <!--        <el-button type="success" size="small" icon="el-icon-refresh" v-if="permission.residential_add" plain @click="syncHouseInfoAndUser(oldIds)">同步楼栋&住户</el-button>-->
       </template>
@@ -50,7 +54,8 @@
               操作<i class="el-icon-arrow-down el-icon--right"> </i>
             </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item divided @click.native="detail(scope.row)" icon="el-icon-office-building">详情</el-dropdown-item>
+              <el-dropdown-item divided @click.native="detail(scope.row)" icon="el-icon-office-building">详情
+              </el-dropdown-item>
               <el-dropdown-item divided @click.native="edit(scope.row)" icon="el-icon-school">编辑</el-dropdown-item>
               <el-dropdown-item divided @click.native="manage(scope.row)" icon="el-icon-s-order">管理</el-dropdown-item>
               <!--              <el-dropdown-item divided @click.native="syncBuilding(scope.row)" v-if="permission.residential_syncBuilding">同步楼栋</el-dropdown-item>-->
@@ -68,9 +73,11 @@
         <div>
           <!--          <input class="el-input&#45;&#45;small el-input__inner" placeholder="选择地址" @click="mapVisible2 = true">-->
           <el-button @click="mapVisible2 = true">选择地址</el-button>
-          <el-dialog :append-to-body="true" :close-on-click-modal="false" :modal-append-to-body="false" :visible.sync="mapVisible2"
-                     title="编辑地址" width="80%">
-            <editPolygonMap v-if="mapVisible2" :editForm.sync="scope.row" :region.sync="scope.row.address" :latitude.sync="scope.row.latitude" :longitude.sync="scope.row.longitude" :visible.sync="mapVisible2"></editPolygonMap>
+          <el-dialog :append-to-body="true" :close-on-click-modal="false" :modal-append-to-body="false"
+            :visible.sync="mapVisible2" title="编辑地址" width="80%">
+            <editPolygonMap v-if="mapVisible2" :editForm.sync="scope.row" :region.sync="scope.row.address"
+              :latitude.sync="scope.row.latitude" :longitude.sync="scope.row.longitude" :visible.sync="mapVisible2">
+            </editPolygonMap>
           </el-dialog>
         </div>
       </template>
@@ -80,320 +87,387 @@
 </template>
 
 <script>
-import {
-  getList,
-  updateNumber,
-  add,
-  update,
-  remove,
-  updateResidential,
-  syncHouseInfoAndUser,
-  syncBuilding,
-  syncUnit,
-  syncFloor,
-  syncRoom,
-  syncUser,
-  syncDoorDevice
-} from "@/api/community/residential";
-import {
-  mapGetters
-} from "vuex";
+  import {
+    getList,
+    updateNumber,
+    add,
+    update,
+    remove,
+    updateResidential,
+    syncHouseInfoAndUser,
+    syncBuilding,
+    syncUnit,
+    syncFloor,
+    syncRoom,
+    syncUser,
+    syncDoorDevice
+  } from "@/api/community/residential";
+  import {
+    mapGetters
+  } from "vuex";
 
-import CyAreaSelect from "../../components/cy-area-select/cy-area-select";
+  import CyAreaSelect from "../../components/cy-area-select/cy-area-select";
 
 
-import residentialManage from "./residentialManage.vue";
-import residentialDetail from "../../components/residential/residentialDetail.vue";
-import CyExcelImport from "../../components/excel/cy-excel-import.vue"
-import editPolygonMap from "../../components/residential/editPolygonMap.vue";
-export default {
-  components: {
-    CyAreaSelect,
-    residentialManage,
-    residentialDetail,
-    CyExcelImport,
-    editPolygonMap
-  },
-  data() {
-    return {
-      mapVisible2:false,
-      mapVisible:false,
-      selectedResidentialId: "",
-      selectedResidentialName: "",
-      manageVisible: false,
-      form: {},
-      detailForm: {},
-      detailVisible: false,
-      editForm: {},
-      editVisible: false,
-      regionDic: [],
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
-      selectionList: [],
-      option: {
-        height: 'auto',
-        calcHeight: 60,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        viewBtn: false,
-        addBtn: true,
-        editBtn: false,
-        delBtn: true,
-        selection: true,
-        dialogClickModal: false,
-        menuWidth: 250,
-        column: [{
-          label: "名称",
-          overHidden: true,
-          width: 150,
-          prop: "name",
-          // row: true,
-          search: true,
-          rules: [{
-            required: true,
-            message: "请输入名称",
-            trigger: "blur"
-          }]
+  import residentialManage from "./residentialManage.vue";
+  import residentialDetail from "../../components/residential/residentialDetail.vue";
+  import CyExcelImport from "../../components/excel/cy-excel-import.vue"
+  import editPolygonMap from "../../components/residential/editPolygonMap.vue";
+  export default {
+    components: {
+      CyAreaSelect,
+      residentialManage,
+      residentialDetail,
+      CyExcelImport,
+      editPolygonMap
+    },
+    data() {
+      return {
+        mapVisible2: false,
+        mapVisible: false,
+        selectedResidentialId: "",
+        selectedResidentialName: "",
+        manageVisible: false,
+        form: {},
+        detailForm: {},
+        detailVisible: false,
+        editForm: {},
+        editVisible: false,
+        regionDic: [],
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
         },
-          {
-            label:'',
-            prop:'mapSelect',
-            // row: true,
-            // span: 20,
-            formslot: true,
-            hide: true,
-          },
-          {
-            label: "经度",
-            prop: "longitude",
-            width: 120,
-            hide: true,
-            rules: [{
-              required: false,
-              message: "请输入经度",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "纬度",
-            prop: "latitude",
-            width: 120,
-            hide: true,
-            rules: [{
-              required: false,
-              message: "请输入纬度",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属社区",
-            prop: "agencyId",
-            // slot: true,
-            search: true,
-            width: 150,
-            overHidden: true,
-            type: "select",
-            remote: true,
-            refresh:true,
-            searchFilterable:true,
-            filterable:true,
-            dicUrl: "/api/cyzh-community/agency/list?size=500&name={{key}}",
-            props: {
-              label: "name",
-              value: "id"
+        selectionList: [],
+        option: {
+          height: 'auto',
+          calcHeight: 60,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: false,
+          addBtn: true,
+          editBtn: false,
+          delBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          menuWidth: 250,
+          column: [{
+              label: "名称",
+              overHidden: true,
+              width: 150,
+              prop: "name",
+              // row: true,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入名称",
+                trigger: "blur"
+              }]
             },
-            dicFormatter:(res)=>{
-              return res.data.records;
+            {
+              label: '',
+              prop: 'mapSelect',
+              // row: true,
+              // span: 20,
+              formslot: true,
+              hide: true,
             },
-            rules: [{
-              required: true,
-              message: "请输入所属社区名称",
-              trigger: "blur"
-            }]
+            {
+              label: "经度",
+              prop: "longitude",
+              width: 120,
+              hide: true,
+              rules: [{
+                required: false,
+                message: "请输入经度",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "纬度",
+              prop: "latitude",
+              width: 120,
+              hide: true,
+              rules: [{
+                required: false,
+                message: "请输入纬度",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "所属社区",
+              prop: "agencyId",
+              // slot: true,
+              search: true,
+              width: 150,
+              overHidden: true,
+              type: "select",
+              remote: true,
+              refresh: true,
+              searchFilterable: true,
+              filterable: true,
+              dicUrl: "/api/cyzh-community/agency/list?size=500&name={{key}}",
+              props: {
+                label: "name",
+                value: "id"
+              },
+              dicFormatter: (res) => {
+                return res.data.records;
+              },
+              rules: [{
+                required: true,
+                message: "请输入所属社区名称",
+                trigger: "blur"
+              }]
 
-          },
+            },
 
-          {
-            label: "详细地址",
-            prop: "address",
-            overHidden: true,
-          },
-          {
-            label: "楼栋数量",
-            prop: "buildingCount",
-            width: 100,
-            display: false,
-          },
-          {
-            label: "单元数量",
-            prop: "unitCount",
-            width: 100,
-            display: false,
-          },
-          {
-            label: "楼层数量",
-            prop: "floorCount",
-            width: 100,
-            display: false,
-          },
-          {
-            label: "房间数量",
-            prop: "roomCount",
-            width: 100,
-            display: false,
-          },
-          {
-            label: "住户数量",
-            prop: "userCount",
-            width: 100,
-            display: false,
-            hide: true,
-          },
-          {
-            label: "已录入人脸住户数",
-            prop: "userFaceCount",
-            hide: true,
-            width: 120,
-            display: false,
-          },
-          {
-            label: "所属物业",
-            labelWidth: 110,
-            hide:true,
-            display:false,
-            type:"select",
-            prop: "estateId",
-            dicUrl: "/api/cyzh-estate/company/list?current=1&size=50",
-            props: {
-              label: "name",
-              value: "id"
+            {
+              label: "详细地址",
+              prop: "address",
+              overHidden: true,
             },
-            dicFormatter:(res)=>{
-              return res.data.records
+            {
+              label: "楼栋数量",
+              prop: "buildingCount",
+              width: 100,
+              display: false,
             },
-            rules: [{
-              required: false,
-              message: "请选择所属物业",
-              trigger: "blur"
-            }, {
-              // validator: validatePhone,
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "物业名称",
-            prop: "estateName",
-            labelWidth: 110,
-            display: false,
-            hide:true,
-            rules: [{
-              required: true,
-              message: "请输入物业名称",
-              trigger: "blur"
-            }]
+            {
+              label: "单元数量",
+              prop: "unitCount",
+              width: 100,
+              display: false,
+            },
+            {
+              label: "楼层数量",
+              prop: "floorCount",
+              width: 100,
+              display: false,
+            },
+            {
+              label: "房间数量",
+              prop: "roomCount",
+              width: 100,
+              display: false,
+            },
+            {
+              label: "住户数量",
+              prop: "userCount",
+              width: 100,
+              display: false,
+              hide: true,
+            },
+            {
+              label: "已录入人脸住户数",
+              prop: "userFaceCount",
+              hide: true,
+              width: 120,
+              display: false,
+            },
+            {
+              label: "所属物业",
+              labelWidth: 110,
+              hide: true,
+              display: false,
+              type: "select",
+              prop: "estateId",
+              dicUrl: "/api/cyzh-estate/company/list?current=1&size=50",
+              props: {
+                label: "name",
+                value: "id"
+              },
+              dicFormatter: (res) => {
+                return res.data.records
+              },
+              rules: [{
+                required: false,
+                message: "请选择所属物业",
+                trigger: "blur"
+              }, {
+                // validator: validatePhone,
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "物业名称",
+              prop: "estateName",
+              labelWidth: 110,
+              display: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入物业名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "物业电话",
+              display: false,
+              hide: true,
+              prop: "estatePhone",
+              labelWidth: 110,
+              rules: [{
+                required: true,
+                message: "请输入物业电话",
+                trigger: "blur"
+              }, {
+                // validator: validatePhone,
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "负责人姓名",
+              prop: "personName",
+              labelWidth: 110,
+              rules: [{
+                required: true,
+                message: "请输入负责人姓名",
+                trigger: "blur"
+              }, {
+                // validator: validatePhone,
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "负责人电话",
+              prop: "personPhone",
+              labelWidth: 110,
+              rules: [{
+                required: true,
+                message: "请输入负责人电话",
+                trigger: "blur"
+              }, {
+                // validator: validatePhone,
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "图片",
+              prop: "pic",
+              type: 'upload',
+              hide: true,
+              propsHttp: {
+                res: "data",
+                url: 'link'
+              },
+              listType: 'picture-img',
+              span: 24,
+              row: true,
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              display: true,
+              rules: [{
+                required: false,
+                message: "请输入封面图片",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "备注",
+              hide: true,
+              prop: "remark",
+              type: "textarea"
+            },
+            {
+              label: "创建时间",
+              hide: true,
+              width: 85,
+              prop: "createTime",
+              type: "datetime",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              display: false,
+            },
+            {
+              label: "旧平台id",
+              prop: "oldId",
+              hide: true,
+              display: false
+            }
+          ]
+        },
+        menuData: {
+          list: [],
+          form: {
+            parentId: 0
           },
-          {
-            label: "物业电话",
-            display: false,
-            hide:true,
-            prop: "estatePhone",
-            labelWidth: 110,
-            rules: [{
-              required: true,
-              message: "请输入物业电话",
-              trigger: "blur"
+          option: {
+            column: [{
+              label: "父级编码",
+              prop: "parentId",
+              value: 0,
+              disabled: true,
+              span: 24
             }, {
-              // validator: validatePhone,
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "负责人姓名",
-            prop: "personName",
-            labelWidth: 110,
-            rules: [{
-              required: true,
-              message: "请输入负责人姓名",
-              trigger: "blur"
+              label: "权限名称",
+              prop: "name",
+              span: 24,
+              rules: [{
+                required: true,
+                message: "请输入权限名称",
+                trigger: "blur"
+              }]
             }, {
-              // validator: validatePhone,
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "负责人电话",
-            prop: "personPhone",
-            labelWidth: 110,
-            rules: [{
-              required: true,
-              message: "请输入负责人电话",
-              trigger: "blur"
+              label: "权限标识",
+              prop: "code",
+              span: 24,
+              rules: [{
+                required: true,
+                message: "请输入权限标识",
+                trigger: "blur"
+              }]
             }, {
-              // validator: validatePhone,
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "图片",
-            prop: "pic",
-            type: 'upload',
-            hide: true,
-            propsHttp: {
-              res: "data",
-              url: 'link'
-            },
-            listType: 'picture-img',
-            span: 24,
-            row: true,
-            action: "/api/blade-resource/oss/endpoint/put-file",
-            display: true,
-            rules: [{
-              required: false,
-              message: "请输入封面图片",
-              trigger: "blur"
+              label: "类型",
+              prop: "state",
+              span: 24,
+              type: "radio",
+              dicData: [{
+                label: '系统',
+                value: 0
+              }, {
+                label: '菜单',
+                value: 1
+              }, {
+                label: '按钮',
+                value: 2
+              }],
+              rules: [{
+                required: true,
+                message: "请输入类型",
+                trigger: "blur"
+              }]
+            }, {
+              label: "组件地址",
+              prop: "component",
+              span: 24
+            }, {
+              label: "图标",
+              prop: "icon",
+              span: 24
+            }, {
+              label: "请求地址",
+              prop: "path",
+              span: 24
+            }, {
+              label: "权限描述",
+              prop: "des",
+              span: 24
+            }, {
+              label: "排序",
+              prop: "order",
+              span: 24
             }]
-          },
-          {
-            label: "备注",
-            hide: true,
-            prop: "remark",
-            type: "textarea"
-          },
-          {
-            label: "创建时间",
-            hide: true,
-            width: 85,
-            prop: "createTime",
-            type: "datetime",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-            display: false,
-          },
-          {
-            label: "旧平台id",
-            prop: "oldId",
-            hide: true,
-            display: false
           }
-        ]
-      },
-      menuData: {
-        list: [],
-        form: {
-          parentId: 0
         },
-        option: {
+        menuOption: {
           column: [{
             label: "父级编码",
             prop: "parentId",
-            value: 0,
             disabled: true,
             span: 24
           }, {
@@ -442,6 +516,8 @@ export default {
             label: "图标",
             prop: "icon",
             span: 24
+
+
           }, {
             label: "请求地址",
             prop: "path",
@@ -455,396 +531,336 @@ export default {
             prop: "order",
             span: 24
           }]
-        }
-      },
-      menuOption: {
-        column: [{
-          label: "父级编码",
-          prop: "parentId",
-          disabled: true,
-          span: 24
-        }, {
-          label: "权限名称",
-          prop: "name",
-          span: 24,
-          rules: [{
-            required: true,
-            message: "请输入权限名称",
-            trigger: "blur"
-          }]
-        }, {
-          label: "权限标识",
-          prop: "code",
-          span: 24,
-          rules: [{
-            required: true,
-            message: "请输入权限标识",
-            trigger: "blur"
-          }]
-        }, {
-          label: "类型",
-          prop: "state",
-          span: 24,
-          type: "radio",
-          dicData: [{
-            label: '系统',
-            value: 0
-          }, {
-            label: '菜单',
-            value: 1
-          }, {
-            label: '按钮',
-            value: 2
-          }],
-          rules: [{
-            required: true,
-            message: "请输入类型",
-            trigger: "blur"
-          }]
-        }, {
-          label: "组件地址",
-          prop: "component",
-          span: 24
-        }, {
-          label: "图标",
-          prop: "icon",
-          span: 24
-
-
-        }, {
-          label: "请求地址",
-          prop: "path",
-          span: 24
-        }, {
-          label: "权限描述",
-          prop: "des",
-          span: 24
-        }, {
-          label: "排序",
-          prop: "order",
-          span: 24
-        }]
-      },
-      data: [],
-    };
-  },
-  computed: {
-    ...mapGetters(["permission"]),
-    permissionList() {
-      return {
-        addBtn: this.vaildData(this.permission.residential_add, false),
-        viewBtn: this.vaildData(this.permission.residential_view, false),
-        delBtn: this.vaildData(this.permission.residential_delete, false),
-        editBtn: this.vaildData(this.permission.residential_edit, false)
+        },
+        data: [],
       };
     },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.residential_add, false),
+          viewBtn: this.vaildData(this.permission.residential_view, false),
+          delBtn: this.vaildData(this.permission.residential_delete, false),
+          editBtn: this.vaildData(this.permission.residential_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      },
+      oldIds() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.oldId);
+        });
+        return ids.join(",");
+      }
     },
-    oldIds() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.oldId);
-      });
-      return ids.join(",");
-    }
-  },
-  mounted() {
+    mounted() {
 
-  },
-  watch: {
-    'form.mapSelect': {
-      handler: function(value) {
-        if (!value){
-          return
-        }else{
-          this.form.longitude = this.form.mapSelect.longitude;
-          this.form.latitude = this.form.mapSelect.latitude;
-          this.form.address = this.form.mapSelect.formattedAddress;
-        }
-      },
-      immediate: false
     },
-    'editForm.mapSelect': {
-      handler: function(value) {
-        if (!value){
-          return
-        }else{
-          this.editForm.longitude = this.editForm.mapSelect.longitude;
-          this.editForm.latitude = this.editForm.mapSelect.latitude;
-          // this.editForm.address = this.editForm.mapSelect.formattedAddress;
-        }
+    watch: {
+      'form.mapSelect': {
+        handler: function(value) {
+          if (!value) {
+            return
+          } else {
+            this.form.longitude = this.form.mapSelect.longitude;
+            this.form.latitude = this.form.mapSelect.latitude;
+            this.form.address = this.form.mapSelect.formattedAddress;
+          }
+        },
+        immediate: false
+      },
+      'editForm.mapSelect': {
+        handler: function(value) {
+          if (!value) {
+            return
+          } else {
+            this.editForm.longitude = this.editForm.mapSelect.longitude;
+            this.editForm.latitude = this.editForm.mapSelect.latitude;
+            // this.editForm.address = this.editForm.mapSelect.formattedAddress;
+          }
+        },
+        immediate: false
       },
-      immediate: false
-    },
-  },
-  methods: {
-    handleSubmit(){
-      this.$message.success(JSON.stringify(this.form));
-      console.log(this.form,"rrr");
     },
-    syncHouseInfoAndUser(){
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
+    created() {
+      const tenantType = localStorage.getItem("tenantType");
+      if (tenantType == 0) {
+        this.option.column[4].label = "所属社区"
+      } else if (tenantType == 1) {
+        this.option.column[4].label = "所属园区"
       }
-      syncHouseInfoAndUser(this.oldIds).then(() => {
-        this.onLoad(this.page)
-      });
     },
-    refreshNumber(){
-      updateNumber(this.ids).then(() => {
-        this.onLoad(this.page)
-      });
-    },
-    syncUser(row){
-      syncUser(row.oldId).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+    methods: {
+     
+      handleSubmit() {
+        this.$message.success(JSON.stringify(this.form));
+        console.log(this.form, "rrr");
+      },
+      syncHouseInfoAndUser() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        syncHouseInfoAndUser(this.oldIds).then(() => {
+          this.onLoad(this.page)
         });
-      }, error => {
-        window.console.log(error);
-      });
-    },
-    syncBuilding(row){
-      syncBuilding(row.oldId).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+      },
+      refreshNumber() {
+        updateNumber(this.ids).then(() => {
+          this.onLoad(this.page)
         });
-      }, error => {
-        window.console.log(error);
-      });
-    },
-    syncUnit(row){
-      syncUnit(row.oldId).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+      },
+      syncUser(row) {
+        syncUser(row.oldId).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }, error => {
+          window.console.log(error);
         });
-      }, error => {
-        window.console.log(error);
-      });
-    },
-    syncFloor(row){
-      syncFloor(row.oldId).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+      },
+      syncBuilding(row) {
+        syncBuilding(row.oldId).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }, error => {
+          window.console.log(error);
         });
-      }, error => {
-        window.console.log(error);
-      });
-    },
-    syncRoom(row){
-
-      syncRoom(row.oldId).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+      },
+      syncUnit(row) {
+        syncUnit(row.oldId).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }, error => {
+          window.console.log(error);
         });
-        done();
-      }, error => {
-        loading();
-        window.console.log(error);
-      });
-    },
-
-    syncDoorDevice(row){
-      syncDoorDevice(row.oldId).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+      },
+      syncFloor(row) {
+        syncFloor(row.oldId).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }, error => {
+          window.console.log(error);
         });
-        done();
-      }, error => {
-        loading();
-        window.console.log(error);
-      });
-    },
-    closeManage() {
-      this.manageVisible = false;
-    },
-    manage(row) {
-      this.selectedResidentialId = row.id;
-      this.selectedResidentialName = row.name;
-      console.log("id:" + this.selectedResidentialId + "  name" + this.selectedResidentialName)
-      this.manageVisible = true;
-      this.$nextTick(() => {
-        this.$refs.resMang.init();
-      })
-    },
-    edit(row) {
-      this.editForm = row;
-      this.editVisible = true;
-    },
-    detail(row) {
-      this.detailForm = row;
-      this.detailVisible = true;
-      this.$nextTick(()=>{
-        this.$refs.residentialDetail.init()
-      })
-    },
+      },
+      syncRoom(row) {
 
-    rowSave(row, done, loading) {
-      add(row).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done();
-      }, error => {
-        loading();
-        window.console.log(error);
-      });
-    },
-    submitResidential(row,done, loading) {
-      update(this.editForm).then(() => {
-        this.onLoad(this.page);
-        this.editVisible = false;
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+        syncRoom(row.oldId).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
         });
-        done();
-      }, error => {
-        loading();
-        console.log(error);
-      });
-    },
-    rowUpdate(row, index, done, loading) {
-      row.isUpdateOrg = false;
-      updateResidential(row).then(() => {
-        // update(row).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+      },
+
+      syncDoorDevice(row) {
+        syncDoorDevice(row.oldId).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
         });
-        done();
-      }, error => {
-        loading();
-        console.log(error);
-      });
-    },
-    rowDel(row) {
-      if (row.unitNumber > 0) {
-        this.$message.error("请先删除其下单元和其他数据")
-        return
-      }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(row.id);
+      },
+      closeManage() {
+        this.manageVisible = false;
+      },
+      manage(row) {
+        this.selectedResidentialId = row.id;
+        this.selectedResidentialName = row.name;
+        console.log("id:" + this.selectedResidentialId + "  name" + this.selectedResidentialName)
+        this.manageVisible = true;
+        this.$nextTick(() => {
+          this.$refs.resMang.init();
         })
-        .then(() => {
+      },
+      edit(row) {
+        this.editForm = row;
+        this.editVisible = true;
+      },
+      detail(row) {
+        this.detailForm = row;
+        this.detailVisible = true;
+        this.$nextTick(() => {
+          this.$refs.residentialDetail.init()
+        })
+      },
+
+      rowSave(row, done, loading) {
+        add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
         });
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
-      }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
+      },
+      submitResidential(row, done, loading) {
+        update(this.editForm).then(() => {
           this.onLoad(this.page);
+          this.editVisible = false;
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          this.$refs.crud.toggleSelection();
+          done();
+        }, error => {
+          loading();
+          console.log(error);
         });
-    },
-    beforeOpen(done, type) {
-      let _this = this;
-      if (["edit", "view"].includes(type)) {
-        // getResidentialDetail(this.form.id).then(res => {
-        //   _this.form = res.data.data;
-        //   let region = [];
-        //   region.push(_this.form.regionProvince);
-        //   region.push(_this.form.regionCity);
-        //   region.push(_this.form.regionArea);
-        //
-        //   _this.form.region = region;
+      },
+      rowUpdate(row, index, done, loading) {
+        row.isUpdateOrg = false;
+        updateResidential(row).then(() => {
+          // update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        if (row.unitNumber > 0) {
+          this.$message.error("请先删除其下单元和其他数据")
+          return
+        }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        let _this = this;
+        if (["edit", "view"].includes(type)) {
+          // getResidentialDetail(this.form.id).then(res => {
+          //   _this.form = res.data.data;
+          //   let region = [];
+          //   region.push(_this.form.regionProvince);
+          //   region.push(_this.form.regionCity);
+          //   region.push(_this.form.regionArea);
+          //
+          //   _this.form.region = region;
+          // });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+        // getResidentialList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        //   const data = res.data.data;
+        //   this.page.total = Number.parseInt(data.total);
+        //   this.data = data.records;
+        //   this.loading = false;
+        //   this.selectionClear();
         // });
-      }
-      done();
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-      // getResidentialList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-      //   const data = res.data.data;
-      //   this.page.total = Number.parseInt(data.total);
-      //   this.data = data.records;
-      //   this.loading = false;
-      //   this.selectionClear();
-      // });
 
 
-    },
+      },
 
-  }
-};
+    }
+  };
 </script>
 
 <style scoped>

+ 92 - 63
src/views/device/doordevice.vue

@@ -88,16 +88,6 @@ export default {
               trigger: "blur"
             }]
           },
-          {
-            label: "设备厂商",
-            prop: "deviceFactory",
-            width: 135,
-            rules: [{
-              required: true,
-              message: "请输入设备编号",
-              trigger: "blur"
-            }]
-          },
           {
             label: "名称",
             prop: "name",
@@ -110,74 +100,101 @@ export default {
             }]
           },
           {
-            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,
+            label: "设备厂商",
+            prop: "deviceFactory",
             type: "select",
-            width: 100,
-            cascaderItem: ["areaCode"],
-            dicUrl: `/api/blade-system/region/lazy-tree?parentCode={{key}}`,
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=door_device_factory",
             props:{
-              label: "title",
-              value: "id"
+              label: "dictValue",
+              value: "dictKey"
             },
-            // dicFlag: false,
+            width: 135,
             rules: [{
               required: true,
-              message: "请输入市行政编码",
+              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"
+          //   }]
+          // },
           {
-            label: "所属区",
-            prop: "areaCode",
-            type: "select",
-            // width: 100,
-            // dicFlag: false,
-            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",
-            // slot: true,
+            width: 250,
+            hide: true,
+            dicFlag: true,
             type: "select",
             search: true,
             searchFilterable: true,
-            // dicUrl: "/api/cyzh-community/residential/list?size=900&regionArea={{key}}",
-            dicUrl: "/api/cyzh-community/residential/list?size=900",
+            dataType: "number",
+            dicUrl: "/api/cyzh-community/residential/list?size=500&name={{key}}",
             dicFormatter:(res)=>{
+              console.log(JSON.stringify(res))
               return res.data.records;//返回字典的层级结构
             },
-            // dicFlag: false,
-            filterable: true,
+
             props: {
               label: "name",
               value: "id"
@@ -191,7 +208,7 @@ export default {
           {
             label: "具体地址",
             prop: "address",
-            width: 180,
+            width: 350,
             search: true,
             overHidden: true,
             rules: [{
@@ -204,7 +221,7 @@ export default {
           {
             label: "Mac编码",
             prop: "macAddress",
-            width: 110,
+            width: 200,
             rules: [{
               required: true,
               message: "请输入Mac编码",
@@ -215,6 +232,7 @@ export default {
             label: "创建时间",
             prop: "createTime",
             display: false,
+            hide: true,
             width: 150,
             rules: [{
               required: true,
@@ -225,6 +243,7 @@ export default {
           {
             label: "设备状态",
             prop: "deviceStatus",
+            hide: true,
             type: "select",
             width: 80,
             dicUrl:"/api/blade-system/dict-biz/dictionary?code=face_device_status",
@@ -310,7 +329,17 @@ export default {
       },
     }
   },
-  mounted() {
+  created() {
+    const tenantType = localStorage.getItem("tenantType");
+    if (tenantType == 0){
+      this.option.column[3].label = "所属小区"
+      this.option.column[4].label = "所属小区"
+    }else if (tenantType == 1){
+      this.option.column[3].label = "所属区域"
+      this.option.column[4].label = "所属区域"
+    }
+  },
+  /*mounted() {
     let tenantType = localStorage.getItem("tenantType");
     const residentialColumn = this.findObject(this.option.column, "residentialId");
     if (tenantType == 1) { //园区
@@ -318,7 +347,7 @@ export default {
     } else { //社区
       residentialColumn.label = "所属小区";
     }
-  },
+  },*/
   methods: {
     rowSave(row, done, loading) {
       add(row).then(() => {

+ 6 - 1
src/views/device/videoSurveillance.vue

@@ -18,7 +18,8 @@
       </el-col>
     </el-row> -->
     <el-row>
-      <el-col span="4" align="right" style="font-size: large;">所属小区(区域):</el-col>
+      <el-col v-if="tenantType == 0" span="4" align="right" style="font-size: large;">所属小区:</el-col>
+      <el-col v-if="tenantType == 1" span="4" align="right" style="font-size: large;">所属区域:</el-col>
       <el-col span="4" align="left">
         <el-select size="small" v-model="selectResidential" filterable  clearable @change="residentialIdChange">
           <el-option v-for="item in residentialList" :key="item.id" :label="item.name" :value="item.id">
@@ -71,6 +72,7 @@ export default {
     // http://139.9.103.171/live?port=1935&app=myapp&stream=mystream1
     // http://139.9.103.171/live?port=1935&app=myapp&stream=mystream3
     return {
+      tenantType: '',
       selectBuilding: "",
       buildingList:[],
       deviceName: "",
@@ -121,6 +123,9 @@ export default {
       this.onLoad()
     }
   },
+  created() {
+    this.tenantType = localStorage.getItem("tenantType");
+  },
   methods: {
     checkClick(e1,e2){
       console.log(e1,e2)

+ 1 - 1
src/views/enterprise/enterprise.vue

@@ -138,7 +138,7 @@
               }]
             },
             {
-              label: "所属区",
+              label: "所属区",
               prop: "residentialId",
               // slot: true,
               type: "select",

+ 48 - 58
src/views/estate/accessrecord.vue

@@ -38,6 +38,45 @@
   export default {
     data() {
       return {
+        residentialColumn: {
+          label: "所属小区",
+          prop: "residentialId",
+          // slot: true,
+          type: "select",
+          search: true,
+          width:150,
+          cascaderItem: ["buildingId"],
+          // dicUrl: "/grid/estate/getResidentialList",
+          // remote: true,
+          //回显的时候有问题,如果所选不在前十条内,下拉框只会显示id
+          dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
+          dicFormatter: (res)=>{
+            return res.data.records;
+          },
+          searchFilterable: true,
+          // dicFlag: false,
+          props: {
+            label: "name",
+            value: "id"
+          }
+        },
+        enterpriseColumn: {
+          label: "所属企业",
+          prop: "enterpriseId",
+          type: "select",
+          search: true,
+          width:200,
+          filterable: true,
+          dicUrl: "/api/cyzh-enterprise/enterprise/list?size=9999",
+          props:{
+            label:"enterpriseName",
+            value:"id"
+          },
+          dicFormatter: (res)=>{
+            return res.data.records;
+          },
+          searchFilterable: true,
+        },
         form: {},
         query: {},
         loading: true,
@@ -62,15 +101,6 @@
           selection: true,
           dialogClickModal: false,
           column: [
-            // {
-            //   label: "用户id",
-            //   prop: "userId",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入用户id",
-            //     trigger: "blur"
-            //   }]
-            // },
             {
               label: "用户姓名",
               prop: "userName",
@@ -104,54 +134,6 @@
                 message: "请选择所属社区",
                 trigger: "blur"
               }]
-            },{
-              label: "所属小区",
-              prop: "residentialId",
-              // slot: true,
-              type: "select",
-              search: true,
-              width:150,
-              cascaderItem: ["buildingId"],
-              // dicUrl: "/grid/estate/getResidentialList",
-              // remote: true,
-              //回显的时候有问题,如果所选不在前十条内,下拉框只会显示id
-              dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
-              dicFormatter: (res)=>{
-                return res.data.records;
-              },
-              searchFilterable: true,
-              // dicFlag: false,
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请输入所属小区",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "所属企业",
-              prop: "enterpriseId",
-              type: "select",
-              search: true,
-              width:200,
-              filterable: true,
-              dicUrl: "/api/cyzh-enterprise/enterprise/list?size=9999",
-              props:{
-                label:"enterpriseName",
-                value:"id"
-              },
-              dicFormatter: (res)=>{
-                return res.data.records;
-              },
-              searchFilterable: true,
-              rules: [{
-                required: true,
-                message: "请输入企业id",
-                trigger: "blur"
-              }]
             },
             {
               label: "人脸",
@@ -213,7 +195,7 @@
               }]
             },
             {
-              label: "小区名字",
+              label: "区域名称",
               prop: "residentialName",
               rules: [{
                 required: true,
@@ -308,6 +290,14 @@
         return ids.join(",");
       }
     },
+    created() {
+      const tenantType = localStorage.getItem("tenantType");
+      if (tenantType == 0){
+        this.option.column.splice(2,0,this.residentialColumn)
+      }else if (tenantType == 1){
+        this.option.column.splice(2,0,this.enterpriseColumn)
+      }
+    },
     methods: {
       rowSave(row, done, loading) {
         add(row).then(() => {

+ 10 - 0
src/views/estate/carenterrecord.vue

@@ -287,6 +287,16 @@
         return ids.join(",");
       }
     },
+    created() {
+      const tenantType = localStorage.getItem("tenantType");
+      if (tenantType == 0){
+        this.option.column[2].label = "所属社区"
+        this.option.column[3].label = "所属小区"
+      }else if (tenantType == 1){
+        this.option.column[2].label = "所属园区"
+        this.option.column[3].label = "所属区域"
+      }
+    },
     methods: {
       rowSave(row, done, loading) {
         add(row).then(() => {

+ 10 - 0
src/views/estate/caroutrecord.vue

@@ -317,6 +317,16 @@
         return ids.join(",");
       }
     },
+    created() {
+      const tenantType = localStorage.getItem("tenantType");
+      if (tenantType == 0){
+        this.option.column[13].label = "所属社区"
+        this.option.column[14].label = "所属小区"
+      }else if (tenantType == 1){
+        this.option.column[13].label = "所属园区"
+        this.option.column[14].label = "所属区域"
+      }
+    },
     methods: {
       rowSave(row, done, loading) {
         add(row).then(() => {

+ 10 - 0
src/views/estate/guest.vue

@@ -479,6 +479,16 @@
         return ids.join(",");
       }
     },
+    created() {
+      const tenantType = localStorage.getItem("tenantType");
+      if (tenantType == 0){
+        this.option.column[4].label = "所属社区"
+        this.option.column[6].label = "所属小区"
+      }else if (tenantType == 1){
+        this.option.column[4].label = "所属园区"
+        this.option.column[6].label = "所属区域"
+      }
+    },
     methods: {
       rowSave(row, done, loading) {
         add(row).then(() => {

+ 10 - 0
src/views/estate/parkinglot.vue

@@ -335,6 +335,16 @@
         return ids.join(",");
       }
     },
+    created() {
+      const tenantType = localStorage.getItem("tenantType");
+      if (tenantType == 0){
+        this.option.column[3].label = "所属社区"
+        this.option.column[4].label = "所属小区"
+      }else if (tenantType == 1){
+        this.option.column[3].label = "所属园区"
+        this.option.column[4].label = "所属区域"
+      }
+    },
     methods: {
       rowSave(row, done, loading) {
         add(row).then(() => {

+ 8 - 0
src/views/estate/parkingspace.vue

@@ -224,6 +224,14 @@
         return ids.join(",");
       }
     },
+    created() {
+      const tenantType = localStorage.getItem("tenantType");
+      if (tenantType == 0){
+        this.option.column[4].label = "所属小区"
+      }else if (tenantType == 1){
+        this.option.column[4].label = "所属区域"
+      }
+    },
     methods: {
       rowSave(row, done, loading) {
         add(row).then(() => {

+ 8 - 0
src/views/estate/repair.vue

@@ -335,6 +335,14 @@
         return ids.join(",");
       }
     },
+    created() {
+      const tenantType = localStorage.getItem("tenantType");
+      if (tenantType == 0){
+        this.option.column[7].label = "所属小区"
+      }else if (tenantType == 1){
+        this.option.column[7].label = "所属区域"
+      }
+    },
     methods: {
       rowSave(row, done, loading) {
         add(row).then(() => {

+ 17 - 9
src/views/smartapplication/buildingvideo.vue

@@ -32,7 +32,8 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove,pageByBuilding} from "../../api/device/iotdevice.js";
+  import {getDetail, add, update, remove} from "../../api/device/iotdevice.js";
+  import {getList} from "@/api/device/videoclouddevice";
   import {mapGetters} from "vuex";
 
   export default {
@@ -146,7 +147,7 @@
               dataType: "number",
               type: "select",
               search: true,
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=online_or_offline",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=yt_online_status",
               props: {
                 label: 'dictValue',
                 value: 'dictKey'
@@ -180,13 +181,20 @@
             {
               label: "是否支持云台",
               prop: "isSupportPtz",
-              dataType: "number",
+              // dataType: "number",
+              dicData: [{
+                label: "支持",
+                value: 1,
+              },{
+                label: "不支持",
+                value: 0,
+              }],
               type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=is_support",
-              props: {
-                label: 'dictValue',
-                value: 'dictKey'
-              },
+              // dicUrl: "/api/blade-system/dict-biz/dictionary?code=is_support",
+              // props: {
+              //   label: 'dictValue',
+              //   value: 'dictKey'
+              // },
               rules: [{
                 required: true,
                 message: "请输入是否支持云台(0:不支持,1:支持)",
@@ -563,7 +571,7 @@
       onLoad(page, params = {}) {
         this.loading = true;
         params.buildingId = this.buildingId;
-        pageByBuilding(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;

+ 2 - 2
src/views/smartapplication/devicebuilding.vue

@@ -143,7 +143,7 @@
     add,
     update,
     remove,
-    getSmartDeviceStaticVo
+    getIotDeviceStaticVo
   } from "@/api/device/iotdevice";
   import {
     mapGetters
@@ -959,7 +959,7 @@
       onLoad(page, params = {}) {
         this.loading = true;
         params.buildingId = this.buildingId;
-        getSmartDeviceStaticVo(params).then(res =>{
+        getIotDeviceStaticVo(params).then(res =>{
           this.deviceStaticVo = res.data.data
         })
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {