Commit 69173829e6747ccdc89a73fe61b24dfab56e7ef3

Authored by 刘淇
1 parent 3d7c5939

样式优化

subPackages/treePage/addTree.vue
... ... @@ -9,20 +9,20 @@
9 9 <tui-row>
10 10  
11 11 <tui-col :span="12">
12   - <tui-form-item label="胸径" asterisk prop="dbh" :position="3">
13   - <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
  12 + <tui-form-item label="胸径" asterisk prop="dbh" :position="2">
  13 + <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10" textLeft
14 14 v-model="formData.dbh"></tui-input>
15 15 <template v-slot:right>
16   - <text style="padding-left: 12rpx;color:#ccc;font-size:14px">厘米</text>
  16 + <text style="padding-left: 12rpx;color:#ccc;font-size:12px">米</text>
17 17 </template>
18 18 </tui-form-item>
19 19 </tui-col>
20 20 <tui-col :span="12">
21   - <tui-form-item label="高度" prop="treeheight" :position="3">
22   - <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
  21 + <tui-form-item label="高度" prop="treeheight" :position="2">
  22 + <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10" textLeft
23 23 v-model="formData.treeheight"></tui-input>
24 24 <template v-slot:right>
25   - <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
  25 + <text style="padding-left: 12rpx;color:#ccc;font-size:12px;">米</text>
26 26 </template>
27 27 </tui-form-item>
28 28 </tui-col>
... ... @@ -51,7 +51,7 @@
51 51 prop="latitude"
52 52 :bottomBorder="false"
53 53 >
54   - <span style="color: #ccc"> {{ formData.longitude }}</span>
  54 + <span style="color: #ccc;font-size: 14px"> {{ formData.longitude }}</span>
55 55 </tui-form-item>
56 56 </tui-col>
57 57 <tui-col :span="12">
... ... @@ -62,7 +62,7 @@
62 62 class="location-form-item"
63 63 prop="latitude"
64 64 >
65   - <span style="color: #ccc"> {{ formData.latitude }}</span>
  65 + <span style="color: #ccc;font-size: 14px"> {{ formData.latitude }}</span>
66 66 </tui-form-item>
67 67 </tui-col>
68 68  
... ... @@ -133,20 +133,20 @@
133 133  
134 134 <tui-row>
135 135 <tui-col :span="12">
136   - <tui-form-item label="预估树龄" prop="estimationtreeage" :position="3">
137   - <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
  136 + <tui-form-item label="预估树龄" prop="estimationtreeage" :position="2">
  137 + <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10"
138 138 v-model="formData.estimationtreeage"></tui-input>
139 139 <template v-slot:right>
140   - <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">年</text>
  140 + <text style="padding-left: 12rpx;color:#ccc;font-size: 12px">年</text>
141 141 </template>
142 142 </tui-form-item>
143 143 </tui-col>
144 144 <tui-col :span="12">
145   - <tui-form-item label="干周" prop="weekday" :position="3">
146   - <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
  145 + <tui-form-item label="干周" prop="weekday" :position="2">
  146 + <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10"
147 147 v-model="formData.weekday"></tui-input>
148 148 <template v-slot:right>
149   - <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">厘米</text>
  149 + <text style="padding-left: 12rpx;color:#ccc;font-size: 12px">厘米</text>
150 150 </template>
151 151 </tui-form-item>
152 152 </tui-col>
... ... @@ -155,20 +155,20 @@
155 155  
156 156 <tui-row>
157 157 <tui-col :span="12">
158   - <tui-form-item label="东西冠幅" prop="canopyeastwest" :position="3">
159   - <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
  158 + <tui-form-item label="东西冠幅" prop="canopyeastwest" :position="2">
  159 + <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10"
160 160 v-model="formData.canopyeastwest"></tui-input>
161 161 <template v-slot:right>
162   - <text style="padding-left: 12rpx;color:#ccc">米</text>
  162 + <text style="padding-left: 12rpx;color:#ccc;font-size: 12px">米</text>
163 163 </template>
164 164 </tui-form-item>
165 165 </tui-col>
166 166 <tui-col :span="12">
167   - <tui-form-item label="南北冠幅" prop="canopysouthnorth" :position="3">
168   - <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
  167 + <tui-form-item label="南北冠幅" prop="canopysouthnorth" :position="2">
  168 + <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10"
169 169 v-model="formData.canopysouthnorth"></tui-input>
170 170 <template v-slot:right>
171   - <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">米</text>
  171 + <text style="padding-left: 12rpx;color:#ccc;font-size: 12px">米</text>
