diff --git a/vue/src/views/index.vue b/vue/src/views/index.vue
index 5d9d0960..4b713048 100644
--- a/vue/src/views/index.vue
+++ b/vue/src/views/index.vue
@@ -10,7 +10,7 @@
企业用户:
-
可用于商业用途,并提供移动端源码,通过赞助方式获取企业授权。但是不能低价或批量转售源码,不能随意分发源码。目前赞助费为1500元,项目不断完善后会对应增加费用。
+
可用于商业用途,并提供移动端源码,通过赞助方式获取企业授权。但是不能低价或批量转售源码,不能随意分发源码。目前赞助费为2000元,项目不断完善后会对应增加费用。
diff --git a/vue/src/views/iot/category/index.vue b/vue/src/views/iot/category/index.vue
index 150c86fe..757aedaf 100644
--- a/vue/src/views/iot/category/index.vue
+++ b/vue/src/views/iot/category/index.vue
@@ -5,11 +5,6 @@
-
-
-
-
-
搜索
重置
@@ -121,7 +116,6 @@ export default {
pageNum: 1,
pageSize: 10,
categoryName: null,
- tenantName: null,
isSys: null,
},
// 表单参数
@@ -133,16 +127,6 @@ export default {
message: "产品分类名称不能为空",
trigger: "blur"
}],
- tenantId: [{
- required: true,
- message: "租户ID不能为空",
- trigger: "blur"
- }],
- tenantName: [{
- required: true,
- message: "租户名称不能为空",
- trigger: "blur"
- }],
isSys: [{
required: true,
message: "是否系统通用不能为空",
@@ -164,9 +148,6 @@ export default {
/** 查询产品分类列表 */
getList() {
this.loading = true;
- if (this.$store.state.user.roles.indexOf("admin") === -1){
- this.queryParams.tenantName = this.$store.state.user.name
- }
listCategory(this.queryParams).then(response => {
this.categoryList = response.rows;
this.total = response.total;
diff --git a/vue/src/views/iot/device/index.vue b/vue/src/views/iot/device/index.vue
index 39717e11..475169f9 100644
--- a/vue/src/views/iot/device/index.vue
+++ b/vue/src/views/iot/device/index.vue
@@ -447,10 +447,6 @@ export default {
this.queryParams.params['beginActiveTime'] = this.daterangeActiveTime[0];
this.queryParams.params['endActiveTime'] = this.daterangeActiveTime[1];
}
- // 判断是否是admin角色
- // if (this.$store.state.user.roles.indexOf("admin") === -1) {
- // this.queryParams.userId = this.$store.state.user.userId
- // }
listDeviceShort(this.queryParams).then(response => {
this.deviceList = response.rows;
this.total = response.total;
diff --git a/vue/src/views/iot/firmware/index.vue b/vue/src/views/iot/firmware/index.vue
index 85eb67e7..34eef416 100644
--- a/vue/src/views/iot/firmware/index.vue
+++ b/vue/src/views/iot/firmware/index.vue
@@ -173,21 +173,6 @@ export default {
message: "产品名称不能为空",
trigger: "blur"
}],
- tenantId: [{
- required: true,
- message: "租户ID不能为空",
- trigger: "blur"
- }],
- tenantName: [{
- required: true,
- message: "租户名称不能为空",
- trigger: "blur"
- }],
- isSys: [{
- required: true,
- message: "是否系统通用不能为空",
- trigger: "blur"
- }],
version: [{
required: true,
message: "固件版本不能为空",
@@ -228,9 +213,6 @@ export default {
},
/** 查询产品固件列表 */
getList() {
- if (this.$store.state.user.roles !="admin"){
- this.queryParams.tenantName = this.$store.state.user.name
- }
this.loading = true;
listFirmware(this.queryParams).then(response => {
this.firmwareList = response.rows;
diff --git a/vue/src/views/iot/group/device-list.vue b/vue/src/views/iot/group/device-list.vue
index dea9220e..0f0e6ec6 100644
--- a/vue/src/views/iot/group/device-list.vue
+++ b/vue/src/views/iot/group/device-list.vue
@@ -107,9 +107,6 @@ export default {
this.queryParams.params["beginActiveTime"] = this.daterangeActiveTime[0];
this.queryParams.params["endActiveTime"] = this.daterangeActiveTime[1];
}
- if (this.$store.state.user.roles.indexOf("admin") === -1){
- this.queryParams.userName=this.$store.state.user.name;
- }
listDeviceShort(this.queryParams).then(response => {
this.deviceList = response.rows;
this.total = response.total;
diff --git a/vue/src/views/iot/group/index.vue b/vue/src/views/iot/group/index.vue
index 694d1019..b0aee627 100644
--- a/vue/src/views/iot/group/index.vue
+++ b/vue/src/views/iot/group/index.vue
@@ -158,11 +158,6 @@ export default {
/** 查询设备分组列表 */
getList() {
this.loading = true;
- // 设置用户的角色 用以区分自己创建的设备
- // 由于admin可以看所有数据所以判断
- if (this.$store.state.user.roles.indexOf("admin") === -1){
- this.queryParams.userName = this.$store.state.user.name
- }
listGroup(this.queryParams).then(response => {
this.groupList = response.rows;
this.total = response.total;
diff --git a/vue/src/views/iot/product/index.vue b/vue/src/views/iot/product/index.vue
index 8faf0a14..d35779e9 100644
--- a/vue/src/views/iot/product/index.vue
+++ b/vue/src/views/iot/product/index.vue
@@ -154,9 +154,6 @@ export default {
/** 查询产品列表 */
getList() {
this.loading = true;
- if (this.$store.state.user.roles.indexOf("admin") === -1){
- this.queryParams.tenantName = this.$store.state.user.name
- }
listProduct(this.queryParams).then(response => {
this.productList = response.rows;
this.total = response.total;
diff --git a/vue/src/views/iot/template/index.vue b/vue/src/views/iot/template/index.vue
index 0d5e8eb8..5fe792d9 100644
--- a/vue/src/views/iot/template/index.vue
+++ b/vue/src/views/iot/template/index.vue
@@ -238,8 +238,6 @@ export default {
pageSize: 10,
templateName: null,
type: null,
- // 增加属性
- tenantName: ''
},
// 表单参数
form: {},
@@ -286,9 +284,6 @@ export default {
/** 查询通用物模型列表 */
getList() {
this.loading = true;
- if (this.$store.state.user.roles.indexOf("admin") === -1) {
- this.queryParams.tenantName = this.$store.state.user.name
- }
listTemplate(this.queryParams).then((response) => {
this.templateList = response.rows;
this.total = response.total;