JCSS / yl_miniapp

Commit f883eafaae0929d5251b874032bff2f487f74d70

Authored by 刘淇
1 parent b56bb97b

首次加载

Inline Side-by-side
Showing 6 changed files with 39 additions and 22 deletions
pages/work/case/maintain.vue
  View file @f883eaf
... ... @@ -29,8 +29,8 @@
29 29 </view>
30 30 </view>
31 31 <view class="fs-mt16 fs-flex__between">
32   - <view>养护类型：{{item.maintainTypeName}}</view>
33   - <view>植物类型：{{item.plantTypeName}}</view>
  32 + <view class="fs-ellipsis fs-mr20">养护类型：{{item.maintainTypeName}}</view>
  33 + <view class="fs-ellipsis fs-flex__1">植物类型：{{item.plantTypeName}}</view>
34 34 </view>
35 35 <view class="fs-mt16">道路名称：{{item.roadName}}</view>
36 36 <view class="fs-mt16 fs-ellipsis__2">任务描述：{{item.taskRemark}}</view>
... ...
pages/work/case/manage.vue
  View file @f883eaf
... ... @@ -24,8 +24,8 @@
24 24 </view>
25 25 </view>
26 26 <view class="fs-mt16 fs-flex__between">
27   - <view>养护类型：{{item.maintainTypeName}}</view>
28   - <view>植物类型：{{item.plantTypeName}}</view>
  27 + <view class="fs-ellipsis fs-mr20">养护类型：{{item.maintainTypeName}}</view>
  28 + <view class="fs-ellipsis fs-flex__1">植物类型：{{item.plantTypeName}}</view>
29 29 </view>
30 30 <view class="fs-mt16">道路名称：{{item.roadName}}</view>
31 31 <view class="fs-mt16 fs-ellipsis__2">任务描述：{{item.taskRemark}}</view>
... ...
subPackages/treePage/addTree.vue
  View file @f883eaf
... ... @@ -52,7 +52,9 @@
52 52 prop="latitude"
53 53 :bottomBorder="false"
54 54 >
55   - <span style="color: #ccc;font-size: 14px"> {{ formData.longitude }}</span>
  55 + <tui-input padding="0" :borderBottom="false" placeholder="" disabled
  56 + v-model="formData.longitude"></tui-input>
  57 +<!-- <span style="color: #ccc;font-size: 14px"> {{ formData.longitude }}</span>-->
56 58 </tui-form-item>
57 59 </tui-col>
58 60 <tui-col :span="12">
... ... @@ -63,7 +65,9 @@
63 65 class="location-form-item"
64 66 prop="latitude"
65 67 >
66   - <span style="color: #ccc;font-size: 14px"> {{ formData.latitude }}</span>
  68 + <tui-input padding="0" :borderBottom="false" placeholder="" disabled
  69 + v-model="formData.latitude"></tui-input>
  70 +<!-- <span style="color: #ccc;font-size: 14px"> {{ formData.latitude }}</span>-->
67 71 </tui-form-item>
68 72 </tui-col>
69 73  
... ...
subPackages/treePage/editTreeIfo.vue
  View file @f883eaf
... ... @@ -47,7 +47,9 @@
47 47 class="location-form-item"
48 48 prop="latitude"
49 49 >
50   - <span style="color: #ccc;font-size: 14px"> {{ formData.longitude }}</span>
  50 +<!-- <span style="color: #ccc;font-size: 14px"> {{ formData.longitude }}</span>-->
  51 + <tui-input padding="0" :borderBottom="false" placeholder="" disabled
  52 + v-model="formData.longitude"></tui-input>
51 53 </tui-form-item>
52 54 </tui-col>
53 55  
... ... @@ -58,7 +60,9 @@
58 60 class="location-form-item"
59 61 prop="latitude"
60 62 >
61   - <span style="color: #ccc;font-size: 14px"> {{ formData.latitude }}</span>
  63 +<!-- <span style="color: #ccc;font-size: 14px"> {{ formData.latitude }}</span>-->
  64 + <tui-input padding="0" :borderBottom="false" placeholder="" disabled
  65 + v-model="formData.latitude"></tui-input>
62 66 </tui-form-item>
63 67 </tui-col>
64 68  
... ... @@ -192,7 +196,7 @@
192 196 height="80rpx"
193 197 plain
194 198 >
195   - {{ isShow ? '- 隐藏区域' : '+ 显示区域' }}
  199 + {{ isShow ? '- 隐藏更多属性' : '+ 展示更多属性' }}
