xthyg
/
jq_miniApp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	subPackWork/commandDispatch/commandDispatchDetail.vue
#	subPackWork/myReport/reportDetail.vue
master
Tuzki 2 years ago
parent 0773da7143 a0fa0796ff
commit 641c47a4e6
10 changed files with 27 additions and 38 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      components/evan-steps/evan-step.vue
  2. 4
      pages/work/index.vue
  3. 4
      static/scss/custom.scss
  4. 4
      subPackDeatil/ticketAnalysis/index.vue
  5. 16
      subPackWork/commandDispatch/commandDispatchDetail.vue
  6. 12
      subPackWork/electronicPatrol/electronicPatrol.vue
  7. 9
      subPackWork/electronicPatrol/taskDetails.vue
  8. 2
      subPackWork/equipmentManagement/equipmentEdit.vue
  9. 8
      subPackWork/myReport/reportDetail.vue
  10. 2
      subPackWork/scenicSpot/scenicSpot.vue

4
components/evan-steps/evan-step.vue
Unescape View File

@ -464,7 +464,5 @@
.evan-step__content__description--horizontal {
text-align: center;
}
.step-items:first-child {
margin-left: 400rpx;
}
</style>

4
pages/work/index.vue
Unescape View File

@ -87,9 +87,11 @@
<view class="v-card-item">
<view class="v-card-box">
<common-title :title="'告警趋势'"></common-title>
<view class="v-aram-charts">
<view style="overflow-x: scroll;">
<view class="v-aram-charts" style="width: 800px;">
<qiun-data-charts :chartData="chartData" :opts="chartOpts" type="area" />
</view>
</view>
</view>
</view>
</view>

4
static/scss/custom.scss
Unescape View File

