22

commontable/options.vue

@@ -10,22 +10,6 @@
         <div class="myinput">
           <div class="flex">
             <div class="flex-left"> 
-              <!-- 分类，需要合并的 -->
-              <!-- <div class="hbbox" v-show="packupFlag">
-                            <div v-for="(item, index) in hboptions" :key="index" class="box">
-                                <el-select v-model="model[item.enName]" :placeholder="item.placeholder" class="option"
-                                    :style="hboptionWidth" @change="change(item.lable)" :clearable="item.clearable"
-                                    :filterable="item.filterable" :size="item.size">
-                                    <el-option v-for="item in item.options" :key="item.value" :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                                <div class="center" v-show="index != hboptions.length - 1">
-                                    <el-divider direction="vertical"></el-divider>
-                                </div>
-                            </div>
-                        </div> -->
-              <!-- 机器分类更多弹出框 -->
               <div class="machinemore" v-if="hboptions.length">
                 <el-popover
                   placement="bottom"
@@ -455,9 +439,11 @@ export default {
       arr = this.data.filter((item) => {
         return item.format == "timestamp" && item.show == true;
       });
+      if(arr.length>0){
         arr.findIndex((item) => item.enName == this.dateval) == -1
           ? this.$set(this, "dateval", arr[0].enName)
           : "";
+      }
       console.log(arr, "arr-----------日期");
       return arr;
     },