feat：企业入驻列表

src/api/car/fault/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 //查询车辆故障列表
 export function findSysCarFaultList(data) {
   return request({
-    url: '/breakdown/car/fault/findSysCarFaultList',
+    url: '/vehicleManagement/car/fault/findSysCarFaultList',
     method: 'post',
     data:data
   })
@@ -11,7 +11,7 @@ export function findSysCarFaultList(data) {
 //添加车辆故障码
 export function addSysCarFault(data) {
   return request({
-    url: '/breakdown/car/fault/addSysCarFault',
+    url: '/vehicleManagement/car/fault/addSysCarFault',
     method: 'post',
     data:data
   })
@@ -19,7 +19,7 @@ export function addSysCarFault(data) {
 //修改车辆故障码
 export function updateSysCarFault(data) {
   return request({
-    url: '/breakdown/car/fault/updateSysCarFault',
+    url: '/vehicleManagement/car/fault/updateSysCarFault',
     method: 'post',
     data:data
   })
@@ -27,14 +27,14 @@ export function updateSysCarFault(data) {
 //删除车辆故障码
 export function deleteSysCarFaultId(id) {
   return request({
-    url: '/breakdown/car/fault/deleteSysCarFaultId?id='+id,
+    url: '/vehicleManagement/car/fault/deleteSysCarFaultId?id='+id,
     method: 'GET'
   })
 }
 //站内信消息列表
 export function findMessageList(data) {
   return request({
-    url: '/breakdown/message/findMessageList',
+    url: '/vehicleManagement/message/findMessageList',
     method: 'post',
     data:data
   })
@@ -42,7 +42,7 @@ export function findMessageList(data) {
 //站内信修改状态
 export function updateMessage(data) {
   return request({
-    url: '/breakdown/message/updateMessage',
+    url: '/vehicleManagement/message/updateMessage',
     method: 'post',
     data:data
   })
@@ -50,7 +50,7 @@ export function updateMessage(data) {
 //查询未读消息条数
 export function selectStatusOne() {
   return request({
-    url: '/breakdown/message/selectStatusOne',
+    url: '/vehicleManagement/message/selectStatusOne',
     method: 'get'
   })
 }

src/api/car/fault/log.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 //查询故障日志列表
 export function findSysFaultLogList(data) {
   return request({
-    url: '/breakdown/list/log/findSysFaultLogList',
+    url: '/vehicleManagement/list/log/findSysFaultLogList',
     method: 'post',
     data:data
   })
@@ -12,7 +12,7 @@ export function findSysFaultLogList(data) {
 //删除故障日志
 export function deleteSysFaultLog(id) {
   return request({
-    url: '/breakdown/list/log/deleteSysFaultLog?id='+id,
+    url: '/vehicleManagement/list/log/deleteSysFaultLog?id='+id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function deleteSysFaultLog(id) {
 //修改故障日志
 export function updateSysFaultLog(data) {
   return request({
-    url: '/breakdown/list/log/updateSysFaultLog',
+    url: '/vehicleManagement/list/log/updateSysFaultLog',
     method: 'post',
     data:data
   })

src/api/car/fault/test.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询消息类型列表
 export function findMessageTypeList(data) {
   return request({
-    url: '/breakdown/type/findMessageTypeList',
+    url: '/vehicleManagement/type/findMessageTypeList',
     method: 'post',
     data:data
   })
@@ -20,7 +20,7 @@ export function findMessageTypeList(data) {
 //规则查询列表
 export function findMessageTypeCarList(data) {
   return request({
-    url: '/breakdown/test/findMessageTypeCarList',
+    url: '/vehicleManagement/test/findMessageTypeCarList',
     method: 'post',
     data:data
   })
@@ -33,7 +33,7 @@ export function findMessageTypeCarList(data) {
 //测试报文故障规则
 export function ruleMessageTypeCar(data) {
   return request({
-    url: '/breakdown/test/ruleMessageTypeCar',
+    url: '/vehicleManagement/test/ruleMessageTypeCar',
     method: 'post',
     data:data
   })
@@ -41,7 +41,7 @@ export function ruleMessageTypeCar(data) {
 //添加规则
 export function addMessageTypeCar(data) {
   return request({
-    url: '/breakdown/test/addMessageTypeCar',
+    url: '/vehicleManagement/test/addMessageTypeCar',
     method: 'post',
     data:data
   })
@@ -49,28 +49,28 @@ export function addMessageTypeCar(data) {
 //VIN下拉框
 export function findSysCarList() {
   return request({
-    url: '/breakdown/test/findSysCarList',
+    url: '/vehicleManagement/test/findSysCarList',
     method: 'get'
   })
 }
 //报文名称下拉框
 export function findSysMessageTypeList() {
   return request({
-    url: '/breakdown/test/findSysMessageTypeList',
+    url: '/vehicleManagement/test/findSysMessageTypeList',
     method: 'get'
   })
 }
 //删除报文规则
 export function deleteMessageTypeCarId(id) {
   return request({
-    url: '/breakdown/test/deleteMessageTypeCarId?id='+id,
+    url: '/vehicleManagement/test/deleteMessageTypeCarId?id='+id,
     method: 'get'
   })
 }
 //修改报文规则
-export function updateMessageTypoeCar(data) {
+export function updateMessageTypeCar(data) {
   return request({
-    url: '/breakdown/test/updateMessageTypoeCar',
+    url: '/vehicleManagement/test/updateMessageTypeCar',
     method: 'post',
     data:data
   })

src/api/firm/enter/index.js

@@ -0,0 +1,14 @@
+import request from '@/utils/request'
+
+/**
+ * 企业入驻列表
+ * @param data
+ * @returns {AxiosPromise}
+ */
+export function findEnterpriseList(data) {
+  return request({
+    url: '/vehicleManagement/firm/findEnterpriseList',
+    method: 'post',
+    data:data
+  })
+}

src/api/login.js

@@ -13,7 +13,7 @@ export function login(username, password, code, uuid) {
   })
 }
 
-// 注册方法
+// 方法
 export function register(data) {
   return request({
     url: '/auth/register',

src/views/car/fault/index.vue

@@ -89,7 +89,7 @@
         width="150">
         <template slot-scope="scope">
             <div slot="reference" class="name-wrapper">
-              <el-tag size="danger">{{ scope.row.faultTypeName }}</el-tag>
+              <el-tag size="danger">{{ scope.row.faultType }}</el-tag>
             </div>
         </template>
       </el-table-column>

src/views/car/fault/log.vue

@@ -98,7 +98,7 @@
         label="车辆故障类型"
         width="180">
         <template slot-scope="scope">
-          <span style="margin-left: 10px">{{ scope.row.faultTypeName }}</span>
+          <span style="margin-left: 10px">{{ scope.row.faultType }}</span>
         </template>
       </el-table-column>
 
@@ -121,7 +121,7 @@
       <el-table-column
         label="结束报警时间"
         width="180">
-        <template slot-scope="scope">
+        <template lot-scope="scope">
           <span style="margin-left: 10px">{{ scope.row.finishDate }}</span>
         </template>
       </el-table-column>
@@ -157,7 +157,7 @@
         </el-form-item>
 
         <el-form-item label="车辆故障类型" :label-width="formLabelWidth">
-          <el-input v-model="updateform.faultTypeId" autocomplete="off"></el-input>
+          <el-input v-model="updateform.faultType" autocomplete="off"></el-input>
         </el-form-item>
 
         <el-form-item label="故障VIN编码" :label-width="formLabelWidth">
@@ -175,6 +175,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="updateSysFaultLog()">确 定</el-button>
       </div>
+
     </el-dialog>
   </div>
 </template>

src/views/car/fault/test.vue

@@ -131,6 +131,18 @@
         <el-form-item label="VIN码">
           <el-input v-model="updateform.carVin" autocomplete="off"></el-input>
         </el-form-item>
+
+        <el-form-item label="报文名称">
+          <el-input v-model="updateform.messageName" autocomplete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item label="一级故障范围">
+          <el-input v-model="updateform.messageOne" autocomplete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item label="二级故障范围">
+          <el-input v-model="updateform.messageTwo" autocomplete="off"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="updateMessageTypeCar()">确 定</el-button>
@@ -148,7 +160,6 @@ import {addMessageTypeCar} from "@/api/car/fault/test";
 import {findSysCarList} from "@/api/car/fault/test";
 import {findSysMessageTypeList} from "@/api/car/fault/test";
 import {deleteMessageTypeCarId} from "@/api/car/fault/test";
-import {updateMessageTypoeCar} from "@/api/car/fault/test";
 export default {
   //import引入的组件需要注入到对象中才能使用"
   components: {},

src/views/firm/enter/index.vue

@@ -0,0 +1,147 @@
+<template>
+  <div>
+    <el-table
+      :data="tableData"
+      style="width: 100%">
+      <el-table-column
+        label="id"
+        width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.id }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="企业名称"
+        width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.enterpriseName }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="法定代表人"
+        width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.legalPerson }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="经营执照凭证号码"
+        width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.businessLicenseNumber }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="企业成立日期"
+        width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.estabinessDate }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="注册地址"
+        width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.address }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="企业状态"
+        width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px" v-if="scope.row.status==1">正常</span>
+          <span style="margin-left: 10px" v-if="scope.row.status==2">停用</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="企业入住平台日期"
+        width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.registrationDate }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="会员级别"
+        width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.member }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+//例如：import 《组件名称》 from '《组件路径》,
+import {findEnterpriseList} from "@/api/firm/enter";
+export default {
+  //import引入的组件需要注入到对象中才能使用"
+  components: {},
+  props: {},
+  data() {
+    //这里存放数据"
+
+    return {
+      tableData:[],
+      enterpriseForm:{},
+    };
+  },
+  //计算属性 类似于data概念",
+  computed: {},
+  //监控data中的数据变化",
+  watch: {},
+  //方法集合",
+  methods: {
+    findEnterpriseList(){
+      findEnterpriseList(this.enterpriseForm).then((res)=>{
+        this.tableData=res.data;
+      })
+    }
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+    this.findEnterpriseList();
+  },
+  //生命周期 - 挂载完成（可以访问DOM元素）",
+  mounted() {
+  },
+  beforeCreate() {
+  }, //生命周期 - 创建之前",
+  beforeMount() {
+  }, //生命周期 - 挂载之前",
+  beforeUpdate() {
+  }, //生命周期 - 更新之前",
+  updated() {
+  }, //生命周期 - 更新之后",
+  beforeDestroy() {
+  }, //生命周期 - 销毁之前",
+  destroyed() {
+  }, //生命周期 - 销毁完成",
+  activated() {
+  } //如果页面有keep-alive缓存功能，这个函数会触发",
+};
+</script>
+<style scoped>
+
+</style>

src/views/register.vue

@@ -2,6 +2,17 @@
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
       <h3 class="title">若依后台管理系统</h3>
+      <el-form-item prop="deptName">
+        <el-input
+          v-model="registerForm.deptName"
+          auto-complete="off"
+          placeholder="企业"
+          type="deptName"
+          @keyup.enter.native="handleRegister"
+        >
+<!--          <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="password"/>-->
+        </el-input>
+      </el-form-item>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" auto-complete="off" placeholder="账号" type="text">
           <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="user"/>
@@ -29,20 +40,20 @@
           <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="password"/>
         </el-input>
       </el-form-item>
-      <el-form-item v-if="captchaEnabled" prop="code">
-        <el-input
-          v-model="registerForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleRegister"
-        >
-          <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="validCode"/>
-        </el-input>
-        <div class="register-code">
-          <img :src="codeUrl" class="register-code-img" @click="getCode"/>
-        </div>
-      </el-form-item>
+<!--      <el-form-item v-if="captchaEnabled" prop="code">-->
+<!--        <el-input-->
+<!--          v-model="registerForm.code"-->
+<!--          auto-complete="off"-->
+<!--          placeholder="验证码"-->
+<!--          style="width: 63%"-->
+<!--          @keyup.enter.native="handleRegister"-->
+<!--        >-->
+<!--          <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="validCode"/>-->
+<!--        </el-input>-->
+<!--        <div class="register-code">-->
+<!--          <img :src="codeUrl" class="register-code-img" @click="getCode"/>-->
+<!--        </div>-->
+<!--      </el-form-item>-->
       <el-form-item style="width:100%;">
         <el-button
           :loading="loading"
@@ -89,6 +100,9 @@ export default {
         uuid: ""
       },
       registerRules: {
+        deptName: [
+          {required: true, trigger: "blur", message: "请输入企业"},
+        ],
         username: [
           {required: true, trigger: "blur", message: "请输入您的账号"},
           {min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur'}

src/views/system/dept/index.vue

@@ -155,6 +155,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="数据库" prop="email">
+              <el-input v-model="form.databaseName" maxlength="50" placeholder="请输入数据库名称"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/system/user/index.vue

@@ -227,7 +227,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
+            <el-form-item label="归属" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"/>
             </el-form-item>
           </el-col>