设备地区修改

src/assets/styles/element-ui.scss

@@ -14,7 +14,18 @@
 .el-upload__input {
   display: none;
 }
+.el-input-number__increase{
+  top:0.125rem!important;
+  right: 0.125rem!important;
 
+}
+.el-input-number__decrease{
+  right: 0.125rem!important;
+  .el-icon-arrow-down {
+    position: relative;
+    top: 0.186rem;
+  }
+}
 /** 下拉框选中样式*/
 .el-select .el-input.is-focus .el-input__inner {
   border: 1px solid #5FB54B;

src/views/equipment-management/equipment-management/equipment-add.vue

@@ -134,6 +134,7 @@
                   <el-time-select
                     v-model="form.useTime.ams"
                     class="inputWidth"
+                    popper-class="equipment-use-time"
                     is-range
                     placeholder="请选择上午开始时间"
                     format="HH:mm"
@@ -152,6 +153,7 @@
                   <el-time-select
                     v-model="form.useTime.ame"
                     class="inputWidth"
+                    popper-class="equipment-use-time"
                     is-range
                     placeholder="请选择上午结束时间"
                     format="HH:mm"
@@ -174,6 +176,7 @@
                   <el-time-select
                     v-model="form.useTime.pms"
                     class="inputWidth"
+                    popper-class="equipment-use-time"
                     is-range
                     placeholder="请选择下午开始时间"
                     format="HH:mm"
@@ -192,6 +195,7 @@
                   <el-time-select
                     v-model="form.useTime.pme"
                     class="inputWidth"
+                    popper-class="equipment-use-time"
                     is-range
                     placeholder="请选择下午结束时间"
                     format="HH:mm"
@@ -296,9 +300,9 @@
           </el-form>
           <el-row>
             <el-col style="display: flex;justify-content: left; margin-left: 20px; margin-top: 20px">
-                <el-button :loading="submitShow" class="queryBtn" size="mini" icon="el-icon-check" @click="submitForm">
-                  提交
-                </el-button>
+              <el-button :loading="submitShow" class="queryBtn" size="mini" icon="el-icon-check" @click="submitForm">
+                提交
+              </el-button>
               <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
             </el-col>
           </el-row>
@@ -882,4 +886,17 @@ export default {
 //  cursor: pointer
 //}
 </style>
-
+<style lang="scss">
+.equipment-use-time {
+  .time-select-item:hover {
+      background: #F6fcf5;
+      color: #5FB54B;
+      font-weight: bold;
+      cursor: pointer
+  }
+  .time-select-item.selected:not(.disabled) {
+    color: #5FB54B;
+    font-weight: bold;
+  }
+}
+</style>

src/views/equipment-management/equipment-management/equipment-detail.vue

@@ -88,10 +88,11 @@
                     class="overflow-hidden"
                     @change="handleChangeCascader"
                     @mouseover.native="showTooltip = true"
-                    @mouseout.native="showTooltip = false">
+                    @mouseout.native="showTooltip = false"
+                  >
                     <template #suffix>
                       <el-tooltip placement="top" content="这是提示内容" :disabled="!showTooltip" :offset="[0, 8]">
-                        <i class="el-icon-question"></i>
+                        <i class="el-icon-question" />
                       </el-tooltip>
                     </template>
                   </el-cascader>
@@ -453,6 +454,7 @@
                   <el-time-select
                     v-model="form.useTime.ams"
                     class="inputWidth"
+                    popper-class="equipment-use-time"
                     is-range
                     placeholder="请选择上午开始时间"
                     format="HH:mm"
@@ -471,6 +473,7 @@
                   <el-time-select
                     v-model="form.useTime.ame"
                     class="inputWidth"
+                    popper-class="equipment-use-time"
                     is-range
                     placeholder="请选择上午结束时间"
                     format="HH:mm"
@@ -492,6 +495,7 @@
                   <el-time-select
                     v-model="form.useTime.pms"
                     class="inputWidth"
+                    popper-class="equipment-use-time"
                     is-range
                     placeholder="请选择下午开始时间"
                     format="HH:mm"
@@ -510,6 +514,7 @@
                   <el-time-select
                     v-model="form.useTime.pme"
                     class="inputWidth"
+                    popper-class="equipment-use-time"
                     is-range
                     placeholder="请选择下午结束时间"
                     format="HH:mm"
@@ -1272,3 +1277,17 @@ export default {
   background-color: #F6FCF5 !important;
 }
 </style>
+<style lang="scss">
+.equipment-use-time {
+  .time-select-item:hover {
+    background: #F6fcf5;
+    color: #5FB54B;
+    font-weight: bold;
+    cursor: pointer
+  }
+  .time-select-item.selected:not(.disabled) {
+    color: #5FB54B;
+    font-weight: bold;
+  }
+}
+</style>

src/views/equipment-management/use-management/use-details.vue

@@ -365,7 +365,20 @@ export default {
         pme: ''
       },
       // 详情表单
-      form: {}
+      form: {
+        selectedOptions: [],
+        deviceName: '',
+        // appointmentMethod: '',
+        serviceArea: [],
+        serviceAreaText: [],
+        checkTypeText: [],
+        head: '',
+        phone: '',
+        deviceType: '',
+        reservationMethod: '',
+        status: '',
+        remark: ''
+      }
     }
   },
   created() {
@@ -441,8 +454,8 @@ export default {
           this.form.serviceAreaText = labelList
 
           console.log(labelList)
-          console.log('----------------------------------------111111111111', labelList)
-          console.log(' this.areaOptions', this.areaOptions)
+          console.log('111111111111', labelList)
+          console.log(' ----------------引人注目----------------------------his.form.serviceAreaText', this.form.serviceAreaText)
         }
       })
     },

src/views/equipment-management/use-management/use-management.vue

@@ -136,11 +136,11 @@
           <span>{{ parseTime(scope.row.reportTime, '{h}:{m}') || '-' }}</span>
         </template>
       </el-table-column>
-            <el-table-column label="支付金额" align="left" prop="payAmount">
-              <template slot-scope="scope">
-                <span>{{ formatPrice(scope.row.payAmount) || '-' }}</span>
-              </template>
-            </el-table-column>
+      <el-table-column label="支付金额" align="left" prop="payAmount">
+        <template slot-scope="scope">
+          <span>{{ formatPrice(scope.row.payAmount) || '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="设备当前状态" align="left" prop="status">
         <template slot-scope="scope">
           <span

vue.config.js

@@ -69,7 +69,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8091`,
+        // target: `http://localhost:8090`,
         target: `http://114.67.241.140:8091`,
         changeOrigin: true,
         pathRewrite: {