浏览代码

2022-01-06

East 3 年之前
父节点
当前提交
30907b688e

+ 7 - 4
src/components/search-cpn/SearchCpn.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-06 13:53:10
- * @LastEditTime: 2022-01-06 16:40:49
+ * @LastEditTime: 2022-01-06 18:29:09
  * @LastEditors: Please set LastEditors
  * @Description: 搜索组件
  * @FilePath: \goldenPig\src\components\search-cpn\SearchCpn.vue
@@ -13,12 +13,17 @@
         <template v-for="item in formItemProp">
           <el-col v-bind="formStyle.colLayout" :key="item.label">
             <el-form-item :label="item.label">
-              <el-input v-if="item.type === 'input'" v-model="form[item.field]">
+              <el-input
+                v-if="item.type === 'input'"
+                v-model="form[item.field]"
+                :placeholder="item.placeholder"
+              >
               </el-input>
 
               <el-select
                 v-else-if="item.type === 'select'"
                 v-model="form[item.field]"
+                :placeholder="item.placeholder"
                 style="width: 100%"
               >
                 <el-option v-for="option in item.options" :key="option.value">
@@ -41,7 +46,6 @@
               <slot
                 v-else-if="item.type === 'custom'"
                 :name="item.slotName"
-                :form="form"
                 :item="item"
               >
               </slot>
@@ -110,7 +114,6 @@ export default {
           this.btnsBottom = true;
         }
         this.form = { ...this.searchForm };
-        console.log("123");
       },
       deep: true,
       immediate: true,

+ 16 - 13
src/views/summary-data/individual-data/IndividualData.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-06 13:37:14
- * @LastEditTime: 2022-01-06 16:37:43
+ * @LastEditTime: 2022-01-06 19:38:06
  * @LastEditors: Please set LastEditors
  * @Description: 汇总数据 - 个体数据页面
  * @FilePath: \goldenPig\src\views\SummaryData\IndividualData.vue
@@ -12,12 +12,14 @@
       <!-- 耳根温度 -->
       <template #earTemp="scope">
         <el-input
-          v-model="searchForm2[scope.item.field1]"
+          v-model="searchForm2[scope.item.field][0]"
+          :placeholder="scope.item.placeholder[0]"
           style="width: calc(50% - 16px)"
         ></el-input>
         &nbsp;—&nbsp;
         <el-input
-          v-model="searchForm2[scope.item.field2]"
+          v-model="searchForm2[scope.item.field][1]"
+          :placeholder="scope.item.placeholder[1]"
           style="width: calc(50% - 16px)"
         ></el-input>
       </template>
@@ -25,12 +27,14 @@
       <!-- 环境温度 -->
       <template #envTemp="scope">
         <el-input
-          v-model="searchForm2[scope.item.field1]"
+          v-model="searchForm2[scope.item.field][0]"
+          :placeholder="scope.item.placeholder[0]"
           style="width: calc(50% - 16px)"
         ></el-input>
         &nbsp;—&nbsp;
         <el-input
-          v-model="searchForm2[scope.item.field2]"
+          v-model="searchForm2[scope.item.field][1]"
+          :placeholder="scope.item.placeholder[1]"
           style="width: calc(50% - 16px)"
         ></el-input>
       </template>
@@ -38,12 +42,14 @@
       <!-- 信号强度 -->
       <template #signal="scope">
         <el-input
-          v-model="searchForm2[scope.item.field1]"
+          v-model="searchForm2[scope.item.field][0]"
+          :placeholder="scope.item.placeholder[0]"
           style="width: calc(50% - 16px)"
         ></el-input>
         &nbsp;—&nbsp;
         <el-input
-          v-model="searchForm2[scope.item.field2]"
+          v-model="searchForm2[scope.item.field][1]"
+          :placeholder="scope.item.placeholder[1]"
           style="width: calc(50% - 16px)"
         ></el-input>
       </template>
@@ -68,12 +74,9 @@ export default {
         deviceCode: "",
       },
       searchForm2: {
-        earTemp1: "",
-        earTemp2: "",
-        envTemp1: "",
-        envTemp2: "",
-        signal1: "",
-        signal2: "",
+        earTemp: ["", ""],
+        envTemp: ["", ""],
+        signal: ["", ""],
       },
     };
   },

+ 4 - 7
src/views/summary-data/individual-data/config/search.config.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-06 14:44:20
- * @LastEditTime: 2022-01-06 16:11:52
+ * @LastEditTime: 2022-01-06 19:41:06
  * @LastEditors: Please set LastEditors
  * @Description: 搜索组件的配置
  * @FilePath: \goldenPig\src\views\summary-data\individual-data\search.config.js
@@ -29,24 +29,21 @@ export const formItemProp = [
   {
     label: '耳根温度(℃):',
     type: 'custom',
-    field1: 'earTemp1',
-    field2: 'earTemp2',
+    field: 'earTemp',
     placeholder: ['请输入数字', '请输入数字'],
     slotName: 'earTemp'
   },
   {
     label: '环境温度(℃):',
     type: 'custom',
-    field1: 'envTemp1',
-    field2: 'envTemp2',
+    field: 'envTemp',
     placeholder: ['请输入数字', '请输入数字'],
     slotName: 'envTemp'
   },
   {
     label: '信号强度(-db):',
     type: 'custom',
-    field1: 'signal1',
-    field2: 'signal2',
+    field: 'signal',
     placeholder: ['请输入数字', '请输入数字'],
     slotName: 'signal'
   },