Commit fa7a1f8d765bab6e9edcba9252184697e132247b
1 parent
731c8689
首页完善
Showing
8 changed files
with
19 additions
and
8 deletions
pages.json
pages/index.vue
| @@ -116,7 +116,12 @@ export default { | @@ -116,7 +116,12 @@ export default { | ||
| 116 | value: 0, | 116 | value: 0, |
| 117 | color: '#f59e0b', | 117 | color: '#f59e0b', |
| 118 | name: '施肥' | 118 | name: '施肥' |
| 119 | - } | 119 | + }, |
| 120 | + { | ||
| 121 | + value: 0, | ||
| 122 | + color: '#999', | ||
| 123 | + name: '树池篦子' | ||
| 124 | + } | ||
| 120 | ], | 125 | ], |
| 121 | staffSummary: 7, | 126 | staffSummary: 7, |
| 122 | staffSummaryList: { | 127 | staffSummaryList: { |
| @@ -162,9 +167,12 @@ export default { | @@ -162,9 +167,12 @@ export default { | ||
| 162 | const beginTime = moment().subtract(type, 'days').format('YYYY-MM-DD 00:00:00') | 167 | const beginTime = moment().subtract(type, 'days').format('YYYY-MM-DD 00:00:00') |
| 163 | const endTime = moment().format('YYYY-MM-DD 23:59:59') | 168 | const endTime = moment().format('YYYY-MM-DD 23:59:59') |
| 164 | apiSummaryType({data:{beginTime, endTime}}).then(res => { | 169 | apiSummaryType({data:{beginTime, endTime}}).then(res => { |
| 170 | + // console.log(res.data) | ||
| 165 | res.data.forEach((item, index) => { | 171 | res.data.forEach((item, index) => { |
| 172 | + console.log(this.summaryTypeList[index]) | ||
| 166 | this.summaryTypeList[index].value = item.countNum | 173 | this.summaryTypeList[index].value = item.countNum |
| 167 | }) | 174 | }) |
| 175 | + // console.log(this.summaryTypeList) | ||
| 168 | this.$refs.tui_charts_pie.draw(this.summaryTypeList) | 176 | this.$refs.tui_charts_pie.draw(this.summaryTypeList) |
| 169 | }) | 177 | }) |
| 170 | }, | 178 | }, |
pages/mine/setting/setting.vue
| 1 | <template> | 1 | <template> |
| 2 | <view class="container"> | 2 | <view class="container"> |
| 3 | <tui-list-cell arrow :size="32" :hover="false" padding="30rpx" @click="toSetPwd">修改密码</tui-list-cell> | 3 | <tui-list-cell arrow :size="32" :hover="false" padding="30rpx" @click="toSetPwd">修改密码</tui-list-cell> |
| 4 | - <tui-list-cell arrow :size="32" :hover="false" padding="30rpx" @click="displayModal('upgradation')">检查更新</tui-list-cell> | 4 | +<!-- <tui-list-cell arrow :size="32" :hover="false" padding="30rpx" @click="displayModal('upgradation')">检查更新</tui-list-cell>--> |
| 5 | <tui-list-cell arrow unlined :size="32" :hover="false" padding="30rpx" @click="displayModal('clearCache')"> | 5 | <tui-list-cell arrow unlined :size="32" :hover="false" padding="30rpx" @click="displayModal('clearCache')"> |
| 6 | <view class="fs-flex__between fs-pr20"> | 6 | <view class="fs-flex__between fs-pr20"> |
| 7 | <view>清理缓存</view><view class="fs-size__h4 fs-color__label">0kb</view> | 7 | <view>清理缓存</view><view class="fs-size__h4 fs-color__label">0kb</view> |
pages/work/index.vue
| @@ -59,7 +59,7 @@ | @@ -59,7 +59,7 @@ | ||
| 59 | </view> | 59 | </view> |
| 60 | <view class="fs-flex__column fs-items__center item" @click="href('/subPackages/treePage/treeFiles')"> | 60 | <view class="fs-flex__column fs-items__center item" @click="href('/subPackages/treePage/treeFiles')"> |
| 61 | <image class="fs-mb10 icon" src="/static/images/work/itmeHometree.png"></image> | 61 | <image class="fs-mb10 icon" src="/static/images/work/itmeHometree.png"></image> |
| 62 | - <text>一树一档案</text> | 62 | + <text>行道树档案</text> |
| 63 | </view> | 63 | </view> |
| 64 | </view> | 64 | </view> |
| 65 | </view> | 65 | </view> |
subPackages/treePage/editTreeIfo.vue
| @@ -167,7 +167,7 @@ | @@ -167,7 +167,7 @@ | ||
| 167 | <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10" | 167 | <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="10" |
| 168 | v-model="formData.canopyeastwest"></tui-input> | 168 | v-model="formData.canopyeastwest"></tui-input> |
| 169 | <template v-slot:right> | 169 | <template v-slot:right> |
| 170 | - <text style="padding-left: 12rpx;color:#ccc">米</text> | 170 | + <text style="padding-left: 12rpx;color:#ccc;font-size: 12px">米</text> |
| 171 | </template> | 171 | </template> |
| 172 | </tui-form-item> | 172 | </tui-form-item> |
| 173 | </tui-col> | 173 | </tui-col> |
subPackages/treePage/treeFiles.vue
| @@ -164,8 +164,11 @@ export default { | @@ -164,8 +164,11 @@ export default { | ||
| 164 | this.show = false | 164 | this.show = false |
| 165 | }, | 165 | }, |
| 166 | pickerChange(e) { | 166 | pickerChange(e) { |
| 167 | - console.log(e) | 167 | + |
| 168 | this.formData.companyId = e.dictLabel | 168 | this.formData.companyId = e.dictLabel |
| 169 | + this.companyId = e.dictValue | ||
| 170 | + console.log(this.companyId) | ||
| 171 | + this.deptListQuery() | ||
| 169 | }, | 172 | }, |
| 170 | } | 173 | } |
| 171 | } | 174 | } |
subPackages/treePage/treeLog.vue
| @@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
| 17 | </view> | 17 | </view> |
| 18 | <view class="fs-mt8 fs-align__center"> | 18 | <view class="fs-mt8 fs-align__center"> |
| 19 | <img src="/static/images/tree/treearound.png" style="width: 14px;height: 14px;margin-right: 6px;" | 19 | <img src="/static/images/tree/treearound.png" style="width: 14px;height: 14px;margin-right: 6px;" |
| 20 | - alt="">胸径：{{ i.dbh }} 厘米 | 20 | + alt="">胸径：{{ i.dbh }} 米 |
| 21 | </view> | 21 | </view> |
| 22 | </view> | 22 | </view> |
| 23 | </view> | 23 | </view> |
subPackages/treePage/treeRecord.vue
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | </view> | 16 | </view> |
| 17 | <view class="fs-mt8 fs-align__center"> | 17 | <view class="fs-mt8 fs-align__center"> |
| 18 | <img src="../../static/images/tree/treearound.png" style="width: 14px;height: 14px;margin-right: 6px;" | 18 | <img src="../../static/images/tree/treearound.png" style="width: 14px;height: 14px;margin-right: 6px;" |
| 19 | - alt="">胸径：{{ i.dbh }} 厘米 | 19 | + alt="">胸径：{{ i.dbh }} 米 |
| 20 | </view> | 20 | </view> |
| 21 | </view> | 21 | </view> |
| 22 | </view> | 22 | </view> |