From d81c57e9beceffbf8f10997f6010bbfceb07629d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 4 Apr 2023 09:30:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/tireManagement/install.js    |  12 +-
 ruoyi-ui/src/views/dashboard/BarChart.vue     |  51 ++-
 .../src/views/feedback/feedback/index.vue     | 410 ++++++++++++++++++
 ruoyi-ui/src/views/index.vue                  |   4 +-
 .../views/tireManagement/install/index.vue    |  25 +-
 5 files changed, 474 insertions(+), 28 deletions(-)
 create mode 100644 ruoyi-ui/src/views/feedback/feedback/index.vue

diff --git a/ruoyi-ui/src/api/tireManagement/install.js b/ruoyi-ui/src/api/tireManagement/install.js
index 2224bba..e84f6fd 100644
--- a/ruoyi-ui/src/api/tireManagement/install.js
+++ b/ruoyi-ui/src/api/tireManagement/install.js
@@ -42,4 +42,14 @@ export function TyreUnInstall(query) {
         method: 'post',
         data: query
     })
-}
\ No newline at end of file
+}
+
+
+// 修改花纹深度
+export function EditPatternTextureDepth(query) {
+    return request({
+        url: '/basetyre/tyre/EditPatternTextureDepth',
+        method: 'post',
+        data: query
+    })
+}
diff --git a/ruoyi-ui/src/views/dashboard/BarChart.vue b/ruoyi-ui/src/views/dashboard/BarChart.vue
index d8fa33f..8b3b313 100644
--- a/ruoyi-ui/src/views/dashboard/BarChart.vue
+++ b/ruoyi-ui/src/views/dashboard/BarChart.vue
@@ -12,6 +12,7 @@ const animationDuration = 6000
 
 export default {
   mixins: [resize],
+  expose: ['setData'],
   props: {
     className: {
       type: String,
@@ -28,7 +29,10 @@ export default {
   },
   data() {
     return {
-      chart: null
+      chart: null,
+      XData:['高温报警', '低压报警', '电池电量报警', '位置报警'],
+      dataOne:[1,2,3],
+      dataTwo:[3,4,5]
     }
   },
   mounted() {
@@ -44,6 +48,15 @@ export default {
     this.chart = null
   },
   methods: {
+    setData(e) {
+      console.log(e)
+      let item = e.filter(val => !!val )
+      this.XData = item.map(val => val.time || '')
+      this.dataOne = item.map(val => val.course)
+      this.dataTwo = item.map(val => val.textureDepth)
+      console.log(item)
+      this.initChart()
+    },
     initChart() {
       this.chart = echarts.init(this.$el, 'macarons')
 
@@ -51,7 +64,7 @@ export default {
         tooltip: {
           trigger: 'axis',
           axisPointer: {
-            type: 'cross',
+            // type: 'cross',
             crossStyle: {
               color: '#999'
             }
@@ -71,7 +84,7 @@ export default {
         xAxis: [
           {
             type: 'category',
-            data: ['胎号1001', '胎号1001', '胎号1001', '胎号1001', '胎号1001', '胎号1001', '胎号1001'],
+            data: this.XData,
             axisPointer: {
               type: 'shadow'
             }
@@ -81,9 +94,6 @@ export default {
           {
             type: 'value',
             name: '里程',
-            min: 0,
-            max: 500,
-            interval: 50,
             axisLabel: {
               formatter: '{value} KM'
             }
@@ -91,9 +101,6 @@ export default {
           {
             type: 'value',
             name: '花纹深度',
-            min: 0,
-            max: 25,
-            interval: 5,
             axisLabel: {
               formatter: '{value} mm'
             }
@@ -103,26 +110,24 @@ export default {
           {
             name: '里程',
             type: 'bar',
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + ' ml';
-              }
-            },
-            data: [
-              50, 102, 156, 186, 208, 254, 289, 351, 387, 432, 484, 500
-            ]
+            // tooltip: {
+            //   valueFormatter: function (value) {
+            //     return value + ' ml';
+            //   }
+            // },
+            data: this.dataOne,
           },
 
           {
             name: '花纹深度',
             type: 'line',
             yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + ' °C';
-              }
-            },
-            data: [2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 7.9]
+            // tooltip: {
+            //   valueFormatter: function (value) {
+            //     return value + ' °C';
+            //   }
+            // },
+            data: this.dataTwo,
           }
         ]
       })
diff --git a/ruoyi-ui/src/views/feedback/feedback/index.vue b/ruoyi-ui/src/views/feedback/feedback/index.vue
new file mode 100644
index 0000000..5638739
--- /dev/null
+++ b/ruoyi-ui/src/views/feedback/feedback/index.vue
@@ -0,0 +1,410 @@
+
+<template>
+  <div class="app-container">
+    <el-form :model="form" inline label-width="80px">
+      <el-form-item label="所属车队">
+        <el-select v-model="form.carQueue" placeholder="请选择" @change="carQueueChange">
+          <el-option
+              v-for="item in carQueueOption"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="车牌号">
+        <el-select v-model="form.licenseNumber" :disabled='isLicenseNumber' placeholder="请选择"
+                   @change="licenseNumberChange">
+          <el-option
+              v-for="item in licenseNumberOption"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div style="display: inline-block;width: 560px;height:auto">
+      <div class="bg" style="margin-right: 40px;">
+        <div v-for="(item,index) in tireArrangement">
+          <div class="item" @click="tyreClick((index+1)+'-1-1',((index+1)+'排左侧外胎'))">
+            <div
+                :style="`background-color:${backgroundColorState((index+1)+'-1-1')};border-color:${borderColorState((index+1)+'-1-1')}`"
+                class="circle">
+              <span>{{ index + 1 }}排左侧外胎</span>
+            </div>
+          </div>
+          <div class="item" @click="tyreClick((index+1)+'-1-2',((index+1)+'排左侧内胎'))">
+            <div
+                :style="`${item === 2? '':'display:none;'}background-color:${backgroundColorState((index+1)+'-1-2')};border-color:${borderColorState((index+1)+'-1-2')}`"
+                class="circle">
+              <span>{{ index + 1 }}排左侧内胎</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bg">
+        <div v-for="(item,index) in tireArrangement">
+          <div class="item" @click="tyreClick((index+1)+'-2-2',((index+1)+'排右侧内胎'))">
+            <div
+                :style="`${item === 2? '':'display:none;'}background-color:${backgroundColorState((index+1)+'-2-2')};border-color:${borderColorState((index+1)+'-2-2')}`"
+                class="circle">
+              <span>{{ index + 1 }}排右侧内胎</span>
+            </div>
+          </div>
+          <div class="item" @click="tyreClick((index+1)+'-2-1',((index+1)+'排右侧外胎'))">
+            <div
+                :style="`background-color:${backgroundColorState((index+1)+'-2-1')};border-color:${borderColorState((index+1)+'-2-1')}`"
+                class="circle">
+              <span>{{ index + 1 }}排右侧外胎</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="!!nowClick"
+         style="display: inline-block;width: calc(100% - 600px);margin-left: 40px;max-width:400px;height: 200px;vertical-align:top;">
+      <el-form ref="form22" :model="form2" :rules="rules" inline label-width="120px">
+        <el-form-item label="当前轮胎位置" style="width: 100%;">
+          {{ form2.location }}
+        </el-form-item>
+        <el-form-item label="轮胎编号" prop="outerTireNumber" style="width: 100%;">
+          <!--          <el-select-->
+          <!--              v-model="value"-->
+          <!--              :loading="loading"-->
+          <!--              :remote-method="outerTireNumberSearchClick"-->
+          <!--              filterable-->
+          <!--              multiple-->
+          <!--              placeholder="Please enter a keyword"-->
+          <!--              remote-->
+          <!--              reserve-keyword-->
+          <!--          >-->
+          <!--            <el-option-->
+          <!--                v-for="item in outerTireNumberOption"-->
+          <!--                :key="item.value"-->
+          <!--                :label="item.label"-->
+          <!--                :value="item.value"-->
+          <!--            />-->
+          <!--          </el-select>-->
+          <el-input v-model="form2.outerTireNumber">
+            <template #append>
+              <el-button :icon="Search" @click="outerTireNumberSearchClick"/>
+            </template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="轮胎品牌" style="width: 100%;">
+          <el-input v-model="form2.brand" disabled/>
+        </el-form-item>
+        <el-form-item label="规格型号" style="width: 100%;">
+          <el-input v-model="form2.size" disabled/>
+        </el-form-item>
+        <el-form-item label="传感器ID" style="width: 100%;">
+          <el-input v-model="form2.sensorId"/>
+        </el-form-item>
+        <el-form-item label="里程" style="width: 100%;">
+          <el-input-number v-model="form2.carOnlineMileage"/>
+        </el-form-item>
+        <el-form-item label="当前花纹深度" style="width: 100%;">
+          <el-input-number v-model="form2.currentTextureDepth" :precision="2" :step="0.1"/>
+          &nbsp; &nbsp;
+          <el-button @click="EditPatternTextureDepthFun">修改花纹深度</el-button>
+        </el-form-item>
+        <el-form-item label=" ">
+          <el-button type="primary" @click="installClick()">安装/更换</el-button>
+          <!--          <el-button type="primary" @click="installClick(1)">安装/更换</el-button>-->
+          <!--          <el-button type="primary" @click="installClick(2)">更换</el-button>-->
+          <el-button :disabled="!form2?.tyreId" @click="uninstallClick(3)">卸载轮胎</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script name="basetyre" setup>
+import {listCarQueue, setCarTyres, TyreInstall, getTyreInfo, TyreUnInstall,EditPatternTextureDepth} from "@/api/tireManagement/install";
+import {Search} from '@element-plus/icons-vue'
+import {useI18n} from 'vue-i18n';
+import Cookies from "js-cookie";
+
+const {t} = useI18n();
+
+const locale = (Cookies.get('language') || 'zhCn') === 'zhCn'
+const {proxy} = getCurrentInstance();
+const {sys_normal_disable} = proxy.useDict("sys_normal_disable");
+const tireArrangement = ref([])
+const tireList = ref({})
+const isLicenseNumber = ref(true)
+const carQueueList = ref([])
+const carQueueOption = ref([])
+const licenseNumberOption = ref([])
+const nowClick = ref('')
+// 列 - 左1右2 - 外1内2
+const installedTyre = ref([])
+
+
+const form = ref({
+  carQueue: '',
+  licenseNumber: '',
+})
+
+
+const form2 = ref({
+  brand: "",
+  currentTextureDepth: null,
+  outerTireNumber: null,
+  sensorId: "",
+  size: "",
+  tyrePositionVal: '',
+  carOnlineMileage:'',
+  tyrePosition: "",
+})
+const rules = {
+  outerTireNumber: [
+    {required: true, message: '请输入轮胎编号', trigger: 'change'},
+  ]
+}
+const outerTireNumberOption = ref([
+  {
+    value: 'Option1',
+    label: 'Option1',
+  },
+  {
+    value: 'Option2',
+    label: 'Option2',
+  },
+  {
+    value: 'Option3',
+    label: 'Option3',
+  },
+  {
+    value: 'Option4',
+    label: 'Option4',
+  },
+  {
+    value: 'Option5',
+    label: 'Option5',
+  }
+])
+const backgroundColorState = (e) => {
+  if (installedTyre.value.includes(e)) {
+    return '#41ca7f'
+  } else {
+    return '#90bfea'
+  }
+}
+const borderColorState = (e) => {
+  if (e === nowClick.value) {
+    return '#ffff00'
+  }
+  if (installedTyre.value.includes(e)) {
+    return '#41ca7f'
+  } else {
+    return '#90bfea'
+  }
+}
+
+const tyreClick = (e, location) => {
+  nowClick.value = e
+  let data = tireList.value.filter(res => res.tyrePositionVal === e)?.[0] || {}
+  form2.value = {...data, location}
+  console.log(data)
+}
+
+const getList = async () => {
+  let {rows: queueList} = await listCarQueue()
+  carQueueList.value = queueList
+  carQueueOption.value = queueList.map(e => {
+    return {
+      label: e.title,
+      value: e.id
+    }
+  })
+}
+
+const carQueueChange = (e) => {
+  form.value.licenseNumber = null
+  tireArrangement.value = []
+  nowClick.value = ''
+  form2.value = {
+    brand: "",
+    currentTextureDepth: null,
+    outerTireNumber: null,
+    sensorId: "",
+    size: "",
+    tyrePositionVal: '',
+    tyrePosition: "",
+    carOnlineMileage:'',
+    tyreiId: ''
+  }
+  let option = carQueueList.value.filter(res => res.id === e)[0]?.baseCarList || []
+  option.length !== 0 ? isLicenseNumber.value = false : isLicenseNumber.value = true
+  licenseNumberOption.value = option.map(e => {
+    return {
+      label: e.carLicense,
+      value: e.id
+    }
+  })
+}
+
+const licenseNumberChange = async (e) => {
+  form2.value = {
+    brand: "",
+    currentTextureDepth: null,
+    outerTireNumber: null,
+    sensorId: "",
+    size: "",
+    tyrePositionVal: "",
+    carOnlineMileage:'',
+    tyrePosition: "",
+    tyreiId: ''
+  }
+  nowClick.value = ''
+  const {data: res} = await setCarTyres({id: form.value.licenseNumber})
+  tireArrangement.value = (res.carType?.split('T')[1]?.split('|').filter(e => e !== '') || []).map((res) => {
+    return parseInt(res.split('-')[1])
+  })
+  installedTyre.value = res.carTyresList.map(e => (e.tyrePosition?.split('-')[0] + '-' + e.tyrePosition?.split('-')[1] + '-' + e.tyrePosition?.split('-')[2]))
+  tireList.value = res.carTyresList.map(e => {
+    return {
+      ...e,
+      tyrePositionVal: e.tyrePosition?.split('-')[0] + '-' + e.tyrePosition?.split('-')[1] + '-' + e.tyrePosition?.split('-')[2]
+    }
+  })
+}
+
+const outerTireNumberSearchClick = async () => {
+  const {data} = await getTyreInfo({outerTireNumber: form2.value.outerTireNumber})
+  let list = nowClick.value?.split('-').map(e => parseFloat(e))
+  let num = 0
+  if (list[0] === 1) {
+    if (list[1] === 1 && list[2] === 1) {
+      num += 2
+    }
+    if (list[1] === 2 && list[2] === 1) {
+      num += 1
+    }
+  } else {
+    num += 2
+    for (let i = 1; i < list?.[0] - 1; i++) {
+      num += (tireArrangement.value[i - 1] * 4)
+    }
+    if (list[1] === 1 && list[2] === 1) {
+      num += 4
+    }
+    if (list[1] === 1 && list[2] === 2) {
+      num += 3
+    }
+    if (list[1] === 2 && list[2] === 2) {
+      num += 2
+    }
+    if (list[1] === 2 && list[2] === 1) {
+      num += 1
+    }
+
+  }
+  form2.value.brand = data.brand
+  form2.value.size = data.size
+  form2.value.sensorId = data.sensorId
+  form2.value.tyreId = data.id
+  form2.value.tyrePosition = nowClick.value
+}
+
+const installClick = (e) => {
+  let state = e
+  if (!e) {
+    state = 1
+  }
+
+  proxy.$refs["form22"].validate((valid) => {
+    if (valid) {
+      console.log(form2.value)
+      TyreInstall({
+        ...form2.value,
+        carLicense: licenseNumberOption.value.filter(e => e.value === form.value.licenseNumber)?.[0].label,
+        carId: form.value.licenseNumber,
+        type: state
+      }).then(async (e) => {
+        proxy.$modal.msgSuccess(e.msg);
+        let param = nowClick.value
+        let str = form2.value.location
+        await licenseNumberChange()
+        tyreClick(param, str)
+      })
+    }
+  });
+}
+const EditPatternTextureDepthFun = () => {
+  proxy.$refs["form22"].validate((valid) => {
+    if (valid) {
+      console.log(form2.value)
+      EditPatternTextureDepth({
+        ...form2.value,
+        carLicense: licenseNumberOption.value.filter(e => e.value === form.value.licenseNumber)?.[0].label,
+        carId: form.value.licenseNumber,
+        type: 4
+      }).then(async (e) => {
+        proxy.$modal.msgSuccess(e.msg);
+        let param = nowClick.value
+        let str = form2.value.location
+        await licenseNumberChange()
+        tyreClick(param, str)
+      })
+    }
+  });
+}
+
+const uninstallClick = (val) => {
+  if (form2.value.tyreId) {
+    TyreUnInstall({
+      ...form2.value,
+      carLicense: licenseNumberOption.value.filter(e => e.value === form.value.licenseNumber)?.[0].label,
+      carId: form.value.licenseNumber,
+      type: val
+    }).then(async (e) => {
+      proxy.$modal.msgSuccess(e.msg);
+      let param = nowClick.value
+      let str = form2.value.location
+      await licenseNumberChange()
+      tyreClick(param, str)
+    })
+  }
+}
+
+getList()
+</script>
+<style lang="scss">
+.bg {
+  display: inline-block;
+  width: 260px;
+  height: 100%;
+  background-color: #eee;
+
+  :not(:first-child) {
+    margin-top: 20px;
+  }
+
+  .item {
+    text-align: center;
+    width: 100px;
+    height: 100px;
+    display: inline-block;
+    margin-left: 20px;
+  }
+
+  .circle {
+    width: 100%;
+    height: 100%;
+    background-color: #90bfea;
+    border-radius: 50%;
+    border: 2px solid #90bfea;
+
+    span {
+      display: inline-block;
+      width: 100%;
+      float: left;
+      line-height: 96px;
+      vertical-align: top;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 7afa249..2547de5 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -47,7 +47,7 @@
       </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>
@@ -72,6 +72,7 @@
   const dateRange = ref([]);
   const tempRef = ref();
   const pieRef = ref();
+  const barRef = ref()
 
   // 搜索参数
   const queryParams = ref({
@@ -98,6 +99,7 @@
     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;
     });
diff --git a/ruoyi-ui/src/views/tireManagement/install/index.vue b/ruoyi-ui/src/views/tireManagement/install/index.vue
index c6aa962..590e982 100644
--- a/ruoyi-ui/src/views/tireManagement/install/index.vue
+++ b/ruoyi-ui/src/views/tireManagement/install/index.vue
@@ -101,12 +101,12 @@
           <el-input v-model="form2.sensorId"/>
         </el-form-item>
         <el-form-item label="里程" style="width: 100%;">
-          <el-input v-model="form2.carOnlineMileage"/>
+          <el-input-number v-model="form2.carOnlineMileage"/>
         </el-form-item>
         <el-form-item label="当前花纹深度" style="width: 100%;">
           <el-input-number v-model="form2.currentTextureDepth" :precision="2" :step="0.1"/>
           &nbsp; &nbsp;
-          <el-button @click="installClick(4)">修改花纹深度</el-button>
+          <el-button @click="EditPatternTextureDepthFun">修改花纹深度</el-button>
         </el-form-item>
         <el-form-item label=" ">
           <el-button type="primary" @click="installClick()">安装/更换</el-button>
@@ -120,7 +120,7 @@
 </template>
 
 <script name="basetyre" setup>
-import {listCarQueue, setCarTyres, TyreInstall, getTyreInfo, TyreUnInstall} from "@/api/tireManagement/install";
+import {listCarQueue, setCarTyres, TyreInstall, getTyreInfo, TyreUnInstall,EditPatternTextureDepth} from "@/api/tireManagement/install";
 import {Search} from '@element-plus/icons-vue'
 import {useI18n} from 'vue-i18n';
 import Cookies from "js-cookie";
@@ -332,6 +332,25 @@ const installClick = (e) => {
     }
   });
 }
+const EditPatternTextureDepthFun = () => {
+  proxy.$refs["form22"].validate((valid) => {
+    if (valid) {
+      console.log(form2.value)
+      EditPatternTextureDepth({
+        ...form2.value,
+        carLicense: licenseNumberOption.value.filter(e => e.value === form.value.licenseNumber)?.[0].label,
+        carId: form.value.licenseNumber,
+        type: 4
+      }).then(async (e) => {
+        proxy.$modal.msgSuccess(e.msg);
+        let param = nowClick.value
+        let str = form2.value.location
+        await licenseNumberChange()
+        tyreClick(param, str)
+      })
+    }
+  });
+}
 
 const uninstallClick = (val) => {
   if (form2.value.tyreId) {

From d1798d3dad31f4eafbf2fe94bdf7bfbec0cee3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 4 Apr 2023 10:27:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/dashboard/BarChart.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ruoyi-ui/src/views/dashboard/BarChart.vue b/ruoyi-ui/src/views/dashboard/BarChart.vue
index 8b3b313..5592db9 100644
--- a/ruoyi-ui/src/views/dashboard/BarChart.vue
+++ b/ruoyi-ui/src/views/dashboard/BarChart.vue
@@ -70,6 +70,12 @@ export default {
             }
           }
         },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
         toolbox: {
           feature: {
             dataView: { show: true, readOnly: false },