Merge branch 'master' of http://192.168.1.218:3000/lianghanqiang/saber-community

src/api/system/tenant.js

@@ -32,9 +32,54 @@ export const remove = (ids) => {
   })
 }
 
+export const setting = (ids, form) => {
+  return request({
+    url: '/api/blade-system/tenant/setting',
+    method: 'post',
+    params: {
+      ...form,
+      ids
+    }
+  })
+}
+
+export const datasource = (tenantId, datasourceId) => {
+  return request({
+    url: '/api/blade-system/tenant/datasource',
+    method: 'post',
+    params: {
+      tenantId,
+      datasourceId
+    }
+  })
+}
+
+export const info = (domain) => {
+  return request({
+    url: '/api/blade-system/tenant/info',
+    method: 'get',
+    params: {
+      domain
+    }
+  })
+}
+
+export const getTenantList = (current, size, params) => {
+  return request({
+    url: '/api/blade-system-expand/tenanttype/getTenantList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+
 export const add = (row) => {
   return request({
-    url: '/api/blade-system/tenant/submit',
+    url: '/api/blade-system-expand/tenanttype/submit',
     method: 'post',
     data: row
   })
@@ -42,40 +87,39 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/blade-system/tenant/submit',
+    url: '/api/blade-system-expand/tenanttype/submit',
     method: 'post',
     data: row
   })
 }
 
-export const setting = (ids, form) => {
+
+export const removeTenantAndType = (ids) => {
   return request({
-    url: '/api/blade-system/tenant/setting',
+    url: '/api/blade-system-expand/tenanttype/remove',
     method: 'post',
     params: {
-      ...form,
-      ids
+      ids,
     }
   })
 }
 
-export const datasource = (tenantId, datasourceId) => {
+export const getTenantTypeDetailByTenantId = (tenantId) => {
   return request({
-    url: '/api/blade-system/tenant/datasource',
-    method: 'post',
+    url: '/api/blade-system-expand/tenanttype/detail',
+    method: 'get',
     params: {
-      tenantId,
-      datasourceId
+      tenantId
     }
   })
 }
 
-export const info = (domain) => {
+export const getTenantInfo = (port) => {
   return request({
-    url: '/api/blade-system/tenant/info',
+    url: '/api/blade-system-expand/tenanttype/getTenantInfo',
     method: 'get',
     params: {
-      domain
+      port
     }
   })
 }

src/store/modules/user.js

@@ -5,7 +5,7 @@ import {isURL, validatenull} from '@/util/validate'
 import {deepClone} from '@/util/util'
 import website from '@/config/website'
 import {loginByUsername, loginBySocial, getUserInfo, logout, refreshToken, getButtons} from '@/api/user'
-import {getTopMenu, getRoutes} from '@/api/system/menu'
+import {getTopMenu, getCustomRoutes} from '@/api/system/menu'
 import md5 from 'js-md5'
 
 
@@ -177,7 +177,7 @@ const user = {
     //获取系统菜单
     GetMenu({commit, dispatch}, topMenuId) {
       return new Promise(resolve => {
-        getRoutes(topMenuId).then((res) => {
+        getCustomRoutes(topMenuId).then((res) => {
           const data = res.data.data
           let menu = deepClone(data);
           menu.forEach(ele => {

src/views/device/doordevice.vue

@@ -125,7 +125,7 @@ export default {
             rules: [{
               required: true,
               message: "请选择所属小区",
-              trigger: "blur"
+              trigger: "change"
             }],
           },
           {

src/views/system/tenant.vue

@@ -64,7 +64,7 @@
 </template>
 
 <script>
-import {getList, getDetail, remove, update, add, setting, datasource} from "@/api/system/tenant";
+import {getTenantList, getDetail, removeTenantAndType, update, add, setting, datasource} from "@/api/system/tenant";
 import {mapGetters} from "vuex";
 
 export default {
@@ -120,6 +120,41 @@ export default {
               trigger: "blur"
             }]
           },
+          {
+            label: "租户类型",
+            prop: "tenantType",
+            type: "select",
+            dataType: "number",
+            width: 180,
+            dicUrl: `/api/blade-system/dict/dictionary?code=tenant_type`,
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+            rules: [{
+              required: true,
+              message: "请输入参数名称",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "系统名称",
+            prop: "systemName",
+            rules: [{
+              required: false,
+              message: "请输入系统名称",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "端口号",
+            prop: "port",
+            rules: [{
+              required: false,
+              message: "请输入端口号",
+              trigger: "blur"
+            }]
+          },
           {
             label: "联系人",
             prop: "linkman",
@@ -279,7 +314,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          return remove(row.id);
+          return removeTenantAndType(row.id);
         })
         .then(() => {
           this.onLoad(this.page);
@@ -332,7 +367,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          return remove(this.ids);
+          return removeTenantAndType(this.ids);
         })
         .then(() => {
           this.onLoad(this.page);
@@ -413,7 +448,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getTenantList(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;

vue.config.js

@@ -28,6 +28,8 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         target: 'http://localhost',
+        // target: 'http://192.168.1.160:1889/api',
+        // target: 'http://8.135.18.59:1889/api',
         // target: 'http://36.103.227.152:1777/api',
         ws: true,
         pathRewrite: {