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

final version

Browse Source
This commit is contained in:
ZhiJian
2024-04-24 09:37:20 +08:00
parent c47f75d166
commit d3089a9c4c
23 changed files with 204 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/.env.development
View File

@@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 楚雄外业调查管理系统
VUE_APP_TITLE = 楚雄州自然资源综合执法监管外业工作辅助平台V1.0
# 开发环境配置
ENV = 'development'

2
ruoyi-ui/.env.production
View File

@@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 楚雄外业调查管理系统
VUE_APP_TITLE = 楚雄州自然资源综合执法监管外业工作辅助平台V1.0
# 生产环境配置
ENV = 'production'

BIN
ruoyi-ui/public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 235 KiB

6
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
View File

@@ -3,11 +3,11 @@
<transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
<!-- <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>-->
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
<!-- <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>-->
</router-link>
</transition>
</div>
@@ -78,7 +78,7 @@ export default {
color: #fff;
font-weight: 600;
line-height: 50px;
font-size: 14px;
font-size: 15px;
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
vertical-align: middle;
}

4
ruoyi-ui/src/views/cxxm/task/check/detail.vue
View File

@@ -27,10 +27,10 @@
<el-descriptions-item label="未整改">
<el-tag type="danger" effect="dark">{{ form.taskCheckStatistics.wzgcs }}次</el-tag>
</el-descriptions-item>
<el-descriptions-item label="未整改到位">
<el-descriptions-item label="整改未到位">
<el-tag type="warning" effect="dark">{{ form.taskCheckStatistics.wzgdwcs }}次</el-tag>
</el-descriptions-item>
<el-descriptions-item label="已整改">
<el-descriptions-item label="整改到位">
<el-tag type="success" effect="dark">{{ form.taskCheckStatistics.yzgcs }}次</el-tag>
</el-descriptions-item>
<el-descriptions-item label="审核不通过">

10
ruoyi-ui/src/views/cxxm/task/check/index.vue
View File

@@ -76,16 +76,16 @@
<dict-tag :options="dict.type.task_lx" :value="scope.row.rwlx"/>
</template>
</el-table-column>
<el-table-column label="图斑所在县" align="center" prop="tbszx"/>
<el-table-column label="图斑所在县" align="center" prop="tbszx" min-width="90"/>
<!-- <el-table-column label="下发时间" align="center" prop="xfsj" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.xfsj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="需巡查次数" align="center" prop="xxccs"/>
<el-table-column label="已巡查次数" align="center" prop="yxccs"/>
<el-table-column label="州巡查次数" align="center" prop="zjxccs"/>
<el-table-column label="县巡查次数" align="center" prop="xjxccs"/>
<el-table-column label="需巡查次数" align="center" prop="xxccs" min-width="90"/>
<el-table-column label="已巡查次数" align="center" prop="yxccs" min-width="90"/>
<el-table-column label="州巡查次数" align="center" prop="zjxccs" min-width="90"/>
<el-table-column label="县巡查次数" align="center" prop="xjxccs" min-width="90"/>
<el-table-column label="最后巡查时间" align="center" prop="xcsj" width="150">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.xcsj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>

24
ruoyi-ui/src/views/cxxm/task/distribute/index.vue
View File

