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,15 +96,16 @@
             <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>
     </template>
-        <el-dialog
+    <el-dialog
-          title="请为你的汽车配置预警策略"
+      title="请为你的汽车配置预警策略"
-          :visible.sync="dialogVisible"
+      :visible.sync="dialogVisible"
-          width="30%">
+      width="30%">
           <span>
                       <el-select v-model="strategyId" placeholder="请选择策略">
                     <el-option
@@ -202,11 +117,11 @@
                   </el-select>
 
           </span>
-          <span slot="footer" class="dialog-footer">
+      <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="updCarStrategyId">确 定</el-button>
       </span>
-        </el-dialog>
+    </el-dialog>
 
     <el-drawer
       title="绑定围栏组"
@@ -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,226 +258,249 @@ 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 {
-    //import引入的组件需要注入到对象中才能使用"
+  dicts: ['sys_car_group'],
-    components: {},
+  //import引入的组件需要注入到对象中才能使用"
-    props: {},
+  components: {},
-    data() {
+  props: {},
-      //这里存放数据"
+  data() {
-      return {
+    //这里存放数据"
-        GroupAndCarBound:{
+    return {
-           vin:null,
+      GroupAndCarBound:{
-          //多选框选中内容
+        vin:null,
-          groupListResp: [],
+        //多选框选中内容
-        },
+        groupListResp: [],
-        insertForm: {},
-        updateForm: {},
-        //围栏组列表
-        groupList:[],
-        //抽屉属性
-        drawer:false,
-        //抽屉呼出方向   从右到左
-        direction:'rtl',
-        dialogVisibleAdd: false,
-        dialogVisibleUpd: false,
-          strategyId:null,
-          carId:null,
-        dialogVisible: false,
-        tableData: [],
-
-        // 查询参数
-        selectInformation: {
-          pageNum: 1,
-          pageSize: 10,
-          carVin:'',
-          carType:'',
-          groupCode:'',
-          state:'1',
-          carMotorManufacturer:'',
-          carBatteryManufacturer:''
-        },
-        zt:{
-          status: ""
-        },
-        strategyList:[],
-        queryParams:{},
-      };
-    },
-    //计算属性 类似于data概念",
-    computed: {},
-    //监控data中的数据变化",
-    watch: {},
-    //方法集合",
-    methods: {
-
-      dobound(){
-
-        boundGroupAndCar(this.GroupAndCarBound).then(res=>{
-
-          this.$modal.msgSuccess("绑定成功");
-          this.drawer=false;
-        })
-
-
-      },
-      handleSelectionChange(val) {
-        this.GroupAndCarBound.groupListResp = val;
       },
 
+      //围栏组列表
+      groupList:[],
+      //抽屉属性
+      drawer:false,
+      //抽屉呼出方向   从右到左
+      direction:'rtl',
 
-      handleClose(done) {
+      strategyId:null,
-        this.$confirm('确认关闭？')
+      carId:null,
-          .then(_ => {
+      dialogVisible: false,
-            done();
+      tableData: [],
-          })
-          .catch(_ => {});
-      },
 
-      boundFenceGroup(row){
+      // 查询参数
-            this.GroupAndCarBound.vin=row.carVin;
+      selectInformation: {
-        selectAllGroup().then(res=>{
+        pageNum: 1,
+        pageSize: 10,
+        carVin:'',
+        carType:'',
+        groupCode:'',
+        state:'1',
+        carMotorManufacturer:'',
+        carBatteryManufacturer:''
+      },
+      zt:{
+        status: ""
+      },
+      strategyList:[],
+      queryParams:{},
 
-          this.groupList = res.data;
+      insertForm: {},
+      updateForm: {},
+      dialogVisibleAdd: false,
+      dialogVisibleUpd: false,
+    };
+  },
+  //计算属性 类似于data概念",
+  computed: {},
+  //监控data中的数据变化",
+  watch: {},
+  //方法集合",
+  methods: {
 
-          console.log(this.groupList);
+    lookboundGroup(row){
-          this.drawer =true;
+      selectAllGroup().then(res=>{
-        })
+        this.groupList = res.data;
+      })
+      this.drawer=true;
 
-      },
+      getGroupListResp(row).then(res=>{
-      updCarStrategyId(){
-        updCarStrategyId(this.carId,this.strategyId).then((res)=>{
-          this.$modal.msgSuccess("修改成功");
-          this.dialogVisible = false;
-          this.getList();
-        })
-      },
-      /** 给车辆配置策略*/
-      configurationStrategy(row){
-        this.dialogVisible = true
-        this.carId=row.id
-        this.getStrategyList(row.typeId);
-      },
 
-      getStrategyList(typeId) {
+        let rows = res.data;
-        this.loading = true;
+        console.log(rows)
-        findStrategyListByCarTypeId(typeId).then(response => {
+        if (rows!=null&&rows!=undefined&&rows!=''){
-          this.strategyList = response.data.rows;
+          rows.forEach(row => {
-          this.total = response.data.total;
+            console.log(this.groupList[row.id-1]);
-          this.loading = false;
+            console.log(row);
-          console.log(response)
+            this.$refs.multipleTable.toggleRowSelection(this.groupList[row.id-1]);
-        });
+          });
-      },
-
-      /** 列表 */
-      getList() {
-        findInformationList(this.selectInformation).then(res => {
-            this.tableData = res.data;
-          }
-        );
-      },
-      // 状态修改
-      handleStatusChange(row) {
-        let text = row.state === "0" ? "上线" : "下线";
-        this.$modal.confirm('确认要"' + text + '""' + row.carBrand + '"车辆吗？').then(function () {
-          return gaiZhuangTai(row.id, row.state);
-        }).then(() => {
-          this.$modal.msgSuccess(text + "成功");
-        }).catch(function () {
-          row.state = row.state === "0" ? "1" : "0";
-        });
-      },
-      // 提交
-      onSubmit(){
-        this.getList(this.selectInformation);
-      },
-      // 重置
-      chongzhi(){
-        this.selectInformation={
-          carVin:'',
-          carType:'',
-          groupCode:'',
-          state:'',
-          carMotorManufacturer:'',
-          carBatteryManufacturer:''
         }
-        this.getList();
-      },
-      // 修改
-      handleEdit(row){
-        this.dialogVisibleUpd = true
-        // 回显
-        findInformationByid(row.id).then(res=>{
-          this.updateForm = res.data;
-        })
-      },
-      /** 删除 */
-      handleDelete(row){
-        this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          deleteInformationById(row.id).then(res=>{
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-            this.getList();
-          })
-        })
-      },
-      //添加
-      handleAdd(){
-        this.dialogVisibleAdd = true
-      },
-      doAdd(){
-        insertInformation(this.insertForm).then(res=>{
-          alert(res.msg)
-          if(res.code == 200){
-            alert("添加成功")
-            this.getList();
-          }
 
-        })
-      },
-      doUpd(){
-        updateInformationById(this.updateForm).then(res=>{
-          alert(res.msg)
-          if(res.code == 200){
-            alert("修改成功")
-            this.getList();
-          }
 
-        })
+      })
-      },
+    },
+    dobound(){
+
+      boundGroupAndCar(this.GroupAndCarBound).then(res=>{
+
+        this.$modal.msgSuccess("绑定成功");
+        this.drawer=false;
+      })
+
+
+    },
+    handleSelectionChange(val) {
+      this.GroupAndCarBound.groupListResp = val;
     },
 
 
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done();
+        })
+        .catch(_ => {});
+    },
 
