Yangwl
/
xy_tyrems
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改电子围栏

Browse Source
master
夜笙歌 1 year ago
parent 70d2f638c3
commit fad0a64ed6
3 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File

12
ruoyi-ui/src/views/GPS/car/index.vue
Unescape Escape View File

@ -12,10 +12,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="接收机" prop="internationalization2"> <el-form-item label="收发器" prop="machineId">
<el-input <el-input
v-model="queryParams.internationalization2" v-model="queryParams.machineId"
:placeholder="t('common.pleaseEnter') + '接收机'" :placeholder="t('common.pleaseEnter') + '收发器'"
clearable clearable
style="width: 200px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -56,8 +56,8 @@
<el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
<el-table-column align="center" fixed type="selection" width="55"/> <el-table-column align="center" fixed type="selection" width="55"/>
<el-table-column label="序号" align="center" type="index" width="50" /> <el-table-column label="序号" align="center" type="index" width="50" />
<el-table-column label="GPS时间" align="center" prop="internationalization2" <!-- <el-table-column label="GPS时间" align="center" prop="internationalization2"-->
width="150"/> <!-- width="150"/>-->
<el-table-column label="收发器ID" align="center" prop="machineId" <el-table-column label="收发器ID" align="center" prop="machineId"
width="150"/> width="150"/>
<el-table-column label="车牌号" align="center" prop="carLicense" <el-table-column label="车牌号" align="center" prop="carLicense"
@ -138,7 +138,7 @@ const queryParams = ref({
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
carLicense: undefined, carLicense: undefined,
internationalization2: undefined, machineId: undefined,
internationalization3: undefined, internationalization3: undefined,
}) })

164
ruoyi-ui/src/views/report/temppresspeed/index.vue
Unescape Escape View File

