WangZhiJian/cxxm
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 视频显示,数据精度,æ·操问题作æ;添加操作手册

Browse Source
This commit is contained in:
ZhiJian 2024-07-20 16:59:33 +08:00
parent d10d97f344
commit b500a532b1
13 changed files with 97 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zftk/ZftkTask.java
View File

@ -4,9 +4,11 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.cxxm.serializer.CustomMjSerialize;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@ -78,6 +80,7 @@ public class ZftkTask extends BaseEntity {
*/
@Excel(name = "地块面积")
@ApiModelProperty(value = "地块面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String dkmj;
@ -86,6 +89,7 @@ public class ZftkTask extends BaseEntity {
*/
@Excel(name = "农用地面积")
@ApiModelProperty(value = "农用地面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String nydmj;
@ -94,6 +98,7 @@ public class ZftkTask extends BaseEntity {
*/
@Excel(name = "耕地面积")
@ApiModelProperty(value = "耕地面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String gdmj;
@ -102,6 +107,7 @@ public class ZftkTask extends BaseEntity {
*/
@Excel(name = "建设用地面积")
@ApiModelProperty(value = "建设用地面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String jsydmj;
@ -110,6 +116,7 @@ public class ZftkTask extends BaseEntity {
*/
@Excel(name = "未利用用地面积")
@ApiModelProperty(value = "未利用用地面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String wlydmj;
/**
@ -117,6 +124,7 @@ public class ZftkTask extends BaseEntity {
*/
@Excel(name = "永久基本农田面积")
@ApiModelProperty(value = "永久基本农田面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String yjjbntmj;

8
cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zftk/ZftkTaskExport.java
View File

@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.cxxm.serializer.CustomMjSerialize;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -78,6 +80,7 @@ public class ZftkTaskExport extends BaseEntity {
*/
@Excel(name = "地块面积",needMerge = true)
@ApiModelProperty(value = "地块面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String dkmj;
@ -86,6 +89,7 @@ public class ZftkTaskExport extends BaseEntity {
*/
@Excel(name = "农用地面积",needMerge = true)
@ApiModelProperty(value = "农用地面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String nydmj;
@ -94,6 +98,7 @@ public class ZftkTaskExport extends BaseEntity {
*/
@Excel(name = "耕地面积",needMerge = true)
@ApiModelProperty(value = "耕地面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String gdmj;
@ -102,6 +107,7 @@ public class ZftkTaskExport extends BaseEntity {
*/
@Excel(name = "建设用地面积",needMerge = true)
@ApiModelProperty(value = "建设用地面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String jsydmj;
@ -110,6 +116,7 @@ public class ZftkTaskExport extends BaseEntity {
*/
@Excel(name = "未利用用地面积",needMerge = true)
@ApiModelProperty(value = "未利用用地面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String wlydmj;
/**
@ -117,6 +124,7 @@ public class ZftkTaskExport extends BaseEntity {
*/
@Excel(name = "永久基本农田面积",needMerge = true)
@ApiModelProperty(value = "永久基本农田面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String yjjbntmj;

6
cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zt/ZtTask.java
View File

@ -4,9 +4,11 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.cxxm.serializer.CustomMjSerialize;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@ -94,6 +96,7 @@ public class ZtTask extends BaseEntity {
*/
@Excel(name = "图标面积")
@ApiModelProperty(value = "图标面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String tbmj;
@ -102,6 +105,7 @@ public class ZtTask extends BaseEntity {
*/
@Excel(name = "耕地面积")
@ApiModelProperty(value = "耕地面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String gdmj;
@ -110,6 +114,7 @@ public class ZtTask extends BaseEntity {
*/
@Excel(name = "基本农田面积")
@ApiModelProperty(value = "基本农田面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String jbntmj;
@ -134,6 +139,7 @@ public class ZtTask extends BaseEntity {
*/
@Excel(name = "恢复原貌面积")
@ApiModelProperty(value = "恢复原貌面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String hfymmj;

6
cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zt/ZtTaskExport.java
View File

@ -3,9 +3,11 @@ package com.ruoyi.cxxm.domain.entity.zt;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.cxxm.domain.entity.zftk.ZftkCheckExport;
import com.ruoyi.cxxm.serializer.CustomMjSerialize;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -94,6 +96,7 @@ public class ZtTaskExport extends BaseEntity {
*/
@Excel(name = "图标面积",needMerge = true)
@ApiModelProperty(value = "图标面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String tbmj;
@ -102,6 +105,7 @@ public class ZtTaskExport extends BaseEntity {
*/
@Excel(name = "耕地面积",needMerge = true)
@ApiModelProperty(value = "耕地面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String gdmj;
@ -110,6 +114,7 @@ public class ZtTaskExport extends BaseEntity {
*/
@Excel(name = "基本农田面积",needMerge = true)
@ApiModelProperty(value = "基本农田面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String jbntmj;
@ -134,6 +139,7 @@ public class ZtTaskExport extends BaseEntity {
*/
@Excel(name = "恢复原貌面积",needMerge = true)
@ApiModelProperty(value = "恢复原貌面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String hfymmj;

5
cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zttb/ZttbTask.java
View File

@ -4,9 +4,11 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.cxxm.serializer.CustomMjSerialize;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@ -94,6 +96,7 @@ public class ZttbTask extends BaseEntity {
*/
@Excel(name = "图斑面积")
@ApiModelProperty(value = "图斑面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String tbmj;
@ -102,6 +105,7 @@ public class ZttbTask extends BaseEntity {
*/
@Excel(name = "耕地面积")
@ApiModelProperty(value = "耕地面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String gdmj;
@ -110,6 +114,7 @@ public class ZttbTask extends BaseEntity {
*/
@Excel(name = "基本农田面积")
@ApiModelProperty(value = "基本农田面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String jbntmj;

6
cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zttb/ZttbTaskExport.java
View File

@ -3,9 +3,11 @@ package com.ruoyi.cxxm.domain.entity.zttb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.cxxm.domain.entity.zt.ZtCheckExport;
import com.ruoyi.cxxm.serializer.CustomMjSerialize;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -94,6 +96,7 @@ public class ZttbTaskExport extends BaseEntity {
*/
@Excel(name = "图标面积",needMerge = true)
@ApiModelProperty(value = "图标面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String tbmj;
@ -102,6 +105,7 @@ public class ZttbTaskExport extends BaseEntity {
*/
@Excel(name = "耕地面积",needMerge = true)
@ApiModelProperty(value = "耕地面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String gdmj;
@ -110,6 +114,7 @@ public class ZttbTaskExport extends BaseEntity {
*/
@Excel(name = "基本农田面积",needMerge = true)
@ApiModelProperty(value = "基本农田面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String jbntmj;
@ -134,6 +139,7 @@ public class ZttbTaskExport extends BaseEntity {
*/
@Excel(name = "恢复原貌面积",needMerge = true)
@ApiModelProperty(value = "恢复原貌面积")
@JsonSerialize(using = CustomMjSerialize.class)
private String hfymmj;

29
cxxm/src/main/java/com/ruoyi/cxxm/serializer/CustomMjSerialize.java Normal file
View File

@ -0,0 +1,29 @@
package com.ruoyi.cxxm.serializer;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.text.DecimalFormat;
public class CustomMjSerialize extends JsonSerializer<String> {
private DecimalFormat df = new DecimalFormat("0.0000");
@Override
public void serialize(String value, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
if (value == null || value.equals(" ")) {
value = "0";
}
try {
if (value.contains(".")) {
value = df.format(Double.parseDouble(value));
}
} catch (Exception e) {
} finally {
jsonGenerator.writeString(value);
}
}
}

2
ruoyi-ui/src/components/Map/index.vue
View File

@ -3,7 +3,7 @@
<div id="lonlatMap" style=" width:100%; height: 100%;position: absolute;z-index: 1"></div>
<div
style="position: absolute;right:10px;top: 10px;z-index: 2;background:rgba(255,255,255,0.6);border-radius: 5px;overflow: hidden">
<div class="map-gj">图层</div>
<!-- <div class="map-gj">图层</div>-->
<div class="map-gj" @click="onLineTool">测距</div>
<div class="map-gj" @click="onPolygonTool">测面</div>
<div class="map-gj" @click="clerOver">清除</div>

1
ruoyi-ui/src/components/Map2/index.vue
View File

@ -230,7 +230,6 @@ export default {
.map-gj {
padding: 5px 10px;
border: 1px solid #999999;
}
.map-gj:last-child {

12
ruoyi-ui/src/components/RuoYi/Doc/index.vue
View File

@ -9,13 +9,19 @@ export default {
name: 'RuoYiDoc',
data() {
return {
url: 'http://doc.ruoyi.vip/ruoyi-vue'
url: 'http://doc.ruoyi.vip/ruoyi-vue',
zjDoc: process.env.VUE_APP_BASE_API + "/profile/common/州级账号Web平台操作指导手册.pdf",
sjDoc: process.env.VUE_APP_BASE_API + "/profile/common/市、县级账号Web平台操作指导手册.pdf",
}
},
methods: {
goto() {
window.open(this.url)
var gotoURL = this.sjDoc;
if(this.$auth.hasRoleOr(["admin", "zjgly"])){
gotoURL = this.zjDoc
}
window.open(gotoURL)
}
}
}
</script>
</script>

32
ruoyi-ui/src/layout/components/Navbar.vue
View File

@ -1,26 +1,27 @@
<template>
<div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
@toggleClick="toggleSideBar"/>
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<search id="header-search" class="right-menu-item"/>
<!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
<!-- <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
<!-- </el-tooltip>-->
<!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
<!-- <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
<!-- </el-tooltip>-->
<!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">-->
<!-- <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
<!-- </el-tooltip>-->
<el-tooltip content="操作手册" effect="dark" placement="bottom">
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect"/>
</el-tooltip>
<screenfull id="screenfull" class="right-menu-item hover-effect" />
<screenfull id="screenfull" class="right-menu-item hover-effect"/>
<el-tooltip content="布局大小" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" />
<size-select id="size-select" class="right-menu-item hover-effect"/>
</el-tooltip>
</template>
@ -28,7 +29,7 @@
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
<img :src="avatar" class="user-avatar">
<i class="el-icon-caret-bottom" />
<i class="el-icon-caret-bottom"/>
</div>
<el-dropdown-menu slot="dropdown">
<router-link to="/user/profile">
@ -47,7 +48,7 @@
</template>
<script>
import { mapGetters } from 'vuex'
import {mapGetters} from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import TopNav from '@/components/TopNav'
import Hamburger from '@/components/Hamburger'
@ -104,7 +105,8 @@ export default {
this.$store.dispatch('LogOut').then(() => {
location.href = '/index';
})
}).catch(() => {});
}).catch(() => {
});
}
}
}
@ -116,7 +118,7 @@ export default {
overflow: hidden;
position: relative;
background: #fff;
box-shadow: 0 1px 4px rgba(0,21,41,.08);
box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
.hamburger-container {
line-height: 46px;
@ -124,7 +126,7 @@ export default {
float: left;
cursor: pointer;
transition: background .3s;
-webkit-tap-highlight-color:transparent;
-webkit-tap-highlight-color: transparent;
&:hover {
background: rgba(0, 0, 0, .025)

1
ruoyi-ui/src/views/cxxm/ztTask/detail/index.vue
View File

@ -354,6 +354,7 @@ export default {
dicts: ["task_zgqk", "task_shjg", "sf", "zt_zgqk", "zftk_ccjd"],
data() {
return {
baseUrl: process.env.VUE_APP_BASE_API,
activeName: "1",
activeStep: 0,
activeCollapses: ["1"],

1
ruoyi-ui/src/views/cxxm/zttbTask/detail/index.vue
View File

@ -354,6 +354,7 @@ export default {
dicts: ["task_zgqk", "task_shjg", "sf", "zftk_sdxz", "zftk_ccjd"],
data() {
return {
baseUrl: process.env.VUE_APP_BASE_API,
activeName: "1",
activeStep: 0,
activeCollapses: ["1"],