@@ -203,7 +203,13 @@
<TianDiTuMap2 style="width: 96%;height:500px" v-bind:mapInfo="this.mapInfo"></TianDiTuMap2>
</div>
</el-collapse-item>
<el-collapse-item title="任务信息" name="2">
<el-collapse-item title="更多图斑信息" name="2">
<el-descriptions column="2" v-if="form.tbxx!=null" border :contentStyle="content_style"
:labelStyle="label_style">
<el-descriptions-item v-for="(value,key) in tbxxInfo" :label="key">{{ value }}</el-descriptions-item>
</el-descriptions>
</el-collapse-item>
<el-collapse-item title="任务信息" name="3">
<el-descriptions column="2" border :contentStyle="content_style" :labelStyle="label_style">
<el-descriptions-item label="导入人员">{{ form.createBy }}</el-descriptions-item>
<el-descriptions-item label="导入时间">{{
@@ -214,18 +220,18 @@
</el-descriptions-item>
<el-descriptions-item label="下发时间">{{ form.xfsj }}</el-descriptions-item>
<el-descriptions-item label="已巡查次数">{{ form.yxccs }}</el-descriptions-item>
<el-descriptions-item label="是否归档">{{
this.selectDictLabel(this.dict.type.sf, form.sfgd)
}}
<el-descriptions-item label="任务状态">
<el-tag type="success" v-if="form.sfgd=='0'">启用</el-tag>
<el-tag type="warning" v-if="form.sfgd=='1'">结束</el-tag>
</el-descriptions-item>
</el-descriptions>
</el-collapse-item>
<el-collapse-item title="任务周期" name="3">
<el-collapse-item title="任务周期" name="4">
<el-form-item label="需巡查次数" prop="xxccs">
<el-input-number v-model="form.xxccs" placeholder="请输入需巡查次数" :min="1"/>
<el-tag type="info" style="margin-left: 10px">次</el-tag>
</el-form-item>
<el-form-item label="巡查周期选项" prop="xczqxx" v-if="form.xxccs>1">
<el-form-item label="巡查周期选项" prop="xczqxx" v-if="form.xxccs>1" style="display: none">
<el-radio-group v-model="form.xczqxx">
<el-radio
v-for="dict in dict.type.task_xczqxx"
@@ -235,7 +241,7 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="巡查周期" prop="xczq" v-if="form.xxccs>1 && form.xczqxx==3">
<el-form-item label="巡查周期" prop="xczq" v-if="form.xxccs>1 && form.xczqxx==3" style="display: none">
<el-input-number v-model="form.xczq" placeholder="请输入巡查周期" :min="1"/>
<el-tag type="info" style="margin-left: 10px">天/次</el-tag>
</el-form-item>
@@ -295,7 +301,7 @@ export default {
// 是否显示弹出层
open: false,
// 折叠面板
activeNames: ['1', '2', '3'],
activeNames: ['1', '2', '3', '4'],
// 查询参数
queryParams: {
pageNum: 1,
@@ -459,7 +465,7 @@ export default {
this.tbxxInfo = JSON.parse(response.data.tbxx.info);
this.mapInfo.centerPoint = {x:response.data.x,y:response.data.y}
this.mapInfo.centerPoint = {x: response.data.x, y: response.data.y}
this.mapInfo.gis = response.data.tbxx.gis
this.open = true;

25
ruoyi-ui/src/views/cxxm/task/import/index.vue
View File

@@ -96,7 +96,7 @@
<span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="180">
<template slot-scope="scope">
<el-button
size="mini"
@@ -185,10 +185,14 @@
<div style="height:500px;margin-top: 20px">
<TianDiTuMap2 style="width: 96%;height:500px" v-bind:mapInfo="this.mapInfo"></TianDiTuMap2>
</div>
</el-collapse-item>
<el-collapse-item title="任务信息" name="2">
<el-collapse-item title="更多图斑信息" name="2">
<el-descriptions column="2" v-if="form.tbxx!=null" border :contentStyle="content_style"
:labelStyle="label_style">
<el-descriptions-item v-for="(value,key) in tbxxInfo" :label="key">{{ value }}</el-descriptions-item>
</el-descriptions>
</el-collapse-item>
<el-collapse-item title="任务信息" name="3">
<el-descriptions column="2" border :contentStyle="content_style" :labelStyle="label_style">
<el-descriptions-item label="导入人员">{{ form.createBy }}</el-descriptions-item>
<el-descriptions-item label="导入时间">{{
@@ -205,12 +209,12 @@
</el-descriptions-item>
</el-descriptions>
</el-collapse-item>
<el-collapse-item title="任务周期" name="3">
<el-collapse-item title="任务周期" name="4">
<el-form-item label="需巡查次数" prop="xxccs">
<el-input-number v-model="form.xxccs" placeholder="请输入需巡查次数" :min="1"/>
<el-tag type="info" style="margin-left: 10px">次</el-tag>
</el-form-item>
<el-form-item label="巡查周期选项" prop="xczqxx" v-if="form.xxccs>1">
<el-form-item label="巡查周期选项" prop="xczqxx" v-if="form.xxccs>1" style="display: none">
<el-radio-group v-model="form.xczqxx">
<el-radio
v-for="dict in dict.type.task_xczqxx"
@@ -220,7 +224,7 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="巡查周期" prop="xczq" v-if="form.xxccs>1 && form.xczqxx==3">
<el-form-item label="巡查周期" prop="xczq" v-if="form.xxccs>1 && form.xczqxx==3" style="display: none">
<el-input-number v-model="form.xczq" placeholder="请输入巡查周期" :min="1"/>
<el-tag type="info" style="margin-left: 10px">天/次</el-tag>
</el-form-item>
@@ -345,7 +349,7 @@ export default {
// 表单校验
rules: {},
// 折叠面板
activeNames: ['1', '2', '3'],
activeNames: ['1', '2', '3', '4'],
// 日期区间选择
pickerOptions: {
shortcuts: [{
@@ -469,6 +473,9 @@ export default {
getTask(id).then(response => {
this.form = response.data;
this.tbxxInfo = JSON.parse(response.data.tbxx.info);
this.mapInfo.centerPoint = {x: response.data.x, y: response.data.y}
this.mapInfo.gis = response.data.tbxx.gis
this.open = true;
this.title = "修改任务";
});
@@ -578,7 +585,7 @@ export default {
this.form = response.data;
this.tbxxInfo = JSON.parse(response.data.tbxx.info);
this.mapInfo.centerPoint = {x:response.data.x,y:response.data.y}
this.mapInfo.centerPoint = {x: response.data.x, y: response.data.y}
this.mapInfo.gis = response.data.tbxx.gis
this.open = true;

3
ruoyi-ui/src/views/cxxm/version/index.vue
View File

@@ -128,7 +128,8 @@
<file-upload v-model="form.apkUrl" @change="handleFile" :fileSize="500" :fileType="['apk']" :limit="1"/>
</el-form-item>
<el-form-item label="更新描述" prop="updateDescription">
<editor v-model="form.updateDescription" :height="200"></editor>
<!-- <editor v-model="form.updateDescription" :height="200"></editor>-->
<el-input v-model="form.updateDescription" type="textarea" placeholder="请输入更新描述" :autosize="{ minRows: 8}"></el-input>
</el-form-item>
<el-form-item label="是否更新" prop="isUpdate">
<el-radio-group v-model="form.isUpdate">

20
ruoyi-ui/src/views/index.vue
View File

@@ -119,15 +119,6 @@
</el-col>
</el-row>
<el-row :gutter="20" style="margin-bottom: 10px">
<el-col :span="4">
<div>
<el-statistic
group-separator=","
:value="statisticsData.yzg"
title="已整改">
</el-statistic>
</div>
</el-col>
<el-col :span="4">
<div>
<el-statistic
@@ -142,7 +133,16 @@
<el-statistic
group-separator=","
:value="statisticsData.wzgdw"
title="未整改到位">
title="整改未到位">
</el-statistic>
</div>
</el-col>
<el-col :span="4">
<div>
<el-statistic
group-separator=","
:value="statisticsData.yzg"
title="整改到位">
</el-statistic>
</div>
</el-col>

4
ruoyi-ui/src/views/login.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">楚雄州自然资源综合执法监管外业工作辅助平台V1.0</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
@@ -173,7 +173,7 @@ export default {
.login-form {
border-radius: 6px;
background: #ffffff;
width: 400px;
width: 450px;
padding: 25px 25px 5px 25px;
.el-input {
height: 38px;

6
ruoyi-ui/src/views/register.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">楚雄州自然资源综合执法监管外业工作辅助平台V1.0</h3>
<el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -61,7 +61,7 @@
</el-form>
<!-- 底部 -->
<div class="el-register-footer">
<span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
<!-- <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>-->
</div>
</div>
</template>
@@ -164,7 +164,7 @@ export default {
.register-form {
border-radius: 6px;
background: #ffffff;
width: 400px;
width: 450px;
padding: 25px 25px 5px 25px;
.el-input {
height: 38px;

2
ruoyi-ui/src/views/system/dict/data.vue
View File

@@ -399,4 +399,4 @@ export default {
}
}
};
</script>
</script>