修改电子围栏

2 years ago · fad0a64ed6
parent 70d2f638c3
commit fad0a64ed6
3 changed files with 90 additions and 90 deletions
--- a/ruoyi-ui/src/views/GPS/car/index.vue
+++ b/ruoyi-ui/src/views/GPS/car/index.vue
@ -12,10 +12,10 @@
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item label="接收机" prop="internationalization2">
+      <el-form-item label="收发器" prop="machineId">
        <el-input
-            v-model="queryParams.internationalization2"
-            :placeholder="t('common.pleaseEnter') + '接收机'"
+            v-model="queryParams.machineId"
+            :placeholder="t('common.pleaseEnter') + '收发器'"
            clearable
            style="width: 200px"
            @keyup.enter.native="handleQuery"
@ -56,8 +56,8 @@
    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
      <el-table-column align="center" fixed type="selection" width="55"/>
      <el-table-column label="序号" align="center" type="index" width="50" />
-      <el-table-column label="GPS时间" align="center" prop="internationalization2"
-                       width="150"/>
+<!--      <el-table-column label="GPS时间" align="center" prop="internationalization2"-->
+<!--                       width="150"/>-->
      <el-table-column label="收发器ID" align="center" prop="machineId"
                       width="150"/>
      <el-table-column label="车牌号" align="center" prop="carLicense"
@ -138,7 +138,7 @@ const queryParams = ref({
  pageNum: 1,
  pageSize: 10,
  carLicense: undefined,
-  internationalization2: undefined,
+  machineId: undefined,
  internationalization3: undefined,
 })

--- a/ruoyi-ui/src/views/report/temppresspeed/index.vue
+++ b/ruoyi-ui/src/views/report/temppresspeed/index.vue
@ -26,18 +26,13 @@
      <el-form-item label=" ">
        <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-form-item label="轮位" prop="outerTireNumber">
-          <el-input
-                  v-model="position"
-                  :disabled="true">
-          </el-input>
-        </el-form-item>
+
      </el-form-item>

    </el-form>

    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <temp  />
+      <temp  ref="tempRef"/>
    </el-row>
    <el-row :gutter="32">
      <el-col :xs="24" :sm="24" :lg="8" @click="handleTyreMileage">
@ -47,12 +42,12 @@
      </el-col>
      <el-col :xs="24" :sm="24" :lg="8">
        <div class="chart-wrapper">
-          <pie-chart />
+          <pie-chart ref="pieRef"/>
        </div>
      </el-col>
      <el-col :xs="24" :sm="24" :lg="8">
        <div class="chart-wrapper">
-          <bar-chart />
+          <bar-chart ref="barRef"/>
        </div>
      </el-col>
    </el-row>
@ -60,63 +55,68 @@
 </template>

 <script setup name="basetyre">
-  import {useI18n} from 'vue-i18n';
-  import Cookies from "js-cookie";
-  import Temp from '@/views/dashboard/Temp'
-  import RaddarChart from '@/views/dashboard/RaddarChart'
-  import PieChart from '@/views/dashboard/PieChart'
-  import BarChart from '@/views/dashboard/BarChart'
-  import {getTempdata} from "@/api/report/report";
-  import * as echarts from 'echarts'
-  provide('echart', echarts)
-  const {t} = useI18n();
-  const locale = (Cookies.get('language') || 'zhCn') === 'zhCn'
-  const {proxy} = getCurrentInstance();
-  // 搜索区域开关标识
-  const showSearch = ref(true);
+import {useI18n} from 'vue-i18n';
+import Cookies from "js-cookie";
+import Temp from '@/views/dashboard/Temp'
+import RaddarChart from '@/views/dashboard/RaddarChart'
+import PieChart from '@/views/dashboard/PieChart'
+import BarChart from '@/views/dashboard/BarChart'
+import {getTempdata} from "@/api/report/report";
+import * as echarts from 'echarts'
+provide('echart', echarts)
+const {t} = useI18n();
+const locale = (Cookies.get('language') || 'zhCn') === 'zhCn'
+const {proxy} = getCurrentInstance();
+// 搜索区域开关标识
+const showSearch = ref(true);
+const dateRange = ref([]);
+const tempRef = ref();
+const pieRef = ref();
+const barRef = ref()

-  // 搜索参数
-  const queryParams = ref({
+// 搜索参数
+const queryParams = ref({
  outerTireNumber: null,
-  })
+})

-  // 表单验证规则
-  const rules = {
+// 表单验证规则
+const rules = {
  outerTireNumber: [{required: true, message: "胎号不能为空", trigger: "blur"}],
-  }
+}


-  // 表单数据
-  const form = ref({});
-  /** 表单重置 */
-  function reset() {
+// 表单数据
+const form = ref({});
+/** 表单重置 */
+function reset() {
  form.value = {
    outerTireNumber: null,
  };
  proxy.resetForm("postRef");
-  }
-  /** 搜索按钮操作 */
-  function handleQuery() {
-    getTempdata(queryParams.value).then(response => {
-      console.log(response)
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  getTempdata(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
+    tempRef.value.setData(response.data);
+    pieRef.value.setData(response?.data?.WarnData);
+    barRef.value.setData(response?.data?.patternTextureList)
  }).finally(() => {
-      loading.value = false;
+    //loading.value = false;
  });
  //getList();
-  }
-  /** 搜索按钮操作 */
-  function handleTyreMileage() {
+}
+/** 搜索按钮操作 */
+function handleTyreMileage() {

-    // this.$tab.openPage("用户管理", "/system/user");
-  }
-  /** 重置按钮操作 */
-  const resetQuery = () => {
+}
+/** 重置按钮操作 */
+const resetQuery = () => {
  proxy.resetForm("queryRef");
  handleQuery();
-  }
+}
 </script>
 <style lang="scss" scoped>
-  .dashboard-editor-container {
+.dashboard-editor-container {
  padding: 32px;
  background-color: rgb(240, 242, 245);
  position: relative;
@ -126,11 +126,11 @@
    padding: 16px 16px 0;
    margin-bottom: 32px;
  }
-  }
+}

-  @media (max-width:1024px) {
+@media (max-width:1024px) {
  .chart-wrapper {
    padding: 8px;
  }
-  }
+}
 </style>
--- a/ruoyi-ui/vite.config.js
+++ b/ruoyi-ui/vite.config.js
@ -34,9 +34,9 @@ export default defineConfig(({mode, command}) => {
            // open: true,
            proxy: {
                '/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://10.11.41.249:8080',
+                    // target: 'http://10.11.41.249:8080',
                    // target: 'http://localhost:8080',
                    changeOrigin: true,
                    rewrite: (p) => p.replace(/^\/dev-api/, '')