@ -5,39 +5,34 @@
:label-width=" locale ? '100px':'140px'"> :label-width=" locale ? '100px':'140px'">
<el-form-item label="外胎号" prop="outerTireNumber"> <el-form-item label="外胎号" prop="outerTireNumber">
<el-input <el-input
v-model="queryParams.outerTireNumber" v-model="queryParams.outerTireNumber"
placeholder="请输入外胎号" placeholder="请输入外胎号"
style="width: 200px" style="width: 200px"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="时间" style="width: 308px;"> <el-form-item label="时间" style="width: 308px;">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
<el-button type="primary" icon="Search" @click="handleQuery">{{ t('option.search') }}</el-button> <el-button type="primary" icon="Search" @click="handleQuery">{{ t('option.search') }}</el-button>
<el-button icon="Refresh" @click="resetQuery">{{ t('option.reset') }}</el-button> <el-button icon="Refresh" @click="resetQuery">{{ t('option.reset') }}</el-button>
<el-form-item label="轮位" prop="outerTireNumber">
<el-input
v-model="position"
:disabled="true">
</el-input>
</el-form-item>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;"> <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
<temp /> <temp ref="tempRef"/>
</el-row> </el-row>
<el-row :gutter="32"> <el-row :gutter="32">
<el-col :xs="24" :sm="24" :lg="8" @click="handleTyreMileage"> <el-col :xs="24" :sm="24" :lg="8" @click="handleTyreMileage">
@ -47,12 +42,12 @@
</el-col> </el-col>
<el-col :xs="24" :sm="24" :lg="8"> <el-col :xs="24" :sm="24" :lg="8">
<div class="chart-wrapper"> <div class="chart-wrapper">
<pie-chart /> <pie-chart ref="pieRef"/>
</div> </div>
</el-col> </el-col>
<el-col :xs="24" :sm="24" :lg="8"> <el-col :xs="24" :sm="24" :lg="8">
<div class="chart-wrapper"> <div class="chart-wrapper">
<bar-chart /> <bar-chart ref="barRef"/>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -60,77 +55,82 @@
</template> </template>
<script setup name="basetyre"> <script setup name="basetyre">
import {useI18n} from 'vue-i18n'; import {useI18n} from 'vue-i18n';
import Cookies from "js-cookie"; import Cookies from "js-cookie";
import Temp from '@/views/dashboard/Temp' import Temp from '@/views/dashboard/Temp'
import RaddarChart from '@/views/dashboard/RaddarChart' import RaddarChart from '@/views/dashboard/RaddarChart'
import PieChart from '@/views/dashboard/PieChart' import PieChart from '@/views/dashboard/PieChart'
import BarChart from '@/views/dashboard/BarChart' import BarChart from '@/views/dashboard/BarChart'
import {getTempdata} from "@/api/report/report"; import {getTempdata} from "@/api/report/report";
import * as echarts from 'echarts' import * as echarts from 'echarts'
provide('echart', echarts) provide('echart', echarts)
const {t} = useI18n(); const {t} = useI18n();
const locale = (Cookies.get('language') || 'zhCn') === 'zhCn' const locale = (Cookies.get('language') || 'zhCn') === 'zhCn'
const {proxy} = getCurrentInstance(); const {proxy} = getCurrentInstance();
// 搜索区域开关标识 // 搜索区域开关标识
const showSearch = ref(true); const showSearch = ref(true);
const dateRange = ref([]);
const tempRef = ref();
const pieRef = ref();
const barRef = ref()
// 搜索参数 // 搜索参数
const queryParams = ref({ const queryParams = ref({
outerTireNumber: null, outerTireNumber: null,
}) })
// 表单验证规则 // 表单验证规则
const rules = { const rules = {
outerTireNumber: [{required: true, message: "胎号不能为空", trigger: "blur"}], outerTireNumber: [{required: true, message: "胎号不能为空", trigger: "blur"}],
} }
// 表单数据 // 表单数据
const form = ref({}); const form = ref({});
/** 表单重置 */ /** 表单重置 */
function reset() { function reset() {
form.value = { form.value = {
outerTireNumber: null, outerTireNumber: null,
}; };
proxy.resetForm("postRef"); proxy.resetForm("postRef");
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {
getTempdata(queryParams.value).then(response => { getTempdata(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
console.log(response) tempRef.value.setData(response.data);
}).finally(() => { pieRef.value.setData(response?.data?.WarnData);
loading.value = false; barRef.value.setData(response?.data?.patternTextureList)
}); }).finally(() => {
//getList(); //loading.value = false;
} });
/** 搜索按钮操作 */ //getList();
function handleTyreMileage() { }
/** 搜索按钮操作 */
function handleTyreMileage() {
// this.$tab.openPage("用户管理", "/system/user"); }
} /** 重置按钮操作 */
/** 重置按钮操作 */ const resetQuery = () => {
const resetQuery = () => { proxy.resetForm("queryRef");
proxy.resetForm("queryRef"); handleQuery();
handleQuery(); }
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.dashboard-editor-container { .dashboard-editor-container {
padding: 32px; padding: 32px;
background-color: rgb(240, 242, 245); background-color: rgb(240, 242, 245);
position: relative; position: relative;
.chart-wrapper { .chart-wrapper {
background: #fff; background: #fff;
padding: 16px 16px 0; padding: 16px 16px 0;
margin-bottom: 32px; margin-bottom: 32px;
}
} }
}
@media (max-width:1024px) { @media (max-width:1024px) {
.chart-wrapper { .chart-wrapper {
padding: 8px; padding: 8px;
}
} }
}
</style> </style>

4
ruoyi-ui/vite.config.js
Unescape Escape View File

@ -34,9 +34,9 @@ export default defineConfig(({mode, command}) => {
// open: true, // open: true,
proxy: { proxy: {
'/dev-api': { '/dev-api': {
// target: 'https://ticptest.tercelo.com/dev-api', target: 'https://ticptest.tercelo.com/dev-api',
// target: 'http://47.94.93.46/dev-api', // target: 'http://47.94.93.46/dev-api',
target: 'http://10.11.41.249:8080', // target: 'http://10.11.41.249:8080',
// target: 'http://localhost:8080', // target: 'http://localhost:8080',
changeOrigin: true, changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '') rewrite: (p) => p.replace(/^\/dev-api/, '')

Write Preview
Loading…
Cancel
Save