Merge branch 'project1' of http://gitlab.91isoft.com:90/yangshuo/template_vue into project1

src/api/equipment/application.js

+import request from '@/utils/request'
+// 根据key值查询数据字典数据
+export function getDictData(params) {
+  return request({
+    url: '/wbapply/queryDict',
+    method: 'get',
+    params
+  })
+}
+// 新增设备新增
+export function addApplication(data) {
+  return request({
+    url: '/wbapply/add',
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}

src/views/equipment/check.vue

@@ -349,7 +349,10 @@ export default {
         roleName: undefined,
         roleKey: undefined,
         flag: undefined,
-        ptype: 1
+        ptype: 1,
+        pstatus:0,
+        delFlag:0
+        
       },
       // 表单参数
       form: {

src/views/equipment/checkProcess.vue

@@ -346,8 +346,9 @@ export default {
       queryParams: {
         page: 1,
         rows: 10,
-        
-        ptype: 2
+        ptype: 2,
+        pstatus:0,
+        delFlag:0
       },
       // 表单参数
       form: {

src/views/equipment/equipmentAbandonment.vue

@@ -346,7 +346,9 @@ export default {
         roleName: undefined,
         roleKey: undefined,
         flag: undefined,
-        ptype:2
+        ptype:2,
+        pstatus:0,
+        delFlag:0
       },
       // 表单参数
       form: {

src/views/login/login.vue

@@ -20,20 +20,20 @@
             <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
           </el-input>
         </el-form-item>
-        <el-form-item prop="code">
-          <el-input
-            v-model="loginForm.code"
-            auto-complete="off"
-            placeholder="验证码"
-            style="width: 63%"
-            @keyup.enter.native="handleLogin"
-          >
-            <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-          </el-input>
-          <!--<div class="login-code">
-            <img :src="codeUrl" @click="getCode">
-          </div>-->
-        </el-form-item>
+<!--        <el-form-item prop="code">-->
+<!--          <el-input-->
+<!--            v-model="loginForm.code"-->
+<!--            auto-complete="off"-->
+<!--            placeholder="验证码"-->
+<!--            style="width: 63%"-->
+<!--            @keyup.enter.native="handleLogin"-->
+<!--          >-->
+<!--            <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
+<!--          </el-input>-->
+<!--          &lt;!&ndash;<div class="login-code">-->
+<!--            <img :src="codeUrl" @click="getCode">-->
+<!--          </div>&ndash;&gt;-->
+<!--        </el-form-item>-->
         <el-form-item style="width:80%;margin-bottom: 20px">
           <el-button
             class="blue-btn"