196 200 </tui-button>
197 201 </tui-form>
198 202 <view style="height: 60px;width: 100%"></view>
... ...
subPackages/treePage/treeFiles.vue
  View file @f883eaf
1 1 <template>
2 2 <view class="container">
3 3 <tui-form ref="form" :show-message="false" :model="formData" style="border-bottom: 1px solid #f5f4f4">
4   - <tui-form-item arrow highlight prop="companyId" :bottom-border="false" @click="pickerShow" label="归属单位" >
  4 + <tui-form-item arrow highlight prop="companyId" :bottom-border="false" @click="pickerShow" label="归属单位">
5 5 <tui-input padding="0" :borderBottom="false" placeholder="请选择归属单位" disabled
6 6 backgroundColor="transparent" v-model="formData.companyId"></tui-input>
7 7 </tui-form-item>
8 8 </tui-form>
9 9  
10   - <tui-searchbar radius="40rpx" height="64rpx" placeholder="请输入道路名称" @search="getSeach" @clear="setSeach"></tui-searchbar>
  10 + <tui-searchbar radius="40rpx" height="64rpx" placeholder="请输入道路名称" @search="getSeach"
  11 + @clear="setSeach"></tui-searchbar>
11 12  
12 13  
13 14 <view class="full-height-row">
... ... @@ -21,7 +22,7 @@
21 22 </view>
22 23 </view>
23 24 <view class="full-height-col right-con">
24   - <view class="nodata-wrap" v-if="roads.length==0">
  25 + <view class="nodata-wrap" v-if="!hasValidRoadId">
25 26 <img src="/static/images/nodata.png" alt="">
26 27 <view style="color: #aaa">暂无数据</view>
27 28  
... ... @@ -41,7 +42,7 @@
41 42  
42 43 </view>
43 44 </view>
44   -
  45 +
45 46 </view>
46 47 </view>
47 48  
... ... @@ -71,13 +72,12 @@ export default {
71 72 companyId: '',// 归属公司
72 73 depts: [],// 归属班组
73 74 roads: [], // 道路树
74   -
  75 + hasValidRoadId: false
75 76 }
76 77 },
77 78 onLoad() {
78   -
79 79 },
80   - onShow(){
  80 + onShow() {
81 81 // 归属公司
82 82 belongCompanyreq().then(res => {
83 83 this.belongCompanyData = res.data
... ... @@ -113,11 +113,14 @@ export default {
113 113 } else {
114 114 this.depts = res.data[0].depts
115 115 this.roads = this.depts[this.currentIndex].roads
  116 + this.hasValidRoadId = this.roads && this.roads.some(item =>
  117 + item.roadId !== null && item.roadId !== undefined
  118 + );
  119 + console.log(this.hasValidRoadId)
116 120 }
117 121 // this.treeRoadQuery()
118 122 })
119 123 },
120   -
121 124 // 班组切换
122 125 teamsChange(i) {
123 126 console.log(i)
... ... @@ -213,11 +216,13 @@ export default {
213 216 min-width: 70px;
214 217 text-align: right;
215 218 }
216   -::v-deep tui-search-bar__labe{
217   - justify-content: left!important;
218   - padding-left: 15px!important;
  219 +
  220 +::v-deep tui-search-bar__labe {
  221 + justify-content: left !important;
  222 + padding-left: 15px !important;
219 223  
220 224 }
  225 +
221 226 .custom-searchbar ::v-deep .tui-searchbar__input {
222 227 text-align: left !important;
223 228 justify-content: left;
... ...
subPackages/treePage/treeInfo.vue
  View file @f883eaf
... ... @@ -50,7 +50,9 @@
50 50 prop="latitude"
51 51 labelColor="#ccc"
52 52 >
53   - <span style="color: #ccc;font-size: 14px"> {{ formData.longitude }}</span>
  53 + <tui-input padding="0" :borderBottom="false" placeholder="" disabled
  54 + v-model="formData.longitude"></tui-input>
  55 +<!-- <span style="color: #ccc;font-size: 14px"> {{ formData.longitude }}</span>-->
54 56 </tui-form-item>
55 57 </tui-col>
56 58  
... ... @@ -61,7 +63,9 @@
61 63 labelColor="#ccc"
62 64 prop="latitude"
63 65 >
64   - <span style="color: #ccc;font-size: 14px"> {{ formData.latitude }}</span>
  66 + <tui-input padding="0" :borderBottom="false" placeholder="" disabled
  67 + v-model="formData.latitude"></tui-input>
  68 +<!-- <span style="color: #ccc;font-size: 14px"> {{ formData.latitude }}</span>-->
65 69 </tui-form-item>
66 70 </tui-col>
67 71  
... ...