jufubao-admin-library 1.1.134 → 1.1.135

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -228,7 +228,8 @@ module.exports = {
228
228
  isRule: false,
229
229
  data: {
230
230
  id:['点位ID', 'string', '必填'],
231
- map_point_color:['map_point_color', 'string', '必填'],
231
+ map_point_color:['地图点位颜色(已到达点位)', 'string', '必填'],
232
+ map_point_color_for_no_arrived:['地图点位颜色(未到达点位)', 'string', '必填'],
232
233
  },
233
234
  disabled: true,
234
235
  role: '',
@@ -30,8 +30,12 @@
30
30
  ></el-slider>
31
31
  </div>
32
32
  <div class="btn-item">
33
- <span>点位颜色:</span>
34
- <el-color-picker v-model="color" size="small" @change="handleColorChange"></el-color-picker>
33
+ <span>未到达点位颜色:</span>
34
+ <el-color-picker v-model="noArriveColor" size="small" @change="e => handleColorChange(e)"></el-color-picker>
35
+ </div>
36
+ <div class="btn-item">
37
+ <span>到达点位颜色:</span>
38
+ <el-color-picker v-model="color" size="small" @change="e => handleColorChange(e)"></el-color-picker>
35
39
  </div>
36
40
  </div>
37
41
  <div class="right">
@@ -120,6 +124,7 @@ export default {
120
124
 
121
125
  //页面可编辑数据
122
126
  color:'rgb(52, 152, 219)',
127
+ noArriveColor:'#999999',
123
128
  name:'',
124
129
  status:'Y',
125
130
  backgroundImage:'',
@@ -247,6 +252,7 @@ export default {
247
252
  this.getImageInfo(backgroundImage,()=>{
248
253
  this.radius = info['map_point_size'] || 43;
249
254
  this.color = info['map_point_color'] || '#3498db';
255
+ this.noArriveColor = info['map_point_color_for_no_arrived'] || '#999999';
250
256
  this.name = info['map_name'];
251
257
  this.backgroundImage = backgroundImage;
252
258
  loading.close()
@@ -482,7 +488,12 @@ export default {
482
488
  handleColorChange(e){
483
489
  console.log(e,'eee')
484
490
  if(e){
485
- this.walkingPointColor({id:this.map_id,map_point_color:e})
491
+ let data = {
492
+ id: this.map_id,
493
+ map_point_color_for_no_arrived: this.noArriveColor,
494
+ map_point_color: this.color
495
+ };
496
+ this.walkingPointColor(data)
486
497
  .then(res=>{
487
498
  this.$message.success('修改点位颜色成功')
488
499
  })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-admin-library",
3
- "version": "1.1.134",
3
+ "version": "1.1.135",
4
4
  "description": "聚福宝福利后台管理系统公共模块",
5
5
  "author": "goashiyong <gaoshiyong1272@vip.163.com>",
6
6
  "scripts": {