From 4daecfda926695e44a309a998415f0ac84fc5087 Mon Sep 17 00:00:00 2001
From: Wang YiHang <3060234389@qq.com>
Date: Sat, 5 Oct 2024 15:10:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=89=8D=E5=8F=B0=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/car/breakdown.js            | 10 ++--
 src/api/platform/log.js             | 10 ++--
 src/api/warning/logs.js             | 10 ++--
 src/api/warning/rule.js             | 10 ++--
 src/api/warning/strategy.js         | 10 ++--
 src/views/car/car/index.vue         | 73 +++++++++++++----------------
 src/views/car/fault/index.vue       |  5 ++
 src/views/firm/firmInfo/index.vue   |  8 ++--
 src/views/message/message/index.vue |  4 +-
 src/views/platform/log/index.vue    |  5 ++
 src/views/reveal/data/index.vue     | 10 ++--
 11 files changed, 75 insertions(+), 80 deletions(-)

diff --git a/src/api/car/breakdown.js b/src/api/car/breakdown.js
index d84078cd..b1eaa396 100644
--- a/src/api/car/breakdown.js
+++ b/src/api/car/breakdown.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询车辆故障列表
 export function listBreakdown(query) {
   return request({
-    url: '/breakdown/breakdown/list',
+    url: '/car/breakdown/list',
     method: 'get',
     params: query
 
@@ -13,7 +13,7 @@ export function listBreakdown(query) {
 // 查询车辆故障详细
 export function getBreakdown(id) {
   return request({
-    url: '/breakdown/breakdown/' + id,
+    url: '/car/breakdown/' + id,
     method: 'get'
   })
 }
@@ -21,7 +21,7 @@ export function getBreakdown(id) {
 // 新增车辆故障
 export function addBreakdown(data) {
   return request({
-    url: '/breakdown/breakdown',
+    url: '/car/breakdown',
     method: 'post',
     data: data
   })
@@ -30,7 +30,7 @@ export function addBreakdown(data) {
 // 修改车辆故障
 export function updateBreakdown(data) {
   return request({
-    url: '/breakdown/breakdown',
+    url: '/car/breakdown',
     method: 'put',
     data: data
   })
@@ -39,7 +39,7 @@ export function updateBreakdown(data) {
 // 删除车辆故障
 export function delBreakdown(id) {
   return request({
-    url: '/breakdown/breakdown/' + id,
+    url: '/car/breakdown/' + id,
     method: 'delete'
   })
 }
diff --git a/src/api/platform/log.js b/src/api/platform/log.js
index 5af2203c..b4df46b7 100644
--- a/src/api/platform/log.js
+++ b/src/api/platform/log.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询故障日志列表
 export function listLog(query) {
   return request({
-    url: '/breakdown/log/list',
+    url: '/car/log/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listLog(query) {
 // 查询故障日志详细
 export function getLog(id) {
   return request({
-    url: '/breakdown/log/' + id,
+    url: '/car/log/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getLog(id) {
 // 新增故障日志
 export function addLog(data) {
   return request({
-    url: '/breakdown/log',
+    url: '/car/log',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addLog(data) {
 // 修改故障日志
 export function updateLog(data) {
   return request({
-    url: '/breakdown/log',
+    url: '/car/log',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateLog(data) {
 // 删除故障日志
 export function delLog(id) {
   return request({
-    url: '/breakdown/log/' + id,
+    url: '/car/log/' + id,
     method: 'delete'
   })
 }
diff --git a/src/api/warning/logs.js b/src/api/warning/logs.js
index cc5f885e..16372808 100644
--- a/src/api/warning/logs.js
+++ b/src/api/warning/logs.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询预警日志列表
 export function listLogs(query) {
   return request({
-    url: '/warn/logs/list',
+    url: '/car/logs/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listLogs(query) {
 // 查询预警日志详细
 export function getLogs(id) {
   return request({
-    url: '/warn/logs/' + id,
+    url: '/car/logs/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getLogs(id) {
 // 新增预警日志
 export function addLogs(data) {
   return request({
-    url: '/warn/logs',
+    url: '/car/logs',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addLogs(data) {
 // 修改预警日志
 export function updateLogs(data) {
   return request({
-    url: '/warn/logs',
+    url: '/car/logs',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateLogs(data) {
 // 删除预警日志
 export function delLogs(id) {
   return request({
-    url: '/warn/logs/' + id,
+    url: '/car/logs/' + id,
     method: 'delete'
   })
 }
diff --git a/src/api/warning/rule.js b/src/api/warning/rule.js
index bf896136..755f08c0 100644
--- a/src/api/warning/rule.js
+++ b/src/api/warning/rule.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询预警规则列表
 export function listRule(query) {
   return request({
-    url: '/warn/rule/list',
+    url: '/car/rule/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listRule(query) {
 // 查询预警规则详细
 export function getRule(id) {
   return request({
-    url: '/warn/rule/' + id,
+    url: '/car/rule/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getRule(id) {
 // 新增预警规则
 export function addRule(data) {
   return request({
-    url: '/warn/rule/add',
+    url: '/car/rule/add',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addRule(data) {
 // 修改预警规则
 export function updateRule(data) {
   return request({
-    url: '/warn/rule',
+    url: '/car/rule',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateRule(data) {
 // 删除预警规则
 export function delRule(id) {
   return request({
-    url: '/warn/rule/' + id,
+    url: '/car/rule/' + id,
     method: 'delete'
   })
 }
diff --git a/src/api/warning/strategy.js b/src/api/warning/strategy.js
index 6cec6de0..0a8b7734 100644
--- a/src/api/warning/strategy.js
+++ b/src/api/warning/strategy.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询预警策略列表
 export function listStrategy(query) {
   return request({
-    url: '/warn/strategy/list',
+    url: '/car/strategy/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listStrategy(query) {
 // 查询预警策略详细
 export function getStrategy(id) {
   return request({
-    url: '/warn/strategy/' + id,
+    url: '/car/strategy/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getStrategy(id) {
 // 新增预警策略
 export function addStrategy(data) {
   return request({
-    url: '/warn/strategy',
+    url: '/car/strategy',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addStrategy(data) {
 // 修改预警策略
 export function updateStrategy(data) {
   return request({
-    url: '/warn/strategy',
+    url: '/car/strategy',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateStrategy(data) {
 // 删除预警策略
 export function delStrategy(id) {
   return request({
-    url: '/warn/strategy/' + id,
+    url: '/car/strategy/' + id,
     method: 'delete'
   })
 }
diff --git a/src/views/car/car/index.vue b/src/views/car/car/index.vue
index fdc644de..7177ec61 100644
--- a/src/views/car/car/index.vue
+++ b/src/views/car/car/index.vue
@@ -69,13 +69,6 @@
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['car:car:edit']"
-          >修改</el-button>
           <el-button
             size="mini"
             type="text"
@@ -102,8 +95,15 @@
       @pagination="getList"
     />
 
-    <el-dialog title="车辆报表" :visible.sync="dialogTableVisible">
-      <el-table v-loading="loading" :data="messageList" @selection-change="handleSelectionChange">
+    <el-tabs v-model="activeTab" @tab-click="handleTypeTabClick" v-if="dialogTableVisible">
+      <el-tab-pane
+        v-for="(item, index) in options"
+        :key="item.value"
+        :label="item.label"
+        :name="item.value"
+      >
+      </el-tab-pane>
+      <el-table v-loading="loading" :data="messageList" @selection-change="handleSelectionChange" v-if="srcs==''">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="车辆报文类型编码" align="center" prop="messageTypeCode" />
         <el-table-column label="报文字段" align="center" >
@@ -114,40 +114,11 @@
           </template>
         </el-table-column>
       </el-table>
-    </el-dialog>
+    </el-tabs>
 
-    <!-- 添加或修改车辆基础信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="车辆VIN码" prop="carVin">
-          <el-input v-model="form.carVin" placeholder="请输入车辆VIN码" />
-        </el-form-item>
-        <el-form-item label="车辆车牌号" prop="carPlate">
-          <el-input v-model="form.carPlate" placeholder="请输入车辆车牌号" />
-        </el-form-item>
-        <el-form-item label="车辆品牌" prop="carBrand">
-          <el-input v-model="form.carBrand" placeholder="请输入车辆品牌" />
-        </el-form-item>
-        <el-form-item label="车辆型号" prop="carModel">
-          <el-input v-model="form.carModel" placeholder="请输入车辆型号" />
-        </el-form-item>
-        <el-form-item label="车辆车型" prop="carModel">
-          <el-input v-model="form.carType" placeholder="请输入车辆型号" />
-        </el-form-item>
-        <el-form-item label="启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中" prop="state">
-          <el-input v-model="form.state" placeholder="请输入启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+    <iframe :src="srcs" width="100%" height="1000px" frameborder="0" v-if="srcs!=''"></iframe>
 
-    <el-button @click="gotoMessage">添加报文</el-button>
+<!--    <el-button @click="gotoMessage">添加报文</el-button>-->
     <iframe :src="src" width="100%" height="1000px" frameborder="0"></iframe>
   </div>
 </template>
@@ -161,6 +132,22 @@ export default {
   name: "Car",
   data() {
     return {
+      srcs:'',
+      options: [
+        {
+          value: '',
+          label: '车辆数据'
+        },
+        {
+          value: '/car/log',
+          label: '故障日志'
+        },
+        {
+          value: '/car/breakdown',
+          label: '车辆故障'
+        }
+      ],
+      activeTab: '',
       src:'/firm/map',
       test:[],
       messageList: [],
@@ -223,6 +210,10 @@ export default {
     document.querySelector('.tags-view-container').style.display = 'none';
   },
   methods: {
+    handleTypeTabClick(tab){
+      console.log(tab.name)
+      this.srcs = tab.name
+    },
     gotoMessage(){
       this.$router.push({ path: '/firm/car/message' });
     },
diff --git a/src/views/car/fault/index.vue b/src/views/car/fault/index.vue
index fa64928b..8a14e327 100644
--- a/src/views/car/fault/index.vue
+++ b/src/views/car/fault/index.vue
@@ -210,6 +210,11 @@ export default {
   created() {
     this.getList();
   },
+  mounted() {
+    this.$store.dispatch('app/toggleSideBarHide',true);
+    document.querySelector('.navbar').style.display = 'none';
+    document.querySelector('.tags-view-container').style.display = 'none';
+  },
   methods: {
     /** 查询车辆故障列表 */
     getList() {
diff --git a/src/views/firm/firmInfo/index.vue b/src/views/firm/firmInfo/index.vue
index 9f75af3e..0b456862 100644
--- a/src/views/firm/firmInfo/index.vue
+++ b/src/views/firm/firmInfo/index.vue
@@ -120,9 +120,6 @@
     <!-- 添加或修改企业基础信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="数据库名" prop="tableName">
-          <el-input v-model="form.tableName" placeholder="请输入统一社会信用代码" />
-        </el-form-item>
         <el-form-item label="统一社会信用代码" prop="firmCreditCode">
           <el-input v-model="form.firmCreditCode" placeholder="请输入统一社会信用代码" />
         </el-form-item>
@@ -136,10 +133,10 @@
           <image-upload v-model="form.firmLogs"/>
         </el-form-item>
         <el-form-item label="企业登录名" prop="firmUser">
-          <el-input v-model="form.firmUser" placeholder="请输入企业登录名" />
+          <el-input v-model="form.userName" placeholder="请输入企业登录名" />
         </el-form-item>
         <el-form-item label="企业登录密码" prop="firmPassword">
-          <el-input v-model="form.firmPassword" placeholder="请输入企业登录密码" />
+          <el-input v-model="form.password" placeholder="请输入企业登录密码" />
         </el-form-item>
         <el-form-item label="启用状态" prop="state">
           <el-select v-model="form.state" placeholder="请选择启用状态">
@@ -287,6 +284,7 @@ export default {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+
             });
           }
         }
diff --git a/src/views/message/message/index.vue b/src/views/message/message/index.vue
index 4d06b42b..4299b09b 100644
--- a/src/views/message/message/index.vue
+++ b/src/views/message/message/index.vue
@@ -100,11 +100,11 @@ export default {
     return {
       options: [
         {
-          value: 'identification',
+          value: 'basics',
           label: '车辆基础'
         },
         {
-          value: 'information',
+          value: 'info',
           label: '车辆数据'
         },
         {
diff --git a/src/views/platform/log/index.vue b/src/views/platform/log/index.vue
index 38f399a3..b57ac117 100644
--- a/src/views/platform/log/index.vue
+++ b/src/views/platform/log/index.vue
@@ -206,6 +206,11 @@ export default {
   created() {
     this.getList();
   },
+  mounted() {
+    this.$store.dispatch('app/toggleSideBarHide',true);
+    document.querySelector('.navbar').style.display = 'none';
+    document.querySelector('.tags-view-container').style.display = 'none';
+  },
   methods: {
     /** 查询故障日志列表 */
     getList() {
diff --git a/src/views/reveal/data/index.vue b/src/views/reveal/data/index.vue
index 2b73f67e..fe2c6b7f 100644
--- a/src/views/reveal/data/index.vue
+++ b/src/views/reveal/data/index.vue
@@ -30,13 +30,9 @@ export default {
           label: '车辆数据'
         },
         {
-          value: '/car/log',
-          label: '故障日志'
-        },
-        {
-          value: '/car/breakdown',
-          label: '车辆故障'
-        },
+          value: '/firm/car/message',
+          label: '车辆报文'
+        }
       ],
       activeTab: '/firm/car/car'
     };