@ -33,6 +33,9 @@
}
.v-m-b20{
margin-bottom: 40rpx!important;
}
.v-m-l8{
margin-left: 16rpx!important;
}
.v-m-l4{
margin-left: 8rpx!important;
@ -130,6 +133,7 @@ top:0;left: 0; width: 100%;background: linear-gradient(to right,rgba(54,127,255,
display: flex;
}
.v-card-image{
position: relative;
width: 120rpx;
height: 120rpx;overflow: hidden;
border: 1px solid rgba(0,0,0,.05);

4
subPackDeatil/ticketAnalysis/index.vue
Unescape View File

@ -26,8 +26,8 @@
<view class="bottom">
<uni-table ref="table" class="v-table" emptyText="暂无更多数据">
<uni-tr>
<uni-th width="150" align="center">维度</uni-th>
<uni-th width="150" align="center">{{ appointmentData.otherTitle[0] }}</uni-th>
<uni-th width="100" align="center">维度</uni-th>
<uni-th width="130" align="center">{{ appointmentData.otherTitle[0] }}</uni-th>
<uni-th align="center">{{ appointmentData.otherTitle[1] }}</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in appointmentData.other" :key="index">

16
subPackWork/commandDispatch/commandDispatchDetail.vue
Unescape View File

@ -1,17 +1,14 @@
<template>
<view class="v-page">
<view class="v-page-bg" style="height: 300rpx;"></view>
<view class="v-card contain">
<view class="v-card-item">
<view class="status-top">
<button class="v-btn v-btn-primary-b" size="mini" @click="goList">处理记录</button>
<view class="v-page-bg" style="height: 300rpx;"></view>
<view class="v-card contain" style="padding-bottom: 130rpx;">
<view class="v-step-box">
<view class="align-right v-m-t8 v-m-b8">
<view @click="goList" class="v-btn v-btn-primary-b ">处理记录</view>
</view>
<view class="status-bottom">
<evan-steps :active="datas.status-1" direction="horizontal">
<evan-step class="step-items" v-for="item in processState" :title="item.dictLabel"></evan-step>
<!-- <evan-step title="处警"></evan-step>
<evan-step title="结警"></evan-step>
<evan-step title="归档"></evan-step> -->
</evan-steps>
</view>
</view>
@ -310,6 +307,7 @@
}
.step-items:first-child {
margin-left: 300rpx;
margin-left: 400rpx;
}
</style>

12
subPackWork/electronicPatrol/electronicPatrol.vue
Unescape View File

@ -6,11 +6,12 @@
</view>
<view class="v-card contain">
<view class="v-card-item" v-for="item in jobList">
<view class="v-card-box" style="padding-bottom: 40rpx;">
<view class="v-card-box">
<view class="row">
<view class="v-card-content flex-auto">
<view class="v-card-title">{{ item.patrolTaskName }}</view>
<view class="v-card-tip">开始时间：{{ item.startDate }}</view>
<view class="v-card-tip">完成度：{{ item.completeness }}</view>
</view>
<view class="v-card-right text-center">
<view class="v-state-text v-m-b4" :class="item.taskState == '已完成' ? 'type1' : 'type5'">{{ item.taskState }}</view>
@ -18,14 +19,7 @@
:class="item.statusDesign == '即将开始' ? 'v-btn-info' : 'v-btn-primary'">{{ item.statusDesign }}</button>
</view>
</view>
<view class="v-bar" style="margin-top: 30rpx;">
<view class="v-bar-dot" :style="{'left':item.completeness}">
<image class="v-bar-image" src="@/static/images/icons/icon-bar.svg">
</image>
<view class="v-bar-text font-primary v-m-t2">{{item.completeness}}</view>
</view>
<view class="v-bar-inner" :style="{'width':item.completeness}"></view>
</view>
</view>
</view>
</view>

9
subPackWork/electronicPatrol/taskDetails.vue
Unescape View File

@ -8,14 +8,7 @@
<text class="v-state-text" :class="job.taskState == '已完成' ? 'type1' : 'type5'">{{ job.taskState }}</text>
</view>
<view class="v-card-tip">开始时间：{{ job.startDate }}</view>
<view class="v-bar" style="margin: 30rpx 0;">
<view class="v-bar-dot" :style="{'left':job.completeness}">
<image class="v-bar-image" src="@/static/images/icons/icon-bar.svg">
</image>
<view class="v-bar-text font-primary v-m-t2">{{job.completeness}}</view>
</view>
<view class="v-bar-inner" :style="{'width':job.completeness}"></view>
</view>
<view class="v-card-tip">完成度：{{ job.completeness }}</view>
<view class="row v-m-t10">
<view class="col-6">
<view @click="goPerson(job.id)" class="v-btn block v-btn-primary v-m-r4 text-center">

2
subPackWork/equipmentManagement/equipmentEdit.vue
Unescape View File

@ -70,7 +70,7 @@
</evan-form>
</view>
<view class="v-page-button contain">
<button class="v-btn-large" @click="save">保存</button>
<button class="v-btn-large" style="width: 100%;" @click="save">保存</button>
</view>
</view>
</template>

8
subPackWork/myReport/reportDetail.vue
Unescape View File

@ -3,7 +3,7 @@
<view class="v-page-bg" style="height: 300rpx;"></view>
<view class="v-card contain">
<view class="v-card-item">
<view class="status-top">
<view class="status-top align-right">
<button class="v-btn v-btn-primary-b" size="mini" @click="goList">处理记录</button>
</view>
<view class="status-bottom">
@ -240,8 +240,8 @@
}
}
}
.step-items:first-child{
margin-left: 300rpx;
}
.step-items:first-child {
margin-left: 400rpx;
}
</style>

2
subPackWork/scenicSpot/scenicSpot.vue
Unescape View File

@ -22,7 +22,7 @@
<image style="width: 180px; height: 180px; background-color: #eeeeee"
:mode="'center'" :src="baseUrls + item.imageUrl.split(',')[0]"></image>
</view>
<view class="v-card-image" v-else>暂无图片</view>
<view class="v-card-image" v-else><image style="width: 200px; height: 150px;" mode="widthFix" src="@/static/images/icons/no-pic.jpg"></image><text class="v-no-text">暂无图片</text></view>
<view class="v-card-content">
<view class="v-card-title">{{ item.resourceName || '/' }}</view>
<view class="v-card-tip">所属景区：{{ item.scenicArea || '/' }}</view>

Write Preview
Loading…
Cancel
Save