-    //生命周期 - 创建完成（可以访问当前this实例）",
+    boundFenceGroup(row){
-    created() {
+      this.GroupAndCarBound.vin=row.carVin;
+      selectAllGroup().then(res=>{
+
+        this.groupList = res.data;
+
+        console.log(this.groupList);
+        this.drawer =true;
+      })
+
+    },
+    updCarStrategyId(){
+      updCarStrategyId(this.carId,this.strategyId).then((res)=>{
+        this.$modal.msgSuccess("修改成功");
+        this.dialogVisible = false;
+        this.getList();
+      })
+    },
+    /** 给车辆配置策略*/
+    configurationStrategy(row){
+      this.dialogVisible = true
+      this.carId=row.id
+      this.getStrategyList(row.typeId);
+    },
+
+    getStrategyList(typeId) {
+      this.loading = true;
+      findStrategyListByCarTypeId(typeId).then(response => {
+        this.strategyList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
+        console.log(response)
+      });
+    },
+
+    /** 列表 */
+    getList() {
+      findInformationList(this.selectInformation).then(res => {
+          this.tableData = res.data;
+        }
+      );
+    },
+    // 状态修改
+    handleStatusChange(row) {
+      let text = row.state === "0" ? "上线" : "下线";
+      this.$modal.confirm('确认要"' + text + '""' + row.carBrand + '"车辆吗？').then(function () {
+        return gaiZhuangTai(row.id, row.state);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function () {
+        row.state = row.state === "0" ? "1" : "0";
+      });
+    },
+    // 提交
+    onSubmit(){
+      this.getList(this.selectInformation);
+    },
+    // 重置
+    chongzhi(){
+      this.selectInformation={
+        carVin:'',
+        carType:'',
+        groupCode:'',
+        state:'',
+        carMotorManufacturer:'',
+        carBatteryManufacturer:''
+      }
       this.getList();
     },
-    //生命周期 - 挂载完成（可以访问DOM元素）",
+    // 修改
-    mounted() {
+    handleEdit(row){
+      this.dialogVisibleUpd = true
+      // 回显
+      findInformationByid(row.id).then(res=>{
+        this.updateForm = res.data;
+      })
     },
-    beforeCreate() {
+    /** 删除 */
-    }, //生命周期 - 创建之前",
+    handleDelete(row){
-    beforeMount() {
+      this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
-    }, //生命周期 - 挂载之前",
+        confirmButtonText: '确定',
-    beforeUpdate() {
+        cancelButtonText: '取消',
-    }, //生命周期 - 更新之前",
+        type: 'warning'
-    updated() {
+      }).then(() => {
-    }, //生命周期 - 更新之后",
+        deleteInformationById(row.id).then(res=>{
-    beforeDestroy() {
+          this.$message({
-    }, //生命周期 - 销毁之前",
+            type: 'success',
-    destroyed() {
+            message: '删除成功!'
-    }, //生命周期 - 销毁完成",
+          });
-    activated() {
+          this.getList();
-    } //如果页面有keep-alive缓存功能，这个函数会触发",
+        })
-  };
+      })
+    },
+
+    //添加
+    handleAdd(){
+      this.dialogVisibleAdd = true
+    },
+    doAdd(){
+      insertInformation(this.insertForm).then(res=>{
+        alert(res.msg)
+        if(res.code == 200){
+          alert("添加成功")
+          this.getList();
+        }
+
+      })
+    },
+    doUpd(){
+      updateInformationById(this.updateForm).then(res=>{
+        alert(res.msg)
+        if(res.code == 200){
+          alert("修改成功")
+          this.getList();
+        }
+
+      })
+    },
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+    this.getList();
+  },
+  //生命周期 - 挂载完成（可以访问DOM元素）",
+  mounted() {
+  },
+  beforeCreate() {
+  }, //生命周期 - 创建之前",
+  beforeMount() {
+  }, //生命周期 - 挂载之前",
+  beforeUpdate() {
+  }, //生命周期 - 更新之前",
+  updated() {
+  }, //生命周期 - 更新之后",
+  beforeDestroy() {
+  }, //生命周期 - 销毁之前",
+  destroyed() {
+  }, //生命周期 - 销毁完成",
+  activated() {
+  } //如果页面有keep-alive缓存功能，这个函数会触发",
+};
 </script>
 <style scoped>