前台整合

src/api/breakdown/Log.js

@@ -32,3 +32,11 @@ export function listStatusProcess(data){
     data
   })
 }
+
+// 将状态改为忽略
+export  function  updateStatusById(id){
+  return request({
+    url:'/breakdown/log/updateStatusById/'+id,
+    method:'put'
+  })
+}

src/api/login.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 
 // 登录方法
-export function login(username, password, code, uuid) {
+export function login(firmName,username, password, code, uuid) {
   return request({
     url: '/auth/login',
     headers: {
@@ -10,7 +10,7 @@ export function login(username, password, code, uuid) {
       repeatSubmit: false
     },
     method: 'post',
-    data: {username, password, code, uuid}
+    data: {firmName,username, password, code, uuid}
   })
 }
 

src/store/modules/user.js

@@ -38,12 +38,13 @@ const user = {
   actions: {
     // 登录
     Login({commit}, userInfo) {
+      const firName = userInfo.firmName
       const username = userInfo.username.trim()
       const password = userInfo.password
       const code = userInfo.code
       const uuid = userInfo.uuid
       return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
+        login(firName , username, password, code, uuid).then(res => {
           let data = res.data
           setToken(data.access_token)
           commit('SET_TOKEN', data.access_token)

src/views/breakdown/breakdown/index.vue

@@ -37,9 +37,10 @@
       </el-form-item>
     </el-form>
 
-    <el-radio-group v-model="direction">
+    <!-- 抽屉 --->
+    <el-radio-group v-model="direction" />
+
 
-    </el-radio-group>
 
 
     <el-drawer title="通知" :visible.sync="drawer" :direction="direction" :before-close="handleClose">
@@ -219,14 +220,14 @@
           <el-input v-model="form.faultValue" placeholder="请输入故障值" />
         </el-form-item>
         <el-form-item label="故障级别" prop="faultRank">
-          <el-radio-group v-model="form.faultRank">
+          <el-select v-model="form.faultRank" placeholder="请选择故障级别">
-            <el-radio
+            <el-option
-              v-for="dict in dict.type.sys_fault_rank"
+              v-for="dict in  dict.type.sys_fault_rank"
               :key="dict.value"
-              :label="dict.value"
+              :label="dict.label"
-            >{{ dict.label }}
+              :value="Number(dict.value)"
-            </el-radio>
+              />
-          </el-radio-group>
+          </el-select>
         </el-form-item>
         <el-form-item label="故障描述信息" prop="faultDesc">
           <el-input v-model="form.faultDesc" placeholder="请输入故障描述信息" />
@@ -261,6 +262,7 @@ export default {
     return {
       activeName: 'first',
       drawer: false,
+      //向右打开
       direction: 'rtl',
       // 遮罩层
       loading: true,

src/views/breakdown/log/index.vue

@@ -12,6 +12,14 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
+            <el-form-item label="故障码" prop="faultCode">
+              <el-input
+                v-model="queryParams.faultCode"
+                placeholder="请输入故障码"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
             <el-form-item label="状态" prop="status">
               <el-select v-model="queryParams.status" clearable placeholder="状态">
                 <el-option
@@ -28,12 +36,21 @@
             </el-form-item>
           </el-form>
 
-          <rl-row>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="warning"
+                plain
+                icon="el-icon-download"
+                size="mini"
+                @click="handelExport">导出</el-button>
+            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-          </rl-row>
+          </el-row>
 
-          <el-table v-loading="loading" :data="messageList" stripe>
+          <el-table v-loading="loading" :data="messageList" stripe @selection-chang="handleSelectionChange">
-            <el-table-column label="故障编号" align="center" prop="sysCarFaultId" />
+            <el-table-column type="selection" width="55" align="center"/>
+            <el-table-column label="故障码" align="center" prop="faultCode" />
             <el-table-column label="VIN码" align="center" prop="vin" />
             <el-table-column label="开始时间" align="center" prop="createTime" />
             <el-table-column label="结束时间" align="center" prop="updateTime" />
@@ -53,6 +70,7 @@
 
         </el-tab-pane>
         <el-tab-pane label="解决" name="resolve">
+
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
             <el-form-item label="VIN码" prop="vin">
               <el-input
@@ -62,6 +80,14 @@
                 @ceyup.enter.native="handleQuery"
             />
             </el-form-item>
+            <el-form-item label="故障码" prop="faultCode">
+              <el-input
+                v-model="queryParams.faultCode"
+                placeholder="请输入故障码"
+                clearable
+                @ceyup.enter.native="handleQuery"
+            />
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -71,10 +97,11 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getListSolve"></right-toolbar>
           </rl-row>
           <el-table v-loading="loading" :data="StatusSolveList" stripe>
-            <el-table-column label="故障编号" align="center" prop="sysCarFaultId" />
+            <el-table-column label="故障码" align="center" prop="faultCode" />
             <el-table-column label="VIN码" align="center" prop="vin" />
             <el-table-column label="开始时间" align="center" prop="createTime" />
             <el-table-column label="结束时间" align="center" prop="updateTime" />
+
           </el-table>
           <pagination
             v-show="totalSolve > 0"
@@ -94,20 +121,47 @@
                 @ceyup.enter.native="handleQuery"
               />
             </el-form-item>
+            <el-form-item label="故障码" prop="faultCode">
+              <el-input
+                v-model="queryParams.faultCode"
+                placeholder="请输入故障码"
+                clearable
+                @ceyup.enter.native="handleQuery"
+              />
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
-          <rl-row>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="warning"
+                plain
+                icon="el-icon-edit"
+                size="mini"
+                @click="handleUpdateStatusIgnore">忽略</el-button>
+            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-          </rl-row>
+          </el-row>
-          <el-table v-loading="loading" :data="StatusProcessList" stripe>
+          <el-table v-loading="loading" :data="StatusProcessList" stripe @selection-chang="handleSelectionChange">
-            <el-table-column label="故障编号" align="center" prop="sysCarFaultId" />
+            <el-table-column type="selection" width="55" align="center"/>
+            <el-table-column label="故障码" align="center" prop="faultCode" />
             <el-table-column label="VIN码" align="center" prop="vin" />
             <el-table-column label="开始时间" align="center" prop="createTime" />
             <el-table-column label="结束时间" align="center" prop="updateTime" />
-
+            <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="handleUpdateStatusIgnore(scope.row)">
+                  忽略
+                </el-button>
+              </template>
+            </el-table-column>
 
           </el-table>
           <pagination
@@ -128,6 +182,14 @@
                 @ceyup.enter.native="handleQuery"
               />
             </el-form-item>
+            <el-form-item label="故障码" prop="faultCode">
+              <el-input
+                v-model="queryParams.faultCode"
+                placeholder="请输入故障码"
+                clearable
+                @ceyup.enter.native="handleQuery"
+              />
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -137,7 +199,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </rl-row>
           <el-table v-loading="loading" :data="StatusIgnoreList" stripe>
-            <el-table-column label="故障编号" align="center" prop="sysCarFaultId" />
+            <el-table-column label="故障码" align="center" prop="faultCode" />
             <el-table-column label="VIN码" align="center" prop="vin" />
             <el-table-column label="开始时间" align="center" prop="createTime" />
             <el-table-column label="结束时间" align="center" prop="updateTime" />
@@ -158,7 +220,13 @@
 </template>
 
 <script>
-import { listLog ,listStatusIgnore,listStatusProcess,listStatusSolve} from '/src/api/breakdown/Log';
+import {
+  listLog,
+  listStatusIgnore,
+  listStatusProcess,
+  listStatusSolve,
+  updateStatusById
+} from '/src/api/breakdown/Log'
 
 export default {
   dicts:['sys_car_fault_log_status'],
@@ -167,6 +235,12 @@ export default {
   props:{},
   data() {
     return {
+      //选中数组
+      ids:[],
+      //非单个禁用
+      single:true,
+      //非多个禁用
+      multiple:true,
       activeName:'all',
       loading:true,
       messageList:[],
@@ -184,7 +258,8 @@ export default {
         pageNum:1,
         pageSize:10,
         vin:null,
-        status:null
+        status:null,
+        faultCode:null
       }
     };
   },
@@ -243,6 +318,27 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    /** 导出按钮操作 */
+    handelExport(){
+      this.download('breakdown/log/export',{
+        ...this.queryParams
+      },`log_${new Date().getTime()}.xlsx`)
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    handleUpdateStatusIgnore(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认忽略编号为"' + ids + '"的数据项？').then(function() {
+        return updateStatusById(ids);
+      }).then(() => {
+        this.getListIgnore();
+        this.$modal.msgSuccess("忽略成功");
+      }).catch(() => {});
+    },
   },
   created() {
     this.getList();
@@ -250,14 +346,7 @@ export default {
     this.getListProcess()
     this.getListSolve()
   },
-  mounted() {},
+
-  beforeCreate() {},
-  beforeMount() {},
-  beforeUpdate() {},
-  updated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  activated() {}
 };
 </script>
 

src/views/login.vue

@@ -1,7 +1,16 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">车联网运营管理系统</h3>
+      <el-form-item>
+        <el-input
+          v-model="loginForm.firmName"
+          auto-complete="off"
+          placeholder="公司"
+          type="text">
+          <svg-icon slot="prefix" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -72,6 +81,7 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
+        firmName: "若依科技",
         username: "admin",
         password: "admin123",
         rememberMe: false,
@@ -79,6 +89,9 @@ export default {
         uuid: ""
       },
       loginRules: {
+        firmName: [
+          {required: true, trigger: "blur", message: "请输入您的公司"}
+        ],
         username: [
           {required: true, trigger: "blur", message: "请输入您的账号"}
         ],
@@ -91,7 +104,7 @@ export default {
       // 验证码开关
       captchaEnabled: false,
       // 注册开关
-      register: false,
+      register: true,
       redirect: undefined
     };
   },

src/views/system/user/authRole.vue

@@ -103,7 +103,8 @@ export default {
     submitForm() {
       const userId = this.form.userId;
       const roleIds = this.roleIds.join(",");
-      updateAuthRole({userId: userId, roleIds: roleIds}).then((response) => {
+      const user={userId: userId, roleIds: roleIds}
+      updateAuthRole(user).then((response) => {
         this.$modal.msgSuccess("授权成功");
         this.close();
       });