Merge remote-tracking branch 'origin/master'

src/api/car/car.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询车辆基础信息列表
 export function listCar(query) {
   return request({
-    url: '/car/car/list',
+    url: '/saas/car/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listCar(query) {
 // 查询车辆基础信息详细
 export function getCar(id) {
   return request({
-    url: '/car/car/' + id,
+    url: '/saas/car/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getCar(id) {
 // 新增车辆基础信息
 export function addCar(data) {
   return request({
-    url: '/car/car',
+    url: '/saas/car',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addCar(data) {
 // 修改车辆基础信息
 export function updateCar(data) {
   return request({
-    url: '/car/car',
+    url: '/saas/car',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateCar(data) {
 // 删除车辆基础信息
 export function delCar(id) {
   return request({
-    url: '/car/car/' + id,
+    url: '/saas/car/' + id,
     method: 'delete'
   })
 }

src/api/car/message/template.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 报文模版列表
 export function templateList() {
   return request({
-    url: 'car/messageTemplate/list',
+    url: 'saas/messageTemplate/list',
     method: 'POST',
   })
 }
@@ -11,7 +11,7 @@ export function templateList() {
 //添加报文模版
 export function addTemplate(data) {
   return request({
-    url: 'car/messageTemplate/',
+    url: 'saas/messageTemplate/',
     method: 'POST',
     data: data
   })
@@ -20,7 +20,7 @@ export function addTemplate(data) {
 // 报文数据列表
 export function valueList(data) {
   return request({
-    url: 'car/messageValue/list',
+    url: 'saas/messageValue/list',
     method: 'POST',
     data: data
   })
@@ -29,7 +29,7 @@ export function valueList(data) {
 // 添加报文数据
 export function addValue(data) {
   return request({
-    url: 'car/messageValue/',
+    url: 'saas/messageValue/',
     method: 'POST',
     data: data
   })

src/api/car/type.js

@@ -3,7 +3,7 @@ import request from "@/utils/request";
 //查询所有的车辆类型
 export function listType(){
   return  request({
-    url: '/car/sysType/list',
+    url: '/saas/sysType/list',
     method: 'get'
   })
 

src/api/platform/logs.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询预警日志列表
 export function listLogs(query) {
   return request({
-    url: '/warn/logs/list',
+    url: '/saas/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: '/saas/logs/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getLogs(id) {
 // 新增预警日志
 export function addLogs(data) {
   return request({
-    url: '/warn/logs',
+    url: '/saas/logs',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addLogs(data) {
 // 修改预警日志
 export function updateLogs(data) {
   return request({
-    url: '/warn/logs',
+    url: '/saas/logs',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateLogs(data) {
 // 删除预警日志
 export function delLogs(id) {
   return request({
-    url: '/warn/logs/' + id,
+    url: '/saas/logs/' + id,
     method: 'delete'
   })
 }

src/api/platform/rule.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询预警规则列表
 export function listRule(query) {
   return request({
-    url: '/warn/rule/list',
+    url: '/saas/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: '/saas/rule/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getRule(id) {
 // 新增预警规则
 export function addRule(data) {
   return request({
-    url: '/warn/rule',
+    url: '/saas/rule',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addRule(data) {
 // 修改预警规则
 export function updateRule(data) {
   return request({
-    url: '/warn/rule',
+    url: '/saas/rule',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateRule(data) {
 // 删除预警规则
 export function delRule(id) {
   return request({
-    url: '/warn/rule/' + id,
+    url: '/saas/rule/' + id,
     method: 'delete'
   })
 }

src/api/platform/strategy.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 // 查询预警策略列表
 export function listStrategy(query) {
   return request({
-    url: '/warn/strategy/list',
+    url: '/saas/strategy/list',
     method: 'get',
     params: query
   })
@@ -13,7 +13,7 @@ export function listStrategy(query) {
 // 查询预警策略详细
 export function getStrategy(id) {
   return request({
-    url: '/warn/strategy/' + id,
+    url: '/saas/strategy/' + id,
     method: 'get'
   })
 }
@@ -21,7 +21,7 @@ export function getStrategy(id) {
 // 新增预警策略
 export function addStrategy(data) {
   return request({
-    url: '/warn/strategy',
+    url: '/saas/strategy',
     method: 'post',
     data: data
   })
@@ -30,7 +30,7 @@ export function addStrategy(data) {
 // 修改预警策略
 export function updateStrategy(data) {
   return request({
-    url: '/warn/strategy',
+    url: '/saas/strategy',
     method: 'put',
     data: data
   })
@@ -39,15 +39,7 @@ export function updateStrategy(data) {
 // 删除预警策略
 export function delStrategy(id) {
   return request({
-    url: '/warn/strategy/' + id,
+    url: '/saas/strategy/' + id,
     method: 'delete'
   })
-
-
-
-
-
-
-
-
 }

src/views/platform/rule/index.vue

@@ -141,13 +141,13 @@
           <el-input v-model="form.ruleName" placeholder="请输入规则名称" />
         </el-form-item>
         <el-form-item label="报文数据类型id" prop="msgTypeId">
-          <el-select ref="select" v-model="form.msgTypeId" multiple placeholder="请选择报文数据名称">
+          <el-select ref="select" v-model="form.msgTypeId" multiple  placeholder="请选择报文数据名称">
             <el-option
               v-for="item in templateValueList"
               :key="item.messageId"
               :label="item.messageCode"
               :value="item.messageId">
-<!--              <el-checkbox @change="clickBox(item.messageId)" :value ="value.includes(item.messageId)" :label="item.messageCode"></el-checkbox>-->
+              <el-checkbox @change="clickBox(item.messageId)" :value ="value.includes(item.messageId)" :label="item.messageCode"></el-checkbox>
             </el-option>
           </el-select>
         </el-form-item>
@@ -188,6 +188,7 @@
 import { listRule, getRule, delRule, addRule, updateRule } from "/src/api/platform/rule";
 import { listStrategy} from "@/api/platform/strategy";
 import {valueList} from "@/api/car/message/template";
+import item from "@/layout/components/Sidebar/Item.vue";
 
 export default {
   name: "Rule",
@@ -255,6 +256,7 @@ export default {
     this.getList();
   },
   methods: {
+
     clickBox(val) {
       console.log('val::', val);
       let values = this.value
@@ -265,6 +267,14 @@ export default {
         this.value = values
       }
       console.log('this.value::', this.value)
+      this.value.forEach((item,index)=>{
+        // console.log("item:"+item);
+        // console.log("index"+index);
+        this.form.msgTypeId += ","+item;
+      })
+      console.log(this.form.msgTypeId.substring(1));
+
+
 
     },
     /** 查询预警规则列表 */