修改冲突

src/styles/index.scss

@@ -586,3 +586,7 @@ li {
 .el-table .el-table__body-wrapper::-webkit-scrollbar {
   height: 8px;
 }
+
+input[type='number'] {
+  line-height: 1 !important;
+}

src/views/systemSettings/views/queryTemplate/queryTemplateadd.vue

@@ -247,7 +247,7 @@ export default {
           &::-webkit-inner-spin-button {
             -webkit-appearance: none !important;
           }
-          &[type='‘number’'] {
+          &[type='number'] {
             -moz-appearance: textfield !important;
           }
         }

src/views/systemSettings/views/queryTemplate/queryTemplateedit.vue

@@ -266,7 +266,7 @@ export default {
           &::-webkit-inner-spin-button {
             -webkit-appearance: none !important;
           }
-          &[type='‘number’'] {
+          &[type='number'] {
             -moz-appearance: textfield !important;
           }
         }

src/views/systemSettings/views/serviceManagement/serviceEdit.vue

@@ -1,6 +1,6 @@
 <!--
  * @Date: 2022-03-24 09:55:13
- * @LastEditTime: 2022-06-13 15:22:49
+ * @LastEditTime: 2022-06-30 16:35:44
  * @LastEditors: your name
  * @Description: 服务管理-编辑服务
  * have a nice day!
@@ -567,7 +567,7 @@ export default {
           &::-webkit-inner-spin-button {
             -webkit-appearance: none !important;
           }
-          &[type='‘number’'] {
+          &[type='number'] {
             -moz-appearance: textfield !important;
           }
         }

src/views/systemSettings/views/serviceManagement/serviceHome.vue

@@ -1,6 +1,6 @@
 <!--
  * @Date: 2022-04-12 17:49:47
- * @LastEditTime: 2022-06-13 15:22:45
+ * @LastEditTime: 2022-06-30 16:36:09
  * @LastEditors: your name
  * @Description: 服务管理-首页
  * have a nice day!
@@ -64,7 +64,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="数据类型" prop="datatype">
+                  <el-form-item label="数据类型" prop="datatype" label-width="114px">
                     <el-select v-model="serviceForm.datatype" clearable>
                       <el-option label="JSON" :value="1" />
                       <el-option label="XML" :value="2" />
@@ -333,6 +333,25 @@ export default {
             .el-select {
               width: 100%;
             }
+            .el-input__inner,
+            .el-textarea__inner {
+              padding-left: 8px;
+            }
+            .el-date-editor {
+              .el-input__prefix,
+              .el-input__suffix {
+                right: 5px;
+                left: unset;
+                font-size: 16px;
+                color: #101116;
+                .el-input__suffix-inner {
+                  font-size: 16px;
+                }
+              }
+              &.value-not-null:hover .el-input__prefix {
+                display: none;
+              }
+            }
           }
         }
         label,
@@ -354,14 +373,15 @@ export default {
           &::-webkit-outer-spin-button,
           &::-webkit-inner-spin-button {
             -webkit-appearance: none !important;
+
+            &[type="number"] {
+              -moz-appearance: textfield !important;
+            }
           }
-          &[type="‘number’"] {
-            -moz-appearance: textfield !important;
+          .el-radio {
+            font-weight: 400;
           }
         }
-        .el-radio {
-          font-weight: 400;
-        }
       }
     }
     .status {