feat():优化业务功能 10.9

src/api/system/manage/carInformation.js

@@ -12,7 +12,7 @@ export function findInformationList(data) {
 // 新增
 export function insertInformation(data) {
   return request({
-    url: '/manage/carmsg/addCarMsg',
+    url: '/enterprise/information/insertInformation',
     method: 'post',
     data
   })
@@ -21,7 +21,7 @@ export function insertInformation(data) {
 // 修改
 export function updateInformationById(data) {
   return request({
-    url: '/manage/carmsg/updateInformationById',
+    url: '/enterprise/carmsg/updateInformationById',
     method: 'post',
     data
   })
@@ -38,7 +38,7 @@ export function deleteInformationById(id) {
 // 根据ID查询信息
 export function findInformationByid(id) {
   return request({
-    url: '/manage/carmsg/findInformationByid?id='+id,
+    url: '/enterprise/carmsg/findInformationByid?id='+id,
     method: 'post'
   })
 }

src/views/fence/list.vue

@@ -128,7 +128,7 @@
       </el-table-column>
     </el-table>
 
-    <!-- 添加或修改部门对话框 -->
+    <!-- 添加或修改电子围栏对话框 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body width="600px">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>

src/views/system/manage/carInformation/index.vue

@@ -34,94 +34,6 @@
     <div style="height: 40px;width: 700px">
       <el-button type="danger" plain @click="handleAdd">添加</el-button>
     </div>
-    <el-dialog
-      title="添加"
-      :visible.sync="dialogVisibleAdd"
-      width="30%"
-      :before-close="handleClose">
-      <div style="margin: 20px;"></div>
-      <el-form : label-width="80px" :model="insertForm">
-        <el-form-item label="车辆VIn马">
-          <el-input v-model="insertForm.carVin"></el-input>
-        </el-form-item>
-        <el-form-item label="车辆品牌">
-          <el-input v-model="insertForm.carBrand"></el-input>
-        </el-form-item>
-        <el-form-item label="车辆类型外键">
-          <el-input v-model="insertForm.typeId"></el-input>
-        </el-form-item>
-        <el-form-item label="String">
-          <el-input v-model="insertForm.typeName"></el-input>
-        </el-form-item>
-        <el-form-item label="电子围栏外键">
-          <el-input v-model="insertForm.groupId"></el-input>
-        </el-form-item>
-        <el-form-item label="车辆电机厂商">
-          <el-input v-model="insertForm.carMotorManufacturer"></el-input>
-        </el-form-item>
-        <el-form-item label="电机型号">
-          <el-input v-model="insertForm.carMotorModel"></el-input>
-        </el-form-item>
-        <el-form-item label="车辆电池厂商">
-          <el-input v-model="insertForm.carBatteryManufacturer"></el-input>
-        </el-form-item>
-        <el-form-item label="电池型号">
-          <el-input v-model="insertForm.carBatteryModel"></el-input>
-        </el-form-item>
-        <el-form-item label="围栏组编码">
-          <el-input v-model="insertForm.groupCode"></el-input>
-        </el-form-item>
-        <el-form-item label="启用状态">
-          <el-input v-model="insertForm.state"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-    <el-button type="primary" @click=doAdd()>确 定</el-button>
-  </span>
-    </el-dialog>
-<!--    修改-->
-    <el-dialog
-      title="修改"
-      :visible.sync="dialogVisibleUpd"
-      width="30%"
-      :before-close="handleClose">
-      <div style="margin: 20px;"></div>
-      <el-form : label-width="80px" :model="updateForm">
-        <el-form-item label="车辆VIn马">
-          <el-input v-model="updateForm.carVin"></el-input>
-        </el-form-item>
-        <el-form-item label="车辆品牌">
-          <el-input v-model="updateForm.carBrand"></el-input>
-        </el-form-item>
-        <el-form-item label="车辆类型外键">
-          <el-input v-model="updateForm.typeId"></el-input>
-        </el-form-item>
-        <el-form-item label="电子围栏外键">
-          <el-input v-model="updateForm.groupId"></el-input>
-        </el-form-item>
-        <el-form-item label="车辆电机厂商">
-          <el-input v-model="updateForm.carMotorManufacturer"></el-input>
-        </el-form-item>
-        <el-form-item label="电机型号">
-          <el-input v-model="updateForm.carMotorModel"></el-input>
-        </el-form-item>
-        <el-form-item label="车辆电池厂商">
-          <el-input v-model="updateForm.carBatteryManufacturer"></el-input>
-        </el-form-item>
-        <el-form-item label="电池型号">
-          <el-input v-model="updateForm.carBatteryModel"></el-input>
-        </el-form-item>
-        <el-form-item label="围栏组编码">
-          <el-input v-model="updateForm.groupCode"></el-input>
-        </el-form-item>
-        <el-form-item label="启用状态">
-          <el-input v-model="updateForm.state"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-    <el-button type="primary" @click=doUpd()>修 改</el-button>
-  </span>
-    </el-dialog>
     <!--列表-->
     <template>
       <el-table
@@ -144,8 +56,10 @@
           prop="typeName">
         </el-table-column>
         <el-table-column
-          label="电子围栏外键"
+          label="是否绑定围栏">
-          prop="groupId">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_car_group" :value="scope.row.groupId"/>
+          </template>
         </el-table-column>
         <el-table-column
           label="车辆电机厂商"
@@ -182,7 +96,8 @@
             <el-button type="text"  @click="handleEdit(scope.row)">修改</el-button>
             <el-button type="text"  @click="handleDelete(scope.row)">删除</el-button>
             <el-button type="text" @click="configurationStrategy(scope.row)">配置策略</el-button>
-            <el-button type="text" class="el-icon-connection" @click="boundFenceGroup(scope.row)">绑定围栏组</el-button>
+            <el-button type="primary" class="el-icon-connection" @click="boundFenceGroup(scope.row)" v-show="scope.row.groupId==0">绑定围栏组</el-button>
+            <el-button type="success" class="el-icon-link" @click="lookboundGroup(scope.row)" v-show="scope.row.groupId==1">查看围栏组</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -247,7 +162,85 @@
 
     </el-drawer>
 
-
+    <el-dialog
+      title="添加"
+      :visible.sync="dialogVisibleAdd"
+      width="30%"
+      :before-close="handleClose">
+      <div style="margin: 20px;"></div>
+      <el-form label-width="80px" :model="insertForm">
+        <el-form-item label="车辆VIn马">
+          <el-input v-model="insertForm.carVin"></el-input>
+        </el-form-item>
+        <el-form-item label="车辆品牌">
+          <el-input v-model="insertForm.carBrand"></el-input>
+        </el-form-item>
+        <el-form-item label="车辆类型外键">
+          <el-input v-model="insertForm.typeId"></el-input>
+        </el-form-item>
+        <el-form-item label="车辆电机厂商">
+          <el-input v-model="insertForm.carMotorManufacturer"></el-input>
+        </el-form-item>
+        <el-form-item label="电机型号">
+          <el-input v-model="insertForm.carMotorModel"></el-input>
+        </el-form-item>
+        <el-form-item label="车辆电池厂商">
+          <el-input v-model="insertForm.carBatteryManufacturer"></el-input>
+        </el-form-item>
+        <el-form-item label="电池型号">
+          <el-input v-model="insertForm.carBatteryModel"></el-input>
+        </el-form-item>
+        <el-form-item label="围栏组编码">
+          <el-input v-model="insertForm.groupCode"></el-input>
+        </el-form-item>
+        <el-form-item label="启用状态">
+          <el-input v-model="insertForm.state"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+    <el-button type="primary" @click=doAdd()>确 定</el-button>
+  </span>
+    </el-dialog>
+    <!--    修改-->
+    <el-dialog
+      title="修改"
+      :visible.sync="dialogVisibleUpd"
+      width="30%"
+      :before-close="handleClose">
+      <div style="margin: 20px;"></div>
+      <el-form label-width="80px" :model="updateForm">
+        <el-form-item label="车辆VIn马">
+          <el-input v-model="updateForm.carVin"></el-input>
+        </el-form-item>
+        <el-form-item label="车辆品牌">
+          <el-input v-model="updateForm.carBrand"></el-input>
+        </el-form-item>
+        <el-form-item label="车辆类型外键">
+          <el-input v-model="updateForm.typeId"></el-input>
+        </el-form-item>
+        <el-form-item label="车辆电机厂商">
+          <el-input v-model="updateForm.carMotorManufacturer"></el-input>
+        </el-form-item>
+        <el-form-item label="电机型号">
+          <el-input v-model="updateForm.carMotorModel"></el-input>
+        </el-form-item>
+        <el-form-item label="车辆电池厂商">
+          <el-input v-model="updateForm.carBatteryManufacturer"></el-input>
+        </el-form-item>
+        <el-form-item label="电池型号">
+          <el-input v-model="updateForm.carBatteryModel"></el-input>
+        </el-form-item>
+        <el-form-item label="围栏组编码">
+          <el-input v-model="updateForm.groupCode"></el-input>
+        </el-form-item>
+        <el-form-item label="启用状态">
+          <el-input v-model="updateForm.state"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+    <el-button type="primary" @click=doUpd()>修 改</el-button>
+  </span>
+    </el-dialog>
 
 
   </div>
@@ -265,9 +258,10 @@ import {
   updCarStrategyId
 } from '@/api/system/manage/carInformation'
 import { findStrategyListByCarTypeId, updateStrategy } from '@/api/warning/strategy'
-import { boundGroupAndCar, selectAllGroup } from '@/api/fence/group'
+import { boundGroupAndCar, getGroupListResp, selectAllGroup } from '@/api/fence/group'
 
 export default {
+  dicts: ['sys_car_group'],
   //import引入的组件需要注入到对象中才能使用"
   components: {},
   props: {},
@@ -279,16 +273,14 @@ export default {
         //多选框选中内容
         groupListResp: [],
       },
-        insertForm: {},
+
-        updateForm: {},
       //围栏组列表
       groupList:[],
       //抽屉属性
       drawer:false,
       //抽屉呼出方向   从右到左
       direction:'rtl',
-        dialogVisibleAdd: false,
+
-        dialogVisibleUpd: false,
       strategyId:null,
       carId:null,
       dialogVisible: false,
@@ -310,6 +302,11 @@ export default {
       },
       strategyList:[],
       queryParams:{},
+
+      insertForm: {},
+      updateForm: {},
+      dialogVisibleAdd: false,
+      dialogVisibleUpd: false,
     };
   },
   //计算属性 类似于data概念",
@@ -319,6 +316,27 @@ export default {
   //方法集合",
   methods: {
 
+    lookboundGroup(row){
+      selectAllGroup().then(res=>{
+        this.groupList = res.data;
+      })
+      this.drawer=true;
+
+      getGroupListResp(row).then(res=>{
+
+        let rows = res.data;
+        console.log(rows)
+        if (rows!=null&&rows!=undefined&&rows!=''){
+          rows.forEach(row => {
+            console.log(this.groupList[row.id-1]);
+            console.log(row);
+            this.$refs.multipleTable.toggleRowSelection(this.groupList[row.id-1]);
+          });
+        }
+
+
+      })
+    },
     dobound(){
 
       boundGroupAndCar(this.GroupAndCarBound).then(res=>{
@@ -435,6 +453,7 @@ export default {
         })
       })
     },
+
     //添加
     handleAdd(){
       this.dialogVisibleAdd = true
@@ -460,9 +479,6 @@ export default {
       })
     },
   },
-
-
-
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
     this.getList();
@@ -484,7 +500,7 @@ export default {
   }, //生命周期 - 销毁完成",
   activated() {
   } //如果页面有keep-alive缓存功能，这个函数会触发",
-  };
+};
 </script>
 <style scoped>