diff --git a/config.js b/config.js
index 3ae4e49..fc42eb9 100644
--- a/config.js
+++ b/config.js
@@ -6,7 +6,7 @@ const config = {
// 应用信息
appInfo: {
// 应用名称
- name: "及时雨智能灌溉管理",
+ name: "及时雨智能灌溉管理系统v1.0",
// 应用logo
logo: "/static/images/login/logo.png",
// 应用版本
diff --git a/manifest.json b/manifest.json
index a2e3782..8037e81 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "及时雨智能灌溉管理",
+ "name" : "及时雨智能灌溉管理系统v1.0",
"appid" : "__UNI__5ACF7F6",
"description" : "",
"versionName" : "1.0.0",
diff --git a/pages/work/land/index.vue b/pages/work/land/index.vue
index 2c411d5..136930c 100644
--- a/pages/work/land/index.vue
+++ b/pages/work/land/index.vue
@@ -15,7 +15,7 @@
-
+
-
+
地块数量:({{ list.length }}块)
@@ -52,13 +52,14 @@
-
+
-
+
地块名称:{{item.landName}}
地块面积:{{item.landName}}
@@ -69,7 +70,7 @@
v-if="item.companyGroup && item.companyGroup.companyFullName">{{item.companyGroup.companyFullName}}
-
+
@@ -266,19 +267,23 @@
// 表单
::v-deep.uni-forms-item__label {
- display: none !important;
+ display: none !important;
}
+
.u-search {
padding: 10px 10px 0 10px;
}
+
.u-checkbox {
margin: 0 !important;
height: 35px;
}
+
::v-deep.u-search__action--active {
width: 20% !important;
text-align: left !important;
}
+
.uni-forms-item.is-direction-left {
margin: 0 !important;
}
diff --git a/pages/work/user/ground.vue b/pages/work/user/ground.vue
index cc4a0f9..c6f8bfd 100644
--- a/pages/work/user/ground.vue
+++ b/pages/work/user/ground.vue
@@ -42,9 +42,11 @@
+ v-hasPermi="['system:wateroutletpermission:add']"
+ @click="onClickPermission(item)" />
@@ -125,9 +127,8 @@
}
\ No newline at end of file
diff --git a/pages/work/user/otherDevice.vue b/pages/work/user/otherDevice.vue
index 3c6f853..970c923 100644
--- a/pages/work/user/otherDevice.vue
+++ b/pages/work/user/otherDevice.vue
@@ -75,8 +75,7 @@
}
this.dataList = [];
getUseDevicePermission(this.query).then(res => {
- this.dataList = res.data;
- this.$refs.paging.complete(this.dataList);
+ this.$refs.paging.complete(res.data);
});
},
onSearchValue(e) {