Merge branch 'master' of F:\workplace-idea\雄鹰轮胎智慧互联云平台\XYTyre with conflicts.

master
Yangwl 1 year ago
parent 024d6645bf
commit de9455c9d9

@ -67,6 +67,7 @@ public class BaseTyreController extends BaseController
ExcelUtil<BaseTyre> util = new ExcelUtil<BaseTyre>(BaseTyre.class);
util.exportExcel(response, list, "轮胎基础数据");
}
@PreAuthorize("@ss.hasPermi('basetyre:tyre:import')")
@Log(title = "轮胎管理", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
@ -184,6 +185,11 @@ public class BaseTyreController extends BaseController
return baseTyreService.TyreUnInstall(carTyres);
}
@PostMapping("/EditPatternTextureDepth")
public AjaxResult EditPatternTextureDepth(@RequestBody CarTyres carTyres){
return baseTyreService.EditPatternTextureDepth(carTyres);
}
@PostMapping("/TyreMileage")
public AjaxResult TyreMileage(@RequestBody CarTyres carTyres){
return baseTyreService.TyreMileage(carTyres);

@ -48,7 +48,17 @@ public class BaseTyreHistoricalRecords extends BaseEntity
@Excel(name = "花纹深度")
private BigDecimal textureDepth;
public void setId(String id)
private int carOnlineMileage;
public int getCarOnlineMileage() {
return carOnlineMileage;
}
public void setCarOnlineMileage(int carOnlineMileage) {
this.carOnlineMileage = carOnlineMileage;
}
public void setId(String id)
{
this.id = id;
}

@ -0,0 +1,10 @@
package com.ruoyi.basetyre.domain.vo;
import lombok.Data;
@Data
public class PatternTextureReport {
private double textureDepth;
private int course;
private Data time;
}

@ -6,6 +6,7 @@ import java.util.Map;
import com.ruoyi.basetyre.domain.BaseTyre;
import com.ruoyi.basetyre.domain.BaseTyreGpsRecord;
import com.ruoyi.basetyre.domain.BaseTyreHistoricalRecords;
import com.ruoyi.basetyre.domain.vo.PatternTextureReport;
/**
* Mapper
@ -67,4 +68,5 @@ public interface BaseTyreHistoricalRecordsMapper
BaseTyreGpsRecord querydata(BaseTyreGpsRecord baseTyreHistoricalRecord);
List<PatternTextureReport> selectPatternTextureReport(BaseTyre baseTyre);
}

@ -80,4 +80,6 @@ public interface IBaseTyreService
String importTyre(List<BaseTyre> baseTyreList, boolean isUpdateSupport, String operName);
AjaxResult TyreMileage(CarTyres carTyres);
AjaxResult EditPatternTextureDepth(CarTyres carTyres);
}

@ -7,6 +7,7 @@ import com.ruoyi.basetyre.domain.BaseTyre;
import com.ruoyi.basetyre.domain.CollectTyresDetail;
import com.ruoyi.basetyre.domain.vo.CarTyres;
//import com.ruoyi.basetyre.domain.vo.QueryParams;
import com.ruoyi.basetyre.domain.vo.PatternTextureReport;
import com.ruoyi.basetyre.domain.vo.SpeedVo;
import com.ruoyi.basetyre.domain.vo.TemperatureAndPressReport;
import com.ruoyi.basetyre.mapper.BaseTyreHistoricalRecordsMapper;
@ -125,18 +126,38 @@ public class BaseTyreHistoricalRecordsServiceImpl implements IBaseTyreHistorical
//查询轮胎的胎温胎压数据
CollectTyresDetail collectTyresDetail=new CollectTyresDetail();
collectTyresDetail.setTyreId(BT.getId());
collectTyresDetail.setParams(baseTyre.getParams());
List<CollectTyresDetail> collectTyresDetailList=collectTyresDetailMapper.select_press_temperature(collectTyresDetail);
List<TemperatureAndPressReport> temperatureAndPressReportList=new ArrayList<>();
int ispresslower=0,istemperaturehigh=0,ispowerinvalue = 0,ispresshigh=0;
for (CollectTyresDetail co:collectTyresDetailList) {
TemperatureAndPressReport temperatureAndPressReport=new TemperatureAndPressReport();
temperatureAndPressReport.setPress(co.getPressvalue());
temperatureAndPressReport.setTemperature(co.getTemperaturevalue());
temperatureAndPressReport.setTime(co.getCreateTime());
temperatureAndPressReportList.add(temperatureAndPressReport);
if (co.getIspowerinvalue()==1){
ispowerinvalue=ispowerinvalue+1;
}
if (co.getIspresslower()==1){
ispresslower=ispresslower+1;
}
if (co.getIspresshigh()==1){
ispresshigh=ispresshigh+1;
}
if (co.getIstemperaturehigh()==1){
istemperaturehigh=istemperaturehigh+1;
}
}
Map warnMap=new HashMap();
warnMap.put("高压报警",ispresshigh);
warnMap.put("低压报警",ispresslower);
warnMap.put("高温报警",istemperaturehigh);
warnMap.put("电池电量报警",ispowerinvalue);
//找此时间段内此轮胎所安装的车辆
List<CarTyres> carTyresList =collectTyresDetailMapper.selectTyreOnCar(baseTyre);
Map map=new HashMap();
if (carTyresList.size()>0){
List<String> carStrList=new ArrayList<>();
for (CarTyres ct:carTyresList) {
@ -148,7 +169,12 @@ public class BaseTyreHistoricalRecordsServiceImpl implements IBaseTyreHistorical
}
//查询车辆GPS数据
temperatureAndPressReportList.sort(Comparator.comparing(TemperatureAndPressReport::getTime));
//里程和花纹深度的变化关系
List<PatternTextureReport> patternTextureReportList =baseTyreHistoricalRecordsMapper.selectPatternTextureReport(baseTyre);
map.put("TPList",temperatureAndPressReportList);
map.put("WarnData",warnMap);
map.put("patternTextureList",patternTextureReportList);
return success(map);
}
}

@ -464,7 +464,6 @@ public class BaseTyreServiceImpl implements IBaseTyreService
try {
return null;
}catch (Exception e){
e.printStackTrace();
@ -473,6 +472,21 @@ public class BaseTyreServiceImpl implements IBaseTyreService
}
@Override
public AjaxResult EditPatternTextureDepth(CarTyres carTyres) {
if (carTyres.getType().equals(4)){
//更新车辆最新的花纹深度
BaseTyre baseTyre = new BaseTyre();
baseTyre.setId(carTyres.getTyreId());
baseTyre.setCurrentTextureDepth(carTyres.getCurrentTextureDepth());
baseTyreMapper.updateBaseTyre(baseTyre);
//插入一条新记录
BaseTyreHistoricalRecords baseTyreHistoricalRecords=new BaseTyreHistoricalRecords();
}
return null;
}
@Override
public BaseTyre getTyreInfoById(String outerTireNumber) {

@ -57,6 +57,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
ORDER BY create_time desc
</select>
<select id="selectPatternTextureReport" parameterType="baseTyre" resultType="com.ruoyi.basetyre.domain.vo.PatternTextureReport">
SELECT
bthr.car_online_mileage AS course,
bthr.texture_depth AS textureDepth,
bthr.create_time AS TIME
FROM
base_tyre_historical_records bthr
LEFT JOIN base_tyre bt ON bt.id= bthr.tyre_id
WHERE
bt.outer_tire_number= #{outerTireNumber}
<if test="params.beginTime != null and params.endTime != null"> and bthr.create_time BETWEEN #{params.beginTime} AND #{params.endTime}</if>
ORDER BY
bthr.create_time ASC
</select>
<insert id="insertBaseTyreHistoricalRecords" parameterType="BaseTyreHistoricalRecords">
insert into base_tyre_historical_records

@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="altitude" column="altitude" />
<result property="speed" column="speed" />
<result property="course" column="course" />
<result property="createTime" column="create_time" />
<result property="createTime" column="createtime" />
<result property="gpsIntensity" column="gps_intensity" />
<result property="gpsSatellites" column="gps_satellites" />
<result property="gpsMileage" column="gps_mileage" />
@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectCollectMachineGpsVo">
select id, machine_id, car_id, car_license, emergency_alarm, speed_alarm, fatigue_driving_alarm, risk_early_alarm, gnss_module, gnss_loss_antenna, gnss_antenna_shortcircuit, main_power_lake, mainpowerloss, accclose, unpositioned, dimensional_n_or_s, longitudinal_e_or_w, d_l_isencryption, latitude, longitude, altitude, speed, course, create_time, gps_intensity, gps_satellites, gps_mileage, is_out_power, car_power, is_sensor_run from collect_machine_gps
select id, machine_id, car_id, car_license, emergency_alarm, speed_alarm, fatigue_driving_alarm, risk_early_alarm, gnss_module, gnss_loss_antenna, gnss_antenna_shortcircuit, main_power_lake, mainpowerloss, accclose, unpositioned, dimensional_n_or_s, longitudinal_e_or_w, d_l_isencryption, latitude, longitude, altitude, speed, course, createtime, gps_intensity, gps_satellites, gps_mileage, is_out_power, car_power, is_sensor_run from collect_machine_gps
</sql>
<select id="selectCollectMachineGpsList" parameterType="CollectMachineGps" resultMap="CollectMachineGpsResult">
@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dLIsencryption != null "> and d_l_isencryption = #{dLIsencryption}</if>
<if test="speed != null "> and speed = #{speed}</if>
<if test="course != null "> and course = #{course}</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="createTime != null "> and createtime = #{createTime}</if>
<if test="gpsIntensity != null "> and gps_intensity = #{gpsIntensity}</if>
<if test="gpsSatellites != null "> and gps_satellites = #{gpsSatellites}</if>
<if test="gpsMileage != null "> and gps_mileage = #{gpsMileage}</if>
@ -101,10 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND bt.id is not null
<if test="carLicense != null and carLicense != ''"> and car_license = #{carLicense}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
AND date_format(u.createtime,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
AND date_format(u.createtime,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</select>
<select id="selectNewCarGps" resultType="com.ruoyi.basetyre.domain.CollectMachineGps">
@ -164,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="altitude != null">altitude,</if>
<if test="speed != null">speed,</if>
<if test="course != null">course,</if>
<if test="createTime != null">create_time,</if>
<if test="createTime != null">createtime,</if>
<if test="gpsIntensity != null">gps_intensity,</if>
<if test="gpsSatellites != null">gps_satellites,</if>
<if test="gpsMileage != null">gps_mileage,</if>
@ -231,7 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="altitude != null">altitude = #{altitude},</if>
<if test="speed != null">speed = #{speed},</if>
<if test="course != null">course = #{course},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createTime != null">createtime = #{createTime},</if>
<if test="gpsIntensity != null">gps_intensity = #{gpsIntensity},</if>
<if test="gpsSatellites != null">gps_satellites = #{gpsSatellites},</if>
<if test="gpsMileage != null">gps_mileage = #{gpsMileage},</if>

@ -79,9 +79,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</select>
<select id="select_press_temperature" resultMap="CollectTyresDetailResult">
SELECT temperaturevalue,pressvalue,createtime as createTime from collect_tyres_detail
SELECT temperaturevalue,pressvalue,createtime as createTime,ispresslower,istemperaturehigh,ispowerinvalue,ispresshigh from collect_tyres_detail
<where>
<if test="tyreId != null and tyreId != ''"> and tyre_id = #{tyreId}</if>
<if test="params.beginTime != null and params.endTime != null"> and createtime BETWEEN #{params.beginTime} AND #{params.endTime}</if>
</where>
</select>
<select id="selectTyreOnCar" resultType="com.ruoyi.basetyre.domain.vo.CarTyres" parameterType="BaseTyre">

@ -79,8 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
<if test="deptId != null and deptId != 0">
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
</if>
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE CHARINDEX(cast(#{deptId} as nvarchar),ancestors)>0)) </if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>

@ -5,7 +5,7 @@ VITE_APP_TITLE = 雄鹰轮胎智慧互联云平台
VITE_APP_ENV = 'production'
# 若依管理系统/生产环境
VITE_APP_BASE_API = 'http://47.94.93.46:8080/dev-api'
# VITE_APP_BASE_API = 'http://47.94.93.46:80/dev-api'
#VITE_APP_BASE_API = 'http://10.11.41.249:8080/dev-api'
VITE_APP_BASE_API = 'http://47.94.93.46:80/dev-api'
# 是否在打包时开启压缩,支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip

@ -0,0 +1 @@
<svg t="1680168778610" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15379" width="200" height="200"><path d="M161.376 202.048l60.8-19.968 62.976 191.872-60.8 19.936zM354.624 201.92l60.8-19.936 62.976 191.84-60.8 19.968zM256 960a192 192 0 1 1 192-192 192 192 0 0 1-192 192z m0-320a128 128 0 1 0 128 128 128 128 0 0 0-128-128zM832 960a192 192 0 1 1 192-192 192 192 0 0 1-192 192z m0-320a128 128 0 1 0 128 128 128 128 0 0 0-128-128z" fill="#1296db" p-id="15380"></path><path d="M640 581.76L0 475.2V64h1024v64H64v292.8l512 85.44V192h64v389.76z" fill="#1296db" p-id="15381"></path><path d="M1024 576h-64v-154.88L904.96 256H768v192h128v64h-192V192h247.04L1024 410.88V576z" fill="#1296db" p-id="15382"></path></svg>

After

Width:  |  Height:  |  Size: 755 B

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 6.6 KiB

@ -0,0 +1 @@
<svg t="1680168832446" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16451" width="200" height="200"><path d="M358.4 0H102.4a102.4 102.4 0 0 0-102.4 102.4v256a102.4 102.4 0 0 0 102.4 102.4h358.4V102.4a102.4 102.4 0 0 0-102.4-102.4z m0 358.4H102.4V102.4h256zM921.6 0h-256a102.4 102.4 0 0 0-102.4 102.4v358.4h358.4a102.4 102.4 0 0 0 102.4-102.4V102.4a102.4 102.4 0 0 0-102.4-102.4z m0 358.4h-256V102.4h256zM921.6 563.2h-358.4v358.4a102.4 102.4 0 0 0 102.4 102.4h256a102.4 102.4 0 0 0 102.4-102.4v-256a102.4 102.4 0 0 0-102.4-102.4z m0 358.4h-256v-256h256zM0 665.6v256a102.4 102.4 0 0 0 102.4 102.4h256a102.4 102.4 0 0 0 102.4-102.4v-358.4H102.4a102.4 102.4 0 0 0-102.4 102.4z m358.4 256H102.4v-256h256z" p-id="16452" fill="#1296db"></path></svg>

After

Width:  |  Height:  |  Size: 789 B

@ -0,0 +1 @@
<svg t="1680168991531" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="25483" width="200" height="200"><path d="M810.666667 635.733333l64 64-46.933334 46.933334-64-64c-38.4 21.333333-89.6 12.8-123.733333-17.066667-42.666667-42.666667-42.666667-110.933333 0-149.333333s110.933333-42.666667 149.333333 0c38.4 29.866667 42.666667 81.066667 21.333334 119.466666zM554.666667 469.333333v128H128v-128h426.666667z m0 298.666667H128v-128h426.666667v128z m341.333333-341.333333H128V298.666667h768v128zM213.333333 341.333333v42.666667h42.666667V341.333333H213.333333z m85.333334 0v42.666667h42.666666V341.333333H298.666667z m-85.333334 170.666667v42.666667h42.666667v-42.666667H213.333333z m85.333334 0v42.666667h42.666666v-42.666667H298.666667z m-85.333334 170.666667v42.666666h42.666667v-42.666666H213.333333z m85.333334 0v42.666666h42.666666v-42.666666H298.666667z m388.266666-64c17.066667 17.066667 42.666667 17.066667 59.733334 0s17.066667-42.666667 0-59.733334c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733334z" fill="#1296db" p-id="25484"></path></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -0,0 +1 @@
<svg t="1680169516701" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="32204" width="200" height="200"><path d="M981.333333 426.666667h-42.666666V213.333333c0-25.6-17.066667-42.666667-42.666667-42.666666h-298.666667V128h-170.666666v42.666667H128c-25.6 0-42.666667 17.066667-42.666667 42.666666v213.333334H42.666667v170.666666h42.666666v213.333334c0 25.6 17.066667 42.666667 42.666667 42.666666h298.666667v42.666667h170.666666v-42.666667h298.666667c25.6 0 42.666667-17.066667 42.666667-42.666666v-213.333334h42.666666v-170.666666z m-128 341.333333h-256v-42.666667h-170.666666v42.666667H170.666667v-170.666667h42.666666v-170.666666H170.666667V256h256v42.666667h170.666666V256h256v170.666667h-42.666666v170.666666h42.666666v170.666667z" p-id="32205" fill="#1296db"></path></svg>

After

Width:  |  Height:  |  Size: 819 B

@ -0,0 +1 @@
<svg t="1680169343290" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="30466" width="200" height="200"><path d="M243.023908 512.065447l170.348525 66.101667 324.739062-358.044864-495.087587 291.943197zM852.657055 205.084146l-324.189131 415.747589 209.65357 84.209384L852.657055 205.084146zM413.382432 705.041119v185.586605l94.978027-148.361297-94.978027-37.225308zM986.240215 27.44654c5.299332 9.858757 7.039113 21.117338 4.949376 32.015964L832.38961 798.809299c-5.23934 27.306558-32.645885 45.384279-61.222282 40.384908-4.169474-0.729908-8.238961-1.939755-12.108473-3.599546l-162.189554-57.622736-133.953113 218.152499c-8.298954 13.018359-21.627274 22.387178-37.095324 26.106709-32.255934 7.749023-64.971809-10.678654-73.580724-41.254799l-0.249968-0.929883-42.474646-307.061291-246.308949-94.828045c-26.49666-11.388564-38.31517-41.144813-26.396672-66.461622 4.889384-10.38869 13.338319-18.887619 23.946981-24.086963L915.409144 5.689283c25.846742-12.678402 57.552745-2.939629 70.831071 21.757257z" fill="#1296db" p-id="30467"></path></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -0,0 +1 @@
<svg t="1680168500848" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8858" width="200" height="200"><path d="M530.4 620.8C459.2 655.2 371.2 643.2 312 584c-52.8-52.8-68-128-47.2-193.6 12-2.4 15.2-3.2 27.2-5.6l60 64h56l40-40v-56l-64-60c2.4-12 3.2-15.2 5.6-27.2C456 244 531.2 260 584 312c59.2 59.2 71.2 147.2 37.6 218.4l249.6 249.6c56-74.4 88.8-168 88.8-268 0-247.2-200.8-448-448-448S64 264.8 64 512s200.8 448 448 448c100.8 0 193.6-32.8 268-88.8L530.4 620.8z" p-id="8859" fill="#d4237a"></path></svg>

After

Width:  |  Height:  |  Size: 543 B

@ -0,0 +1 @@
<svg t="1680168593558" class="icon" viewBox="0 0 1120 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10852" width="200" height="200"><path d="M859.227839 496.182463h220.156698a41.424833 41.424833 0 0 1 0 82.849666H930.906764L532.018202 1024 80.068617 520.385736A325.813295 325.813295 0 0 1 0.011636 305.348962a325.813295 325.813295 0 0 1 36.770358-153.132249A290.43928 290.43928 0 0 1 136.387773 41.440193 239.240048 239.240048 0 0 1 273.694804 0.01536 256.461608 256.461608 0 0 1 465.4592 93.104873l64.697211 69.817134 64.231764-71.678925A259.719741 259.719741 0 0 1 685.615898 22.82229 256.927055 256.927055 0 0 1 791.272495 0.01536a253.668922 253.668922 0 0 1 139.634269 40.493938 285.784804 285.784804 0 0 1 99.140331 110.77652 333.260456 333.260456 0 0 1 36.770357 153.132248 343.500302 343.500302 0 0 1-18.617902 110.776521h-153.597696l-46.544757-126.601738a36.30491 36.30491 0 0 0-69.817134 0l-58.646393 172.215599-78.660638-214.105879a36.30491 36.30491 0 0 0-69.817135 0L512.003956 415.194587H381.678639a39.563043 39.563043 0 0 0-37.701253 41.424833 39.097595 39.097595 0 0 0 37.701253 40.959385h154.063143a37.701253 37.701253 0 0 0 34.908568-26.065063L605.093469 374.700649l77.264296 218.760355a36.770358 36.770358 0 0 0 70.282582 0l60.508183-177.335522 24.668721 56.319155a38.632148 38.632148 0 0 0 21.410588 23.737826z" p-id="10853" fill="#1296db"></path></svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

@ -0,0 +1 @@
<svg t="1680169417095" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="31554" width="200" height="200"><path d="M816 624h-1 1zM1024 992c0 17.7-14.3 32-32 32H240.3v-0.6l-0.3 0.6h-1c-35.9 0-69.8-14-95.6-39.5-26-25.9-40.4-60.1-40.4-96.5s14.4-70.6 40.4-96.5c26-25.8 60.3-39.8 96.6-39.5h575c17.3 0 32-14.7 32-32 0-17.4-14.7-32-32-32H432l48-64h336c52.5 0.5 95 43.4 95 96s-42.5 95.5-95 96H239c-18.9 0-36.9 7.4-50.5 21-13.8 13.7-21.5 31.8-21.5 51s7.6 37.3 21.5 51c13.7 13.6 31.6 21 50.5 21h0.7l0.3 0.6v-0.6h752c17.7 0 32 14.3 32 32z" p-id="31555" fill="#1296db"></path><path d="M240.3 1024h-0.3l0.3-0.6zM816 816h-1 1z" p-id="31556" fill="#1296db"></path><path d="M288.3 0.4C129.5 0.4 0.7 129.3 0.7 288.1c0 63.1 20.4 121.5 55 169.2l232.6 312.3 227.3-305.3c37.7-48.8 60.4-109.6 60.4-176.1C576 129.3 447.2 0.4 288.3 0.4z m-0.3 371.4c-44.1 0-80-35.9-80-80s35.9-80 80-80 80 35.9 80 80-35.9 80-80 80z" p-id="31557" fill="#1296db"></path></svg>

After

Width:  |  Height:  |  Size: 973 B

@ -0,0 +1 @@
<svg t="1680169044013" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="27442" width="200" height="200"><path d="M926.6 422.9C895 277.9 802 166.5 657.9 100.8c-8.4-3.8-17.5-4.1-25.6-0.7-16 6.6-22.5 24.2-28.3 39.6-1.7 4.5-4.4 11.8-6.2 14.8-18.2 12-26.4 37.1-19.1 59.9 4.4 13.7 13.9 23.9 26.2 29.4-0.3 10.7 1.2 24.2 5.9 41.4 5 18.2 13.6 40.4 34.8 50.9 24.5 12.1 55.6 2.7 82.9-8.1 5.4-1.9 9.3-2.7 11.8-2.9v0.6c-1.9 14.3-6.7 23.2-12.3 33.5-15.1 28.2-24.2 52.8-2.9 113.5 11.9 34.2 33.2 55.7 52 74.7 13.7 13.8 25.5 25.7 32.2 40.7 11.9 29 48.4 48.5 80.5 65.7l6.1 3.3c3.3 1.8 6.9 2.7 10.6 2.7 3.2 0 6.5-0.7 9.5-2.1 6.4-3 11-8.9 12.4-15.8l0.1-0.7c5.5-25.2 20.7-114.7-1.9-218.3z m-36.5 179.9c-17.7-10.2-35.4-21.9-39.4-31.9-0.1-0.3-0.2-0.5-0.3-0.8-10-22.5-26-38.7-41.4-54.2-17-17.1-33-33.3-41.6-58v-0.1c-16.5-46.8-9.9-59.1 0.1-77.7 6.4-11.9 14.3-26.6 17.3-49.3 0-0.3 0.1-0.6 0.1-0.9 2.1-22.6-7.2-34.8-15.3-41-5.8-4.5-14.6-8.6-27.4-8.6-8 0-17.6 1.6-28.9 5.7-0.2 0.1-0.4 0.2-0.7 0.3-32.1 12.8-43.2 11.6-47 9.7-2.8-1.4-7.1-6.5-11.7-22.9-6.3-22.7-4.1-32.3-3.5-34.4 4.8-6.6 5.7-15.3 2-22.8-4.1-8.5-13.2-13.5-22.6-12.4-7.1 0.8-8-1.3-8.4-2.2-1.6-3.5-0.3-8.7 0.9-9.7l1.5-0.9c11.6-7.7 16.9-21.9 21.9-35.5 1-2.6 2.3-6.1 3.6-9.3C906.8 269.4 902.8 509 890.1 602.8zM610.8 597.1c-12.2-10.5-20.8-19.3-28.4-27.1-24.7-25.4-40-38.7-93.1-38.7-33.9 0-71.6 3.6-93.9 30.3-18 21.6-22.5 52.8-14.1 98.3 10 54.4 32.3 70.2 47.1 80.6 10 7.1 12.1 8.6 10.8 27.7-4.3 59.6 7.3 83.7 20.7 105.1 1.1 1.8 2.2 3.5 3.2 5.2 9.4 16.4 28.1 42.6 52.4 42.6 1.9 0 3.9-0.2 5.8-0.5 28.2-4.9 34.4-40 36.5-51.5 11.5-64.4 32.6-98.2 53.7-125 18.8-24 68.7-87.5-0.7-147z m-34.3 119.4C553 746.4 527.2 787 514 861.2c-0.7 4-1.5 7.2-2.2 9.7-3.1-3.6-6.7-8.6-10.1-14.5-1.2-2.2-2.6-4.4-4-6.7-8.3-13.3-17.6-28.3-14-78.4 2.9-40.8-11.6-54.6-29.4-67.2-11.5-8.1-22.3-15.8-29-52.4-5.6-30.6-4.1-51.4 4.5-61.7 8.2-9.9 26.6-14.3 59.6-14.3 36.7 0 41.4 4.8 61.1 25.2 7.8 8.1 17.6 18.1 31.3 29.9 28 24.1 26.7 44.9-5.3 85.7zM306.5 485.2c0.4-0.5 1.6-1.5 3.8-2.7l0.9-0.5c11.1-5.9 27.5-14.7 34.5-15.6 0.6 1.1 1.4 3.1 2.2 6.5 5.9 23.4 23.5 38.5 46 39.4 26.8 1 54.3-19 63.5-46.6 5.1-15.3 9-16.2 27.5-20.2 9.9-2.2 22.2-4.9 36-10.9 34.1-14.9 69.9-34.8 62-81.9l-0.5-3.2c-4.5-27.4-11.2-68.8-83.8-68.8-31.5 0-48.4 13.7-58.6 21.9-1.2 0.9-2.6 2.1-3.8 3-2.2-1.4-6.6-4.5-13.8-11.7-2.2-2.2-4-4.1-5.5-5.8 2.2-0.5 4.5-1 6.3-1.4 9.3-2 18.9-4.1 27.4-8.3 23.8-11.9 47.7-51.4 41.7-80.6-3.9-19.2-19-31.4-40.3-32.6-24.3-1.4-36.7 4.6-44.9 8.5-5.2 2.5-5.6 2.7-14-0.3-34.1-12.2-56.2 20.3-69.5 39.8-1.9 2.7-4.2 6.1-6.4 9.1-1.5-1.8-3-3.7-4.3-5.3-15.7-19.6-39.5-49.2-74.3-48.2-7.9 0.2-26.5 0.8-71.4 62.3-24.3 33.2-47.3 72.5-60 102.5-1.4 3.4-2 7-1.7 10.6 6.6 74.7 41.9 118.1 52.7 129.7 8.6 15.6 43.3 64.6 162.3 121 2.4 1.1 4.9 1.8 7.5 2.1 1.1 0.1 2.2 0.1 3.3 0.1 10.2 0 22.8-4.2 28.5-16.5 9.8-21-10.2-41-18.7-49.5-31-31.3-34.7-42.4-34.6-45.9z m-17.1-42c-19.5 10.4-25.4 24.8-26.9 35.1-2 13.4 2.4 26.8 10.1 39.8-58.7-36.8-73.9-63.4-75.5-66.3-1.1-3.1-2.7-5-5.1-7.4-1.4-1.4-34.1-33.9-41.5-99 24.4-54.6 74.6-121.9 91.8-132.3 12.2 1.7 26.4 19.4 36 31.4 9.4 11.7 16.9 21.1 27.3 25.1 25.9 10.8 43.3-14.7 54.9-31.6 4.8-7.1 13.6-20 18.5-22.6 23.6 8.2 36 3.8 47.7-1.9 5.5-2.7 9.9-4.8 22.2-4.2-1 8.5-10.4 25.2-18 29-3.4 1.7-10.6 3.2-16.9 4.6-16.7 3.6-39.6 8.6-45.8 29.6-6 20.3 9.1 38.8 22.9 52.6 34.1 34.1 54.8 29.9 77 11.9 8.3-6.7 14.8-12 30.6-12 34.7 0 35.8 6.7 39.8 31.5l0.6 3.4c1.6 9.4 2.8 16.9-35.9 33.8-9.8 4.3-18.9 6.3-27.7 8.2-21 4.6-47.1 10.3-60.2 49.6-3.5 10.6-13.5 16.2-19.3 16.2h-0.3c-1.4-0.1-3.1-0.1-4.5-5.7-4.6-18.5-13.6-30.9-26.8-36.7-22.7-10.1-46.5 2.6-74.1 17.4l-0.9 0.5z" fill="#1296db" p-id="27443"></path><path d="M512 0C229.7 0 0 229.7 0 512s229.7 512 512 512 512-229.7 512-512S794.3 0 512 0z m0 979.5C254.2 979.5 44.5 769.8 44.5 512S254.2 44.5 512 44.5 979.5 254.2 979.5 512 769.8 979.5 512 979.5z" fill="#1296db" p-id="27444"></path></svg>

After

Width:  |  Height:  |  Size: 3.8 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 6.0 KiB

@ -0,0 +1 @@
<svg t="1680168426174" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6876" width="200" height="200"><path d="M642.6 440.5m-321.47 0a321.47 321.47 0 1 0 642.94 0 321.47 321.47 0 1 0-642.94 0Z" fill="#FFE4CC" p-id="6877"></path><path d="M376.67 881.7h521.89c5.5 0 10-4.5 10-10V731.26c0-5.5-4.5-10-10-10H376.67c-5.5 0-10 4.5-10 10V871.7c0 5.5 4.5 10 10 10z" fill="#F88E20" p-id="6878"></path><path d="M908.56 801.64h-99.52c-6.89 0-12.48-5.59-12.48-12.48s5.59-12.48 12.48-12.48h99.52c6.89 0 12.48 5.59 12.48 12.48s-5.59 12.48-12.48 12.48z" fill="#FFFFFF" p-id="6879"></path><path d="M898.56 894.19H376.67c-12.4 0-22.48-10.08-22.48-22.48V731.26c0-12.4 10.08-22.48 22.48-22.48h521.89c12.4 0 22.48 10.08 22.48 22.48V871.7c0 12.4-10.08 22.49-22.48 22.49z m-519.41-24.97h516.93V733.74H379.15v135.48z" fill="#441B00" p-id="6880"></path><path d="M376.67 669.47h521.89c5.5 0 10-4.5 10-10V509.6c0-5.5-4.5-10-10-10H376.67c-5.5 0-10 4.5-10 10v149.87c0 5.5 4.5 10 10 10z" fill="#FFFFFF" p-id="6881"></path><path d="M898.56 681.96H376.67c-12.4 0-22.48-10.08-22.48-22.48V509.6c0-12.4 10.08-22.48 22.48-22.48h521.89c12.4 0 22.48 10.08 22.48 22.48v149.87c0 12.4-10.08 22.49-22.48 22.49z m-519.41-24.97h516.93V512.08H379.15v144.91z" fill="#441B00" p-id="6882"></path><path d="M376.67 444.49h521.89c5.5 0 10-4.5 10-10V282.85c0-5.5-4.5-10-10-10H376.67c-5.5 0-10 4.5-10 10v151.64c0 5.5 4.5 10 10 10z" fill="#FFFFFF" p-id="6883"></path><path d="M898.56 456.97H376.67c-12.4 0-22.48-10.08-22.48-22.48V282.85c0-12.4 10.08-22.48 22.48-22.48h521.89c12.4 0 22.48 10.08 22.48 22.48v151.64c0 12.4-10.08 22.48-22.48 22.48z m-519.41-24.96h516.93V285.33H379.15v146.68z" fill="#441B00" p-id="6884"></path><path d="M71.93 529.19a291.92 375.73 0 1 0 583.84 0 291.92 375.73 0 1 0-583.84 0Z" fill="#FFFFFF" p-id="6885"></path><path d="M363.85 917.4c-41.52 0-81.76-10.45-119.6-31.05-36.28-19.75-68.81-47.95-96.68-83.83-56.83-73.14-88.13-170.22-88.13-273.34S90.74 329 147.57 255.85c27.87-35.87 60.4-64.08 96.68-83.83 37.84-20.6 78.08-31.05 119.6-31.05s81.76 10.45 119.6 31.05c36.28 19.75 68.81 47.95 96.68 83.83 56.83 73.14 88.13 170.22 88.13 273.34s-31.3 200.19-88.13 273.34c-27.87 35.87-60.4 64.08-96.68 83.83-37.85 20.59-78.09 31.04-119.6 31.04z m0-751.46c-154.08 0-279.44 162.95-279.44 363.25s125.36 363.25 279.44 363.25c154.08 0 279.44-162.95 279.44-363.25S517.93 165.94 363.85 165.94z" fill="#441B00" p-id="6886"></path><path d="M137.78 528.97c0 119.06 82.13 215.58 183.44 215.58s183.44-96.52 183.44-215.58c0-119.06-82.13-215.58-183.44-215.58s-183.44 96.52-183.44 215.58z" fill="#FFFFFF" p-id="6887"></path><path d="M321.22 757.03c-52.72 0-102.16-23.98-139.22-67.54-36.57-42.97-56.7-99.98-56.7-160.53S145.44 411.4 182 368.43c37.06-43.55 86.5-67.54 139.22-67.54s102.16 23.98 139.22 67.54c36.57 42.97 56.7 99.98 56.7 160.53S497 646.53 460.43 689.5c-37.05 43.55-86.49 67.53-139.21 67.53z m0-431.16c-94.27 0-170.96 91.11-170.96 203.1s76.69 203.1 170.96 203.1 170.96-91.11 170.96-203.1-76.69-203.1-170.96-203.1zM908.56 583.51h-99.52c-6.89 0-12.48-5.59-12.48-12.48s5.59-12.48 12.48-12.48h99.52c6.89 0 12.48 5.59 12.48 12.48s-5.59 12.48-12.48 12.48zM908.56 355.72h-99.52c-6.89 0-12.48-5.59-12.48-12.48s5.59-12.48 12.48-12.48h99.52c6.89 0 12.48 5.59 12.48 12.48s-5.59 12.48-12.48 12.48z" fill="#441B00" p-id="6888"></path><path d="M299.84 754.35c-6.89 0-12.48-5.59-12.48-12.48V318.59c0-6.89 5.59-12.48 12.48-12.48s12.48 5.59 12.48 12.48v423.28c0 6.89-5.59 12.48-12.48 12.48z" fill="#441B00" p-id="6889"></path><path d="M504.66 541.45H137.78c-6.89 0-12.48-5.59-12.48-12.48s5.59-12.48 12.48-12.48h366.88c6.89 0 12.48 5.59 12.48 12.48s-5.59 12.48-12.48 12.48z" fill="#441B00" p-id="6890"></path><path d="M420 723.13c-4.08 0-8.08-2-10.47-5.67L187.39 376.23c-3.76-5.78-2.13-13.51 3.65-17.27 5.78-3.76 13.51-2.13 17.27 3.65l222.14 341.23c3.76 5.78 2.13 13.51-3.65 17.27a12.48 12.48 0 0 1-6.8 2.02z" fill="#441B00" p-id="6891"></path><path d="M191.85 689.87c-2.54 0-5.11-0.78-7.33-2.39-5.58-4.05-6.81-11.86-2.76-17.43L413.4 351.33c4.05-5.57 11.86-6.81 17.43-2.76 5.58 4.05 6.81 11.86 2.76 17.43L201.95 684.73a12.445 12.445 0 0 1-10.1 5.14z" fill="#441B00" p-id="6892"></path><path d="M227.3 528.62a72.54 96.06 0 1 0 145.08 0 72.54 96.06 0 1 0-145.08 0Z" fill="#F88E20" p-id="6893"></path><path d="M299.84 637.16c-23.38 0-45.14-11.75-61.25-33.09-15.33-20.3-23.77-47.09-23.77-75.45s8.44-55.15 23.77-75.45c16.12-21.34 37.87-33.09 61.25-33.09s45.14 11.75 61.25 33.09c15.33 20.3 23.77 47.09 23.77 75.45s-8.44 55.15-23.77 75.45c-16.11 21.33-37.87 33.09-61.25 33.09z m0-192.12c-15.37 0-30.05 8.23-41.33 23.18-12.08 15.99-18.73 37.44-18.73 60.4s6.65 44.41 18.73 60.4c11.29 14.95 25.97 23.18 41.33 23.18 15.37 0 30.05-8.23 41.33-23.18 12.08-15.99 18.73-37.44 18.73-60.4s-6.65-44.41-18.73-60.4c-11.28-14.95-25.96-23.18-41.33-23.18z" fill="#441B00" p-id="6894"></path></svg>

After

Width:  |  Height:  |  Size: 4.7 KiB

@ -0,0 +1 @@
<svg t="1680168673214" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13208" width="200" height="200"><path d="M1023.1 443.2H778.8l-36.8-135-286.4 135h-65.3l-36.8-135-298.6 135H1v169.9h1022.1V443.2zM339.1 0H171.4v353.3l167.7-75.8V0z m376.1 0H547.7v363.5l167.5-86.1V0zM0 649.9V1024h1024V649.9H0z m198.1 233.5H114c-4.4 0-8-3.6-8-8v-154c0-4.4 3.6-8 8-8h84.2c4.4 0 8 3.6 8 8v153.9c-0.1 4.5-3.7 8.1-8.1 8.1z m200.5 0h-84.2c-4.4 0-8-3.6-8-8v-154c0-4.4 3.6-8 8-8h84.2c4.4 0 8 3.6 8 8v153.9c0 4.5-3.6 8.1-8 8.1z m201.3 0h-84.2c-4.4 0-8-3.6-8-8v-154c0-4.4 3.6-8 8-8H600c4.4 0 8 3.6 8 8l-0.1 153.9c0 4.5-3.6 8.1-8 8.1z" p-id="13209" fill="#1296db"></path></svg>

After

Width:  |  Height:  |  Size: 696 B

@ -0,0 +1 @@
<svg t="1680169249802" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="29642" width="200" height="200"><path d="M845.3 978.7c-8.7-8.7-19.9-14.9-32.4-17.4-7.5-1.5-12.9-7.9-12.9-15.5V578.2c0-159-130.1-290.8-289.1-290.2-158.5 0.6-286.9 129.3-286.9 288v369.8c0 7.6-5.4 14-12.9 15.5-29.2 6-51.1 31.8-51.1 62.7h704c0-17.7-7.2-33.7-18.7-45.3zM567.3 464l-19.4 173.3H624L456.8 880l19.4-173.3H400L567.3 464zM512 208c-17.7 0-32-14.3-32-32V32c0-17.7 14.3-32 32-32s32 14.3 32 32v144c0 17.7-14.3 32-32 32zM280 296.1c-15.3 8.8-34.9 3.6-43.7-11.7l-72-124.7c-8.8-15.3-3.6-34.9 11.7-43.7 15.3-8.8 34.9-3.6 43.7 11.7l72 124.7c8.8 15.3 3.6 34.8-11.7 43.7zM744 296.1c15.3 8.8 34.9 3.6 43.7-11.7l72-124.7c8.8-15.3 3.6-34.9-11.7-43.7-15.3-8.8-34.9-3.6-43.7 11.7l-72 124.7c-8.8 15.3-3.6 34.8 11.7 43.7zM202.5 444.9c-4.6 17.1-22.1 27.2-39.2 22.6L24.2 430.3C7.1 425.7-3 408.2 1.5 391.1c4.6-17.1 22.1-27.2 39.2-22.6l139.1 37.3c17.1 4.5 27.2 22 22.7 39.1zM821.5 444.9c4.6 17.1 22.1 27.2 39.2 22.6l139.1-37.3c17.1-4.6 27.2-22.1 22.6-39.2-4.6-17.1-22.1-27.2-39.2-22.6l-139.1 37.3c-17 4.6-27.1 22.1-22.6 39.2z" p-id="29643" fill="#1296db"></path></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -1,9 +1,10 @@
<template>
<div :class="className" :style="{height:height,width:width}"/>
<div :class="className" :style="{height:height,width:width}" />
</template>
<script>
import * as echarts from 'echarts';
// require('echarts/theme/macarons.js') // echarts theme
const echart = inject('echart')
import resize from './mixins/resize'
@ -45,6 +46,7 @@ export default {
methods: {
initChart() {
this.chart = echarts.init(this.$el, 'macarons')
this.chart.setOption({
//
grid: {
@ -61,7 +63,7 @@ export default {
textStyle: {
//
color: '#000',
fontSize: 15,
fontSize:15,
fontWeight: 600,
}
}],
@ -99,9 +101,9 @@ export default {
pointer: {
//
//icon:'none',
width: 3,//
length: "60%", //
shadowColor: '#ccc', //
width:3,//
length:"60%", //
shadowColor : '#ccc', //
shadowBlur: 5
},
axisTick: {
@ -133,11 +135,11 @@ export default {
formatter: '{value} KM',
color: '#040755',
fontSize: 20, //
top: '60%'
top:'60%'
},
data: [{
value: 586,
top: '60%' //
value: 0 ,
top:'60%' //
}]
},
]

Loading…
Cancel
Save