update

src/main.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: your name
+ * @Date: 2021-06-16 10:43:18
+ * @LastEditTime: 2021-06-17 10:22:17
+ * @LastEditors: your name
+ * @Description: In User Settings Edit
+ * @FilePath: \ld-pc\src\main.js
+ */
 // The Vue build version to load with the `import` command
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 import Vue from 'vue';
@@ -31,7 +39,7 @@ Object.keys(custom).forEach(key => {
     Vue.filter(key, custom[key])
 })
 
-document.title = '智云本特勒'
+document.title = '隆迪'
 
 let host = window.location.host
 // let host = 's2t.jihengcc.cn'

src/utils/request.js

@@ -13,9 +13,9 @@ import { clearStore } from '@/utils/store'
 const request = axios.create({
   // baseURL: process.env.BASE_API,
   // baseURL: 'http://172.18.1.227:40048',
-  // baseURL: 'http://172.18.0.24:40048/',
+  baseURL: 'http://172.18.0.24:40048/',
   // baseURL: 'http://39.100.230.190/',
-  baseURL: 'https://s2t.jihengcc.cn',
+  // baseURL: 'https://s2t.jihengcc.cn',
   // baseURL: '',
   timeout: process.env.TIME_OUT,
   method: "post",

src/views/goods/addFailSafePlan.vue

@@ -3,7 +3,7 @@
  */
  <template>
   <div style="height: 100%">
-    <el-row class="top-main" style="height: 10%;">
+    <el-row class="top-main" style="height: 15%;">
       <!-- 面包屑导航 -->
       <el-breadcrumb separator-class="el-icon-arrow-right">
         <el-breadcrumb-item>点检管理</el-breadcrumb-item>
@@ -14,7 +14,7 @@
       </el-breadcrumb>
       <h3>{{ buttonStatus === 1 ? "新建" : "编辑" }}保养表</h3>
     </el-row>
-    <el-row class="body-main" style="min-height: 90%">
+    <el-row class="body-main" style="min-height: 85%">
       <el-card>
         <div slot="header" style="font-size: 20px">
           <span>基础信息</span>
@@ -202,7 +202,6 @@
         </div>
         <div
           class="xx-line"
-          v-if="index !== procedures.length - 1"
           @click="delFlow(index)"
         >
           删除流程

src/views/goods/failSafeHistoryVersion.vue

@@ -3,7 +3,7 @@
  */
 <template>
   <div style="height: 100%">
-    <el-row class="top-main" style="height: 10%">
+    <el-row class="top-main" style="height: 15%">
       <!-- 面包屑导航 -->
       <el-breadcrumb separator-class="el-icon-arrow-right">
         <el-breadcrumb-item>点检管理</el-breadcrumb-item>
@@ -13,7 +13,7 @@
       </el-breadcrumb>
       <h3>历史版本</h3>
     </el-row>
-    <el-row class="body-main" style="min-height: 90%">
+    <el-row class="body-main" style="min-height: 85%">
       <!--列表-->
       <el-table
         size="mini"

src/views/goods/failSafePlan.vue

@@ -3,7 +3,7 @@
  */
 <template>
   <div style="height: 100%">
-    <el-row class="top-main" style="height: 10%">
+    <el-row class="top-main" style="height: 15%">
       <!-- 面包屑导航 -->
       <el-breadcrumb separator-class="el-icon-arrow-right">
         <el-breadcrumb-item>点检管理</el-breadcrumb-item>
@@ -30,7 +30,7 @@
         </div>
       </div>
     </el-row>
-    <el-row class="body-main" style="min-height: 90%">
+    <el-row class="body-main" style="min-height: 85%">
       <el-form inline ref="searchReset" :model="searchData">
         <el-form-item label="年月查询:" prop="year">
           <el-date-picker
@@ -77,7 +77,7 @@
         </el-table-column>
         <el-table-column align="center" prop="standard" label="标准">
         </el-table-column>
-        <el-table-column align="center" min-width="40px" prop="checkContent" label="检查频次">
+        <el-table-column align="center" min-width="50px" prop="checkContent" label="检查频次">
           <template slot-scope="scope">
             <span v-if="scope.row.frequency === 1">天</span>
             <span v-else-if="scope.row.frequency === 2">周</span>

src/views/goods/planList.vue

@@ -3,7 +3,7 @@
  */
 <template>
   <div style="height: 100%">
-    <el-row class="top-main" style="height: 10%">
+    <el-row class="top-main" style="height: 15%">
       <!-- 面包屑导航 -->
       <el-breadcrumb separator-class="el-icon-arrow-right">
         <el-breadcrumb-item>点检管理</el-breadcrumb-item>
@@ -11,17 +11,18 @@
       </el-breadcrumb>
       <h3>点检保养列表</h3>
     </el-row>
-    <el-row class="body-main" style="min-height: 90%">
+    <el-row class="body-main" style="min-height: 85%">
       <!-- 搜索筛选 -->
       <el-form inline ref="searchReset" :model="searchData">
-        <el-form-item label="点检保养名称:" prop="name">
+        <el-form-item label="点检名称:" prop="name">
           <el-input
             size="small"
             v-model="searchData.name"
-            placeholder="计划名称"
+            placeholder="请输入"
+            style="width: 150px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="点检保养状态:" prop="checkStatus">
+        <el-form-item label="点检状态:" prop="checkStatus">
           <el-select
             size="small"
             v-model="searchData.checkStatus"
@@ -72,7 +73,8 @@
           <el-input
             size="small"
             v-model="searchData.deviceName"
-            placeholder="计划名称"
+            placeholder="请输入"
+            style="width: 150px"
           ></el-input>
         </el-form-item>
         <el-form-item style="float: right">
@@ -151,21 +153,21 @@
           align="center"
           prop="tourName"
           label="巡检人"
-          min-width="50px"
+          min-width="30px"
         >
         </el-table-column>
         <el-table-column
           align="center"
           prop="nos"
           label="编号"
-          min-width="60px"
+          min-width="20px"
         >
         </el-table-column>
         <el-table-column
           align="center"
           prop="checkStatus"
           label="计划状态"
-          min-width="60px"
+          min-width="30px"
         >
           <template slot-scope="scope">
             <span v-if="scope.row.checkStatus === 1">待响应</span>
@@ -178,10 +180,10 @@
           align="center"
           prop="createdTime"
           label="点检保养表创建日期"
-          min-width="60px"
+          min-width="50px"
         >
         </el-table-column>
-        <el-table-column align="center" label="操作" min-width="90px">
+        <el-table-column align="center" label="操作" min-width="45px">
           <template slot-scope="scope">
             <el-button size="mini" type="text" @click="jumpListinfo(scope.row)"
               >查看</el-button
@@ -396,4 +398,7 @@ export default {
   text-align: center;
   margin-bottom: 20px;
 }
+.el-alert{
+  padding:6px 10px;
+}
 </style>

src/views/pay/Order.vue

@@ -3,7 +3,7 @@
  */
 <template>
   <div style="height: 100%">
-    <el-row class="top-main" style="height: 10%">
+    <el-row class="top-main" style="height: 15%">
       <!-- 面包屑导航 -->
       <el-breadcrumb separator-class="el-icon-arrow-right">
         <el-breadcrumb-item>账号管理</el-breadcrumb-item>
@@ -11,7 +11,7 @@
       </el-breadcrumb>
       <h3>账号列表</h3>
     </el-row>
-    <el-row class="body-main" style="min-height: 90%">
+    <el-row class="body-main" style="min-height: 85%">
       <!-- 搜索筛选 -->
       <el-form inline ref="searchReset" :model="searchData" class="user-search">
         <el-form-item label="账号名称:" prop="name">