172 172 </template>
173 173 </tui-form-item>
174 174 </tui-col>
... ... @@ -416,16 +416,17 @@ export default {
416 416 // 打开地图选择
417 417 openMap() {
418 418 // 如果已有位置信息,默认显示该位置,否则使用当前位置
419   - const options = {
420   - latitude: this.formData.latitude ? Number(this.formData.latitude) : '',
421   - longitude: this.formData.longitude ? Number(this.formData.longitude) : '',
422   - scale: 16, // 地图缩放级别
423   - name: this.formData.growlocation || '', // 位置名称
424   - address: this.formData.growlocation || '' // 详细地址
425   - };
  419 +
  420 + // const options = {
  421 + // latitude: this.formData.latitude ? Number(this.formData.latitude) : '116.359080',
  422 + // longitude: this.formData.longitude ? Number(this.formData.longitude) : '39.882889',
  423 + // scale: 16, // 地图缩放级别
  424 + // name: this.formData.growlocation || '', // 位置名称
  425 + // address: this.formData.growlocation || '' // 详细地址
  426 + // };
426 427 // 调用微信小程序地图选择API
427 428 uni.chooseLocation({
428   - ...options,
  429 + // ...options,
429 430 success: (res) => {
430 431 console.log(res)
431 432 // 选择成功后更新位置信息
... ...
subPackages/treePage/editTreeIfo.vue
... ... @@ -9,17 +9,17 @@
9 9 <tui-row>
10 10  
11 11 <tui-col :span="12">
12   - <tui-form-item label="胸径" asterisk prop="dbh" :position="3">
13   - <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
  12 + <tui-form-item label="胸径" asterisk prop="dbh" :position="2">
  13 + <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10"
14 14 v-model="formData.dbh"></tui-input>
15 15 <template v-slot:right>
16   - <text style="padding-left: 12rpx;color:#ccc;font-size:14px">米</text>
  16 + <text style="padding-left: 12rpx;color:#ccc;font-size:14px">米</text>
17 17 </template>
18 18 </tui-form-item>
19 19 </tui-col>
20 20 <tui-col :span="12">
21   - <tui-form-item label="高度" prop="treeheight" :position="3">
22   - <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
  21 + <tui-form-item label="高度" prop="treeheight" :position="2">
  22 + <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10"
23 23 v-model="formData.treeheight"></tui-input>
24 24 <template v-slot:right>
25 25 <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
... ... @@ -47,7 +47,7 @@
47 47 class="location-form-item"
48 48 prop="latitude"
49 49 >
50   - <span style="color: #ccc"> {{ formData.longitude }}</span>
  50 + <span style="color: #ccc;font-size: 14px"> {{ formData.longitude }}</span>
51 51 </tui-form-item>
52 52 </tui-col>
53 53  
... ... @@ -56,10 +56,9 @@
56 56 labelColor="#ccc"
57 57 label="纬度"
58 58 class="location-form-item"
59   -
60 59 prop="latitude"
61 60 >
62   - <span style="color: #ccc"> {{ formData.latitude }}</span>
  61 + <span style="color: #ccc;font-size: 14px"> {{ formData.latitude }}</span>
63 62 </tui-form-item>
64 63 </tui-col>
65 64  
... ... @@ -142,20 +141,20 @@
142 141  
143 142 <tui-row>
144 143 <tui-col :span="12">
145   - <tui-form-item label="预估树龄" prop="estimationtreeage" :position="3">
146   - <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
  144 + <tui-form-item label="预估树龄" prop="estimationtreeage" :position="2">
  145 + <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10"
147 146 v-model="formData.estimationtreeage"></tui-input>
148 147 <template v-slot:right>
149   - <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">年</text>
  148 + <text style="padding-left: 12rpx;color:#ccc;font-size: 12px">年</text>
150 149 </template>
151 150 </tui-form-item>
152 151 </tui-col>
153 152 <tui-col :span="12">
154   - <tui-form-item label="干周" prop="weekday" :position="3">
155   - <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
  153 + <tui-form-item label="干周" prop="weekday" :position="2">
  154 + <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10"
156 155 v-model="formData.weekday"></tui-input>
157 156 <template v-slot:right>
158   - <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">厘米</text>
  157 + <text style="padding-left: 12rpx;color:#ccc;font-size: 12px">厘米</text>
159 158 </template>
160 159 </tui-form-item>
161 160 </tui-col>
... ... @@ -164,8 +163,8 @@
164 163  
165 164 <tui-row>
166 165 <tui-col :span="12">
167   - <tui-form-item label="东西冠幅" prop="canopyeastwest" :position="3">
168   - <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
  166 + <tui-form-item label="东西冠幅" prop="canopyeastwest" :position="2">
  167 + <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10"
169 168 v-model="formData.canopyeastwest"></tui-input>
170 169 <template v-slot:right>
171 170 <text style="padding-left: 12rpx;color:#ccc">米</text>
... ... @@ -173,11 +172,11 @@
173 172 </tui-form-item>
174 173 </tui-col>
175 174 <tui-col :span="12">
176   - <tui-form-item label="南北冠幅" prop="canopysouthnorth" :position="3">
177   - <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
  175 + <tui-form-item label="南北冠幅" prop="canopysouthnorth" :position="2">
  176 + <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10"
178 177 v-model="formData.canopysouthnorth"></tui-input>
179 178 <template v-slot:right>
180   - <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">米</text>
  179 + <text style="padding-left: 12rpx;color:#ccc;font-size: 12px">米</text>
181 180 </template>
182 181 </tui-form-item>
183 182 </tui-col>
... ... @@ -427,7 +426,8 @@ export default {
427 426 console.log(res)
428 427 if (res.code == '200') {
429 428 uni.showToast({title: "修改成功", icon: "none"});
430   - uni.$tui.href(`/subPackages/treePage/treeRecord?roadId=${this.formData.road}`)
  429 + // uni.$tui.href(`/subPackages/treePage/treeRecord?roadId=${this.formData.road}`)
  430 + uni.$tui.href(`/subPackages/treePage/treeFiles`)
431 431 }
432 432 })
433 433 } else {
... ...
subPackages/treePage/treeFiles.vue
... ... @@ -61,12 +61,12 @@
61 61  
62 62 <p class="fs-flex__between">
63 63 <span class="fs-ellipsis">{{ i.roadName }}</span>
64   - <span class="treeCount ">{{ i.treeCount }}</span>
  64 + <span class="treeCount ">{{ i.treeCount }}</span>
65 65 </p>
66 66  
67   - <p class="fs-ellipsis fs-my8">已录入行道树:{{ i.recordedCount }}颗</p>
68   - <p class="fs-ellipsis fs-my8" style="color: #999">起点:{{ i.startRemark }}</p>
69   - <p class="fs-ellipsis " style="color: #999">终点:{{ i.endRemark }}</p>
  67 + <p class="fs-ellipsis fs-my8">已录入行道树:{{ i.recordedCount }}棵</p>
  68 + <p class="fs-ellipsis fs-my8" style="color: #999;font-size: 12px">起点:{{ i.startRemark }}</p>
  69 + <p class="fs-ellipsis " style="color: #999;font-size: 12px">终点:{{ i.endRemark }}</p>
70 70  
71 71 </view>
72 72 </view>
... ... @@ -204,6 +204,7 @@ export default {
204 204 width: 220rpx;
205 205 height: 100%;
206 206 background: #f3f3f3;
  207 + font-size: 14px;
207 208 }
208 209  
209 210 .right-con {
... ... @@ -211,6 +212,7 @@ export default {
211 212 height: 100%;
212 213 background: #fff;
213 214 overflow: hidden;
  215 + font-size: 14px;
214 216 }
215 217  
216 218 .teamsItem {
... ...
subPackages/treePage/treeInfo.vue
... ... @@ -9,21 +9,21 @@
9 9 <tui-row>
10 10  
11 11 <tui-col :span="12">
12   - <tui-form-item label="胸径" asterisk prop="dbh" :position="3">
13   - <tui-input padding="0" :borderBottom="false" placeholder="" textRight maxlength="10" :disabled="true"
  12 + <tui-form-item label="胸径" asterisk prop="dbh" :position="2">
  13 + <tui-input padding="0" :borderBottom="false" placeholder="" maxlength="10" :disabled="true"
14 14 v-model="formData.dbh"></tui-input>
15 15 <template v-slot:right>
16   - <text style="padding-left: 12rpx;color:#ccc;font-size:14px">厘米</text>
  16 + <text style="padding-left: 12rpx;color:#ccc;font-size:12px">米</text>
17 17 </template>
18 18 </tui-form-item>
19 19 </tui-col>
20 20  
21 21 <tui-col :span="12">
22   - <tui-form-item label="高度" prop="treeheight" :position="3">
23   - <tui-input padding="0" :borderBottom="false" placeholder="" textRight maxlength="10" :disabled="true"
  22 + <tui-form-item label="高度" prop="treeheight" :position="2">
  23 + <tui-input padding="0" :borderBottom="false" placeholder="" maxlength="10" :disabled="true"
24 24 v-model="formData.treeheight"></tui-input>
25 25 <template v-slot:right>
26   - <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
  26 + <text style="padding-left: 12rpx;color:#ccc;font-size:12px;">米</text>
27 27 </template>
28 28 </tui-form-item>
29 29 </tui-col>
... ... @@ -50,7 +50,7 @@
50 50 prop="latitude"
51 51 labelColor="#ccc"
52 52 >
53   - <span style="color: #ccc"> {{ formData.longitude }}</span>
  53 + <span style="color: #ccc;font-size: 14px"> {{ formData.longitude }}</span>
54 54 </tui-form-item>
55 55 </tui-col>
56 56  
... ... @@ -61,7 +61,7 @@
61 61 labelColor="#ccc"
62 62 prop="latitude"
63 63 >
64   - <span style="color: #ccc"> {{ formData.latitude }}</span>
  64 + <span style="color: #ccc;font-size: 14px"> {{ formData.latitude }}</span>
65 65 </tui-form-item>
66 66 </tui-col>
67 67  
... ... @@ -145,20 +145,20 @@
145 145  
146 146 <tui-row>
147 147 <tui-col :span="12">
148   - <tui-form-item label="预估树龄" prop="estimationtreeage" :position="3">
149   - <tui-input padding="0" :borderBottom="false" placeholder="" textRight maxlength="10" :disabled="true"
  148 + <tui-form-item label="预估树龄" prop="estimationtreeage" :position="2">
  149 + <tui-input padding="0" :borderBottom="false" placeholder="" maxlength="10" :disabled="true"
150 150 v-model="formData.estimationtreeage"></tui-input>
151 151 <template v-slot:right>
152   - <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">年</text>
  152 + <text style="padding-left: 12rpx;color:#ccc;font-size: 12px">年</text>
153 153 </template>
154 154 </tui-form-item>
155 155 </tui-col>
156 156 <tui-col :span="12">
157   - <tui-form-item label="干周" prop="weekday" :position="3">
158   - <tui-input padding="0" :borderBottom="false" placeholder="" textRight maxlength="10" :disabled="true"
  157 + <tui-form-item label="干周" prop="weekday" :position="2">
  158 + <tui-input padding="0" :borderBottom="false" placeholder="" maxlength="10" :disabled="true"
159 159 v-model="formData.weekday"></tui-input>
160 160 <template v-slot:right>
161   - <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">厘米</text>
  161 + <text style="padding-left: 12rpx;color:#ccc;font-size: 12px">厘米</text>
162 162 </template>
163 163 </tui-form-item>
164 164 </tui-col>
... ... @@ -167,20 +167,20 @@
167 167  
168 168 <tui-row>
169 169 <tui-col :span="12">
170   - <tui-form-item label="东西冠幅" prop="canopyeastwest" :position="3">
171   - <tui-input padding="0" :borderBottom="false" placeholder="" textRight maxlength="10" :disabled="true"
  170 + <tui-form-item label="东西冠幅" prop="canopyeastwest" :position="2">
  171 + <tui-input padding="0" :borderBottom="false" placeholder="" maxlength="10" :disabled="true"
172 172 v-model="formData.canopyeastwest"></tui-input>
173 173 <template v-slot:right>
174   - <text style="padding-left: 12rpx;color:#ccc">米</text>
  174 + <text style="padding-left: 12rpx;color:#ccc;font-size: 12px">米</text>
175 175 </template>
176 176 </tui-form-item>
177 177 </tui-col>
178 178 <tui-col :span="12">
179   - <tui-form-item label="南北冠幅" prop="canopysouthnorth" :position="3">
180   - <tui-input padding="0" :borderBottom="false" placeholder="" textRight maxlength="10" :disabled="true"
  179 + <tui-form-item label="南北冠幅" prop="canopysouthnorth" :position="2">
  180 + <tui-input padding="0" :borderBottom="false" placeholder="" maxlength="10" :disabled="true"
181 181 v-model="formData.canopysouthnorth"></tui-input>
182 182 <template v-slot:right>
183   - <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">米</text>
  183 + <text style="padding-left: 12rpx;color:#ccc;font-size: 12px">米</text>
184 184 </template>
185 185 </tui-form-item>
186 186 </tui-col>
... ...