fix:修改logo

This commit is contained in:
SunTao 2025-05-14 10:38:18 +08:00
parent 60fea4c700
commit 2bd65a8b2a
11 changed files with 112 additions and 93 deletions

View File

@ -1,5 +1,13 @@
###
# @Author: SunTao 328867980@qq.com
# @Date: 2025-05-06 09:10:45
# @LastEditors: SunTao 328867980@qq.com
# @LastEditTime: 2025-05-14 10:21:47
# @FilePath: \znxjxt-copy\.env.development
# @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
###
# 页面标题 # 页面标题
VUE_APP_TITLE = 智能巡检系统 VUE_APP_TITLE = 智领未来
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'

View File

@ -1,5 +1,5 @@
# 页面标题 # 页面标题
VUE_APP_TITLE = 智能巡检系统 VUE_APP_TITLE = 智领未来
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'

View File

@ -1,5 +1,5 @@
# 页面标题 # 页面标题
VUE_APP_TITLE = 智能巡检系统 VUE_APP_TITLE = 智领未来
NODE_ENV = production NODE_ENV = production

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 39 KiB

BIN
src/assets/logo/logo2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com * @Author: SunTao 328867980@qq.com
* @Date: 2024-10-08 09:26:24 * @Date: 2024-10-08 09:26:24
* @LastEditors: SunTao 328867980@qq.com * @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2024-12-19 11:35:24 * @LastEditTime: 2025-05-12 09:58:02
* @FilePath: \znxjxt-ui\src\views\index.vue * @FilePath: \znxjxt-ui\src\views\index.vue
* @Description: 系统首页 * @Description: 系统首页
--> -->
@ -10,16 +10,10 @@
<div class="app-container" v-loading="loading"> <div class="app-container" v-loading="loading">
<fssm-scroll :showBar="false"> <fssm-scroll :showBar="false">
<div class="top-content"> <div class="top-content">
<div <div class="top-div" :class="`top-div-${index}`" v-for="(item, index) in topList" :key="`top-div-${index}`">
class="top-div"
:class="`top-div-${index}`"
v-for="(item, index) in topList"
:key="`top-div-${index}`"
>
<div class="name">{{ item.name }}</div> <div class="name">{{ item.name }}</div>
<div class="value"> <div class="value">
<span>{{ item.value }}</span <span>{{ item.value }}</span>{{ item.unit }}
>{{ item.unit }}
</div> </div>
</div> </div>
</div> </div>
@ -31,14 +25,14 @@
<disease-index></disease-index> <disease-index></disease-index>
</div> </div>
</div> </div>
<div class="bottom-content"> <!-- <div class="bottom-content">
<div class="road-content"> <div class="road-content">
<road-index></road-index> <road-index></road-index>
</div> </div>
<div class="traffic-content"> <div class="traffic-content">
<traffic-index></traffic-index> <traffic-index></traffic-index>
</div> </div>
</div> </div> -->
</fssm-scroll> </fssm-scroll>
</div> </div>
</template> </template>
@ -79,9 +73,9 @@ export default {
.then(({ code, data }) => { .then(({ code, data }) => {
if (code === 200) { if (code === 200) {
this.topList = [ this.topList = [
{ name: "路面病害总数", value: data.road, unit: "个" }, { name: "螺栓脱落总数", value: data.road, unit: "个" },
{ name: "交安事件总数 ", value: data.event, unit: "个" }, { name: "护拦板检测总数 ", value: data.event, unit: "个" },
{ name: "桥隧病害总数", value: data.bridge, unit: "个" }, { name: "轮廓标丢失总数", value: data.bridge, unit: "个" },
{ name: "绿化待处理问题数", value: data.green, unit: "个" }, { name: "绿化待处理问题数", value: data.green, unit: "个" },
]; ];
} }
@ -151,7 +145,7 @@ export default {
.middle-content { .middle-content {
width: 100%; width: 100%;
height: 60%; height: 80%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -189,4 +183,3 @@ export default {
} }
} }
</style> </style>

View File

@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com * @Author: SunTao 328867980@qq.com
* @Date: 2024-10-08 09:26:24 * @Date: 2024-10-08 09:26:24
* @LastEditors: SunTao 328867980@qq.com * @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2024-11-05 11:15:48 * @LastEditTime: 2025-05-14 10:16:08
* @FilePath: \znxjxt-ui\src\views\login.vue * @FilePath: \znxjxt-ui\src\views\login.vue
* @Description: 系统登录页 * @Description: 系统登录页
--> -->
@ -10,7 +10,7 @@
<template> <template>
<div class="login"> <div class="login">
<div class="login-title"> <div class="login-title">
<div class="mini-title"></div> <div class="mini-title">智领未来</div>
<div class="middle-title"> <div class="middle-title">
<div>智能巡检系统</div> <div>智能巡检系统</div>
<div><span>安全生产</span><span>可视化便捷</span></div> <div><span>安全生产</span><span>可视化便捷</span></div>
@ -215,10 +215,12 @@ export default {
.mini-title { .mini-title {
width: 100%; width: 100%;
height: 15%; height: 15%;
padding-left: 3.5rem;
font-size: 1.4rem;
font-weight: 600; font-weight: 600;
background-image: url("../assets/images/login-title.png"); background-image: url("../assets/images/login-title.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 30% 55%; background-size: 15% 55%;
} }
.middle-title { .middle-title {

View File

@ -2,9 +2,9 @@
* @Author: SunTao 328867980@qq.com * @Author: SunTao 328867980@qq.com
* @Date: 2025-03-25 11:10:16 * @Date: 2025-03-25 11:10:16
* @LastEditors: SunTao 328867980@qq.com * @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2025-05-09 09:21:07 * @LastEditTime: 2025-05-12 14:01:29
* @FilePath: \znxjxt-ui\src\views\xj\inspection\diease-line\index.vue * @FilePath: \znxjxt-ui\src\views\xj\inspection\diease-line\index.vue
* @Description: 地图展示病害-首页 * @Description: 护拦板检测-首页-910001
--> -->
<template> <template>
<div class="diease-line-content"> <div class="diease-line-content">
@ -12,7 +12,7 @@
<el-form :model="queryParams" :rules="rules" ref="queryForm" size="small" :inline="true" label-width="100px"> <el-form :model="queryParams" :rules="rules" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="巡检任务" prop="segmentId"> <el-form-item label="巡检任务" prop="segmentId">
<el-select v-model="queryParams.segmentId" placeholder="请选择巡检任务" filterable clearable> <el-select v-model="queryParams.segmentId" placeholder="请选择巡检任务" filterable clearable>
<el-option v-for="item in segmentList" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in taskList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="桩号"> <el-form-item label="桩号">
@ -31,30 +31,27 @@
:min="0"></el-input-number> :min="0"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">筛选</el-button> <el-button type="primary" size="mini" @click="handleQuery">筛选</el-button>
<el-button size="mini" @click="handleCanel"> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div class="diease-container"> <div class="diease-container">
<div class="diease-left"> <div class="diease-left">
<!-- 列表 --> <!-- 列表 -->
<el-table ref="roadTable" v-loading="loading" :data="tableList" style="width: 100%"> <el-table ref="roadTable" v-loading="loading" height="500" :data="tableList" style="width: 100%">
<el-table-column label="路段名称" align="center" prop="segmentName"> <el-table-column label="巡检任务" align="center" prop="segmentName">
</el-table-column> </el-table-column>
<el-table-column label="类型" align="center" prop="defectTypeName" /> <el-table-column label="类型" align="center" prop="defectTypeName" />
<el-table-column label="开始桩号" align="center" prop="stakeStart" /> <el-table-column label="桩号" align="center" prop="stakeStart" />
<el-table-column label="结束桩号" align="center" prop="stakeEnd" /> <el-table-column label="护拦杆高度" align="center" prop="hei">
<el-table-column label="创建时间" align="center" prop="createdTimeLocal">
<template slot-scope="scope">
{{ scope.row.createdTimeLocal.replace("T", " ") }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-view" @click="showScreenImg(scope.row)">查看 <el-button size="mini" type="text" icon="el-icon-view" @click="showScreenImg(scope.row)">查看
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
<!-- 分页组件 --> <!-- 分页组件 -->
<div class="pagination-part"> <div class="pagination-part">
@ -95,7 +92,7 @@
</template> </template>
<script> <script>
import { getBarrierBoardList } from "@/api/xj/diseaseLine"; import { listDefect, getTaskList } from "@/api/xj/disease";
import * as echarts from "echarts"; import * as echarts from "echarts";
export default { export default {
name: "DieaseLine", name: "DieaseLine",
@ -119,7 +116,7 @@ export default {
// //
searchForm: {}, searchForm: {},
// //
segmentList: [], taskList: [],
// //
rules: { rules: {
segmentId: [ segmentId: [
@ -137,6 +134,10 @@ export default {
page: 1, page: 1,
size: 10, size: 10,
}, },
// echartX
xData: [],
// echartY
yData: [],
// //
showImageDialog: false, showImageDialog: false,
@ -148,16 +149,50 @@ export default {
}, },
mounted() { mounted() {
this.getTableList() this.getTableList()
this.getTaskSelectList()
}, },
methods: { methods: {
/**
* @description: 查询巡检任务下拉数据
* @param {*} val
* @return {*}
*/
getTaskSelectList() {
getTaskList().then(({ code, data }) => {
if (code === 200) {
this.taskList = data;
}
});
},
/** /**
* @description: 获取表格数据 * @description: 获取表格数据
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
getTableList() { getTableList() {
//
this.loading = true;
const params = {
...this.searchForm,
...this.pagination,
classType: "2",
defectType: "910001",
};
listDefect(params)
.then((response) => {
this.tableList = response.rows;
this.xData = response.rows.map((item) => {
return item.segmentName
});
this.yData = response.rows.map((item) => { return item.hei });
this.tableTotal = response.total;
this.loading = false;
this.drawChart() this.drawChart()
})
.catch(() => {
this.loading = false;
});
}, },
/** /**
@ -166,7 +201,32 @@ export default {
* @return {*} * @return {*}
*/ */
handleQuery() { handleQuery() {
this.searchForm = JSON.parse(JSON.stringify(this.queryParams));
this.pagination.page = 1;
this.getTableList();
},
/**
* @description: 点击重置事件事件
* @param {*}
* @return {*}
*/
handleCanel() {
this.queryParams = {
//
segmentId: "",
//
stakeStart: "",
//
stakeEnd: "",
//
minHei: "",
//
maxHei: "",
};
this.searchForm = {}
this.pagination.page = 1;
this.getTableList();
}, },
/** /**
@ -197,7 +257,6 @@ export default {
drawChart() { drawChart() {
const chart = echarts.init(this.$refs.cardChart); const chart = echarts.init(this.$refs.cardChart);
chart.setOption({ chart.setOption({
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
backgroundColor: 'rgba(33,56,77,1)', backgroundColor: 'rgba(33,56,77,1)',
@ -233,7 +292,7 @@ export default {
containLabel: true containLabel: true
}, },
xAxis: { xAxis: {
data: ['00:00', '02:00', '04:00', '06:00', '08:00', '10:00', '12:00', '14:00', '16:00', '18:00', '20:00', '22:00'], data: this.xData,
type: 'category', type: 'category',
boundaryGap: true, boundaryGap: true,
axisLabel: { axisLabel: {
@ -304,7 +363,7 @@ export default {
// color: "rgba(241,162,42,1)", // color: "rgba(241,162,42,1)",
color: 'rgba(26, 119, 221, 1)' color: 'rgba(26, 119, 221, 1)'
}, },
data: [40, 58, 40, 44, 61, 58, 77, 60, 78, 53, 70, 53] data: this.yData
} }
] ]
}) })
@ -325,7 +384,7 @@ export default {
/** /**
* @description: 图片位置信息获取 * @description: 图片位置信息获取
* @param {*} val * @param {*}
* @return {*} * @return {*}
*/ */
updateRects() { updateRects() {

View File

@ -2,7 +2,7 @@
* @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
* @Date: 2024-10-08 10:58:25 * @Date: 2024-10-08 10:58:25
* @LastEditors: SunTao 328867980@qq.com * @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2025-05-09 17:01:12 * @LastEditTime: 2025-05-09 17:06:20
* @FilePath: \znxjxt-ui\src\views\xj\inspection\disease-management\index.vue * @FilePath: \znxjxt-ui\src\views\xj\inspection\disease-management\index.vue
* @Description: 巡检信息管理-病害管理 * @Description: 巡检信息管理-病害管理
--> -->
@ -19,27 +19,6 @@
<el-date-picker v-model="dateTime" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" <el-date-picker v-model="dateTime" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable /> format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable />
</el-form-item> </el-form-item>
<!-- <el-form-item label="病害类型" prop="paramsDefectType">
<el-cascader v-model="paramsDefectType" :options="tableDefect" :props="{
checkStrictly: true,
emitPath: true,
children: 'subTypes',
}" clearable></el-cascader>
</el-form-item> -->
<!-- <el-form-item label="病害状态" prop="state">
<el-select
v-model="queryParams.state"
placeholder="请选择病害状态"
clearable
>
<el-option
v-for="item in defectStatus"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> -->
<el-form-item label="上下行" prop="inspectDirection"> <el-form-item label="上下行" prop="inspectDirection">
<el-select v-model="queryParams.inspectDirection" placeholder="请选择" clearable> <el-select v-model="queryParams.inspectDirection" placeholder="请选择" clearable>
<el-option label="上行" value="0" /> <el-option label="上行" value="0" />
@ -57,23 +36,10 @@
<el-form-item label="病害id" prop="id"> <el-form-item label="病害id" prop="id">
<el-input v-model="queryParams.id" placeholder="请填写病害id" clearable /> <el-input v-model="queryParams.id" placeholder="请填写病害id" clearable />
</el-form-item> </el-form-item>
<el-form-item label="病害长度" prop="lengthRange">
<el-input-number v-model="queryParams.minLen" controls-position="right" placeholder="最小长度"
:min="0"></el-input-number>
<span style="margin: 0 5px">-</span>
<el-input-number v-model="queryParams.maxLen" controls-position="right" placeholder="最大长度"
:min="0"></el-input-number>
</el-form-item>
<el-form-item label="快照id" prop="snapshotId"> <el-form-item label="快照id" prop="snapshotId">
<el-input v-model="queryParams.snapshotId" placeholder="请填写快照id" clearable /> <el-input v-model="queryParams.snapshotId" placeholder="请填写快照id" clearable />
</el-form-item> </el-form-item>
<el-form-item label="病害面积" prop="areaRange">
<el-input-number v-model="queryParams.minArea" controls-position="right" placeholder="最小面积"
:min="0"></el-input-number>
<span style="margin: 0 5px">-</span>
<el-input-number v-model="queryParams.maxArea" controls-position="right" placeholder="最大面积"
:min="0"></el-input-number>
</el-form-item>
<el-form-item label="巡检任务" prop="taskId"> <el-form-item label="巡检任务" prop="taskId">
<el-select v-model="queryParams.taskId" placeholder="请选择巡检任务" filterable clearable> <el-select v-model="queryParams.taskId" placeholder="请选择巡检任务" filterable clearable>
<el-option v-for="item in taskList" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in taskList" :key="item.value" :label="item.label" :value="item.value" />
@ -145,11 +111,6 @@
<img @click="showScreenImg(scope.row)" height="50" :src="scope.row.mediaUrl" /> <img @click="showScreenImg(scope.row)" height="50" :src="scope.row.mediaUrl" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="病害长度" align="center" prop="targetLen">
<template slot-scope="scope">
{{ scope.row.targetLen * 1 <= 0 ? "" : `${scope.row.targetLen}` }} </template>
</el-table-column>
<el-table-column label="病害面积" align="center" prop="targetArea" />
<el-table-column label="道路方向" align="center" prop="inspectDirection"> <el-table-column label="道路方向" align="center" prop="inspectDirection">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
@ -157,7 +118,7 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="viewDefect(scope.row)">查看 <el-button size="mini" type="text" icon="el-icon-edit" @click="viewDefect(scope.row)">查看
</el-button> </el-button>
@ -632,6 +593,8 @@ export default {
const params = { const params = {
...this.queryParams, ...this.queryParams,
...this.pagination, ...this.pagination,
classType: "2",
defectType: "910003",
startTime: this.dateTime ? this.dateTime[0] : "", startTime: this.dateTime ? this.dateTime[0] : "",
endTime: this.dateTime ? this.dateTime[1] : "", endTime: this.dateTime ? this.dateTime[1] : "",
}; };
@ -720,8 +683,6 @@ export default {
const phonereg = /^K\d{4}\+\d{3}$/; const phonereg = /^K\d{4}\+\d{3}$/;
if (this.queryParams.stakeStart) { if (this.queryParams.stakeStart) {
if (phonereg.test(this.queryParams.stakeStart)) { if (phonereg.test(this.queryParams.stakeStart)) {
this.queryParams.classType = "2"
this.queryParams.defectType = "910003";
this.pagination.page = 1; this.pagination.page = 1;
this.getList(); this.getList();
} else { } else {
@ -729,16 +690,12 @@ export default {
} }
} else if (this.queryParams.stakeEnd) { } else if (this.queryParams.stakeEnd) {
if (phonereg.test(this.queryParams.stakeEnd)) { if (phonereg.test(this.queryParams.stakeEnd)) {
this.queryParams.classType = "2"
this.queryParams.defectType = "910003";
this.pagination.page = 1; this.pagination.page = 1;
this.getList(); this.getList();
} else { } else {
this.$modal.msgWarning("请按照格式填写公里桩进行修改"); this.$modal.msgWarning("请按照格式填写公里桩进行修改");
} }
} else { } else {
this.queryParams.classType = "2"
this.queryParams.defectType = "910003";
this.pagination.page = 1; this.pagination.page = 1;
this.getList(); this.getList();
} }

View File

@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin') const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '智能巡检系统' // 网页标题 const name = process.env.VUE_APP_TITLE || '智领未来' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 80 // 端口