diff --git a/src/Layouts/BaseLayout.vue b/src/Layouts/BaseLayout.vue
index 809ad351..b7bd2196 100644
--- a/src/Layouts/BaseLayout.vue
+++ b/src/Layouts/BaseLayout.vue
@@ -14,7 +14,7 @@
         <span :class="tab.link === currentPath ? 'click' : 'click2'">{{ index+1 }}</span>
         <span>{{ tab.title }}</span>
         <span v-if="index!=3"
-              style="width:54px;margin:0 10px;border: 1px dashed #C4C0C0;"></span>
+              style="width:54px;margin:0 10px;border-top: 1px dashed #C4C0C0;"></span>
       </div>
     </div>
     <div class="right"
@@ -569,12 +569,13 @@ onMounted(() => {
   margin-right: 8px;
 }
 .click2 {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 18px;
   font-size: 12px;
-  line-height: 18px;
   border-radius: 9px;
   background-color: #f5f5f5;
-  text-align: center;
   margin-right: 8px;
 }
 </style>
diff --git a/src/components/LeftMenuBar.vue b/src/components/LeftMenuBar.vue
index 3d9e13b8..33ac8cc8 100644
--- a/src/components/LeftMenuBar.vue
+++ b/src/components/LeftMenuBar.vue
@@ -202,7 +202,7 @@ function menusStatusToFalsefather(menus) {
 .menu-bar {
   display: flex;
   width: 100%;
-  height: 50px;
+  height: 48px;
   font-size: 13px;
   z-index: 99999;
   &-item {
@@ -226,7 +226,7 @@ function menusStatusToFalsefather(menus) {
     }
     &-main {
       width: 220px;
-      height: 50px;
+      height: 48px;
       cursor: pointer;
       display: flex;
       align-items: center;
@@ -237,7 +237,7 @@ function menusStatusToFalsefather(menus) {
       &-active {
         color: $yili-default-color;
         background: #ffffff;
-        box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.1);
+        box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
       }
       &-icon {
         opacity: 0.9;
diff --git a/src/views/DataAnalyse/components/diagram/newSearch.vue b/src/views/DataAnalyse/components/diagram/newSearch.vue
index c1bdcdfb..56a87efa 100644
--- a/src/views/DataAnalyse/components/diagram/newSearch.vue
+++ b/src/views/DataAnalyse/components/diagram/newSearch.vue
@@ -1,890 +1,1022 @@
 <template>
-<div class='newSearchContent' :class="{isModal:isModal}">
-  <div class="title" v-if="!isModal">
-    <div class="titleL">筛选条件</div>
-    <div class="titleM" v-if="props.count&&!isOpen&&resShowFlag">已筛选<i>{{props.count}}</i>份问卷</div>
-    <div class="titleR" :class="{act:isOpen}">
-      <div class="titleRBox" @click="isOpenClick" >{{!isOpen?'展开':'收起'}}<CaretDownFilled class="openIcon"/></div>
+  <div class="newSearchContent" :class="{ isModal: isModal }">
+    <div class="title" v-if="!isModal">
+      <div class="titleL">筛选条件</div>
+      <div class="titleM" v-if="props.count && !isOpen && resShowFlag">
+        已筛选<i>{{ props.count }}</i
+        >份问卷
+      </div>
+      <div class="titleR" :class="{ act: isOpen }">
+        <div class="titleRBox" @click="isOpenClick">
+          {{ !isOpen ? "展开" : "收起" }}<CaretDownFilled class="openIcon" />
+        </div>
+      </div>
     </div>
-  </div>
-  <div class="searchBox" v-if="isOpen">
-    <div class="searchBoxL">
-      <div class="filterBox" v-if="!isModal">
-        <div class="filterBoxL noWidth">按筛选方案</div>
-        <div class="filterBoxR flexBox">
-          <a-select :getPopupContainer="triggerNode=>triggerNode.parentNode"
-            class="lineSelect maxSelect custom-select"
-            v-model:value="filterPlan.filterListVal"
-            :options="filterPlan.filterList"
-            @change="changePlan"
-          />
-        </div>
-        <div class="manage" @click="openModal" >
-          <i class="iconfont">&#xe73d;</i>
-          方案管理
-        </div>
-      </div>
-      <div class="filterBox">
-        <div class="filterBoxL noWidth">筛选符合以下</div>
-        <div class="filterBoxR flexBox">
-          <a-select :getPopupContainer="triggerNode=>triggerNode.parentNode"
-            class="lineSelect maxSelect custom-select"
-            v-model:value="searchData.filterType"
-            :options="searchData.filterTypeList"
-          />
-          <p>的数据</p>
-        </div>
-      </div>
-      <div class="filterBox highBox">
-        <div class="filterBoxL">题目答案</div>
-        <div class="filterBoxR">
-          <!-- 上面 -->
-          <div class="filterBoxRList">
-            <answerListBox
-              :listType="'list'"
-              v-bind="{...$attrs,...$props}"
-              :answerList="answerList"
-              :answerGroupList="answerGroupList"
+    <div class="searchBox" v-if="isOpen">
+      <div class="searchBoxL">
+        <div class="filterBox" v-if="!isModal">
+          <div class="filterBoxL noWidth">按筛选方案</div>
+          <div class="filterBoxR flexBox">
+            <a-select
+              :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+              class="lineSelect maxSelect custom-select"
+              v-model:value="filterPlan.filterListVal"
+              :options="filterPlan.filterList"
+              @change="changePlan"
             />
           </div>
-          <!-- 下面 -->
-          <div class="filterBoxRList">
-            <div class="filterGroupBox" v-for="(item,index) in answerGroupList" :key="index">
-              <div class="filterGroupTop">
-                <div class="filterGroupTopL">
-                  筛选符合以下
-                  <a-select
-                    :getPopupContainer="triggerNode=>triggerNode.parentNode"
-                    class="filterGroupSelect custom-select"
-                    v-model:value="item.val"
-                    :options="searchData.filterTypeList"
-                    placeholder="请选择条件"
-                  >
-                  </a-select>
-                  的数据
+          <div class="manage" @click="openModal">
+            <i class="iconfont">&#xe73d;</i>
+            方案管理
+          </div>
+        </div>
+        <div class="filterBox">
+          <div class="filterBoxL noWidth">筛选符合以下</div>
+          <div class="filterBoxR flexBox">
+            <a-select
+              :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+              class="lineSelect maxSelect custom-select"
+              v-model:value="searchData.filterType"
+              :options="searchData.filterTypeList"
+            />
+            <p>的数据</p>
+          </div>
+        </div>
+        <div class="filterBox highBox">
+          <div class="filterBoxL">题目答案</div>
+          <div class="filterBoxR">
+            <!-- 上面 -->
+            <div class="filterBoxRList">
+              <answerListBox
+                :listType="'list'"
+                v-bind="{ ...$attrs, ...$props }"
+                :answerList="answerList"
+                :answerGroupList="answerGroupList"
+              />
+            </div>
+            <!-- 下面 -->
+            <div class="filterBoxRList">
+              <div
+                class="filterGroupBox"
+                v-for="(item, index) in answerGroupList"
+                :key="index"
+              >
+                <div class="filterGroupTop">
+                  <div class="filterGroupTopL">
+                    筛选符合以下
+                    <a-select
+                      :getPopupContainer="
+                        (triggerNode) => triggerNode.parentNode
+                      "
+                      class="filterGroupSelect custom-select"
+                      v-model:value="item.val"
+                      :options="searchData.filterTypeList"
+                      placeholder="请选择条件"
+                    >
+                    </a-select>
+                    的数据
+                  </div>
+                  <div class="filterGroupTopR" @click="delGroup(index)">
+                    <!-- <DeleteFilled class="filterDelIcon" /> -->
+                    <i class="iconfont filterDelIcon">&#xe6c5;</i>
+                  </div>
                 </div>
-                <div class="filterGroupTopR" @click="delGroup(index)">
-                <!-- <DeleteFilled class="filterDelIcon" /> -->
-                <i class="iconfont filterDelIcon">&#xe6c5;</i>
+                <div class="filterGroupBtm">
+                  <answerListBox
+                    :listType="'group'"
+                    class="filterGroupBtmList"
+                    :questions="questions"
+                    :answerList="item.list"
+                    :answerGroupList="answerGroupList"
+                  />
                 </div>
               </div>
-              <div class="filterGroupBtm">
-                <answerListBox
-                  :listType="'group'"
-                  class="filterGroupBtmList"
-                  :questions="questions"
-                  :answerList="item.list"
-                  :answerGroupList="answerGroupList"
-                />
+            </div>
+            <div class="addBtn">
+              <div class="addBtnLi" @click="addList">
+                <PlusSquareOutlined class="addIcon" />添加筛选条件
+              </div>
+              <div class="addBtnLi" @click="addGroup">
+                <PlusSquareOutlined class="addIcon" />添加条件集合
               </div>
             </div>
           </div>
-          <div class="addBtn">
-            <div class="addBtnLi" @click="addList"><PlusSquareOutlined class="addIcon" />添加筛选条件</div>
-            <div class="addBtnLi" @click="addGroup"><PlusSquareOutlined class="addIcon" />添加条件集合</div>
+        </div>
+        <div class="filterBox">
+          <div class="filterBoxL">答题时长</div>
+          <div class="filterBoxR flexBox">
+            <a-input-group compact class="lineSelect maxSelect sepcialSelect">
+              <a-select
+                :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+                v-model:value="searchData.useTimeVal"
+                :options="searchData.useTimeList"
+                style="width: 100px"
+                class="custom-select filterBoxR-left"
+              />
+              <a-input
+                style="width: 80px"
+                v-model:value="searchData.useTimeInputVal"
+                @input="timeLang"
+                placeholder="请输入"
+              />
+              <template
+                v-if="
+                  searchData.useTimeVal == 'between' ||
+                  searchData.useTimeVal == 'notBetween'
+                "
+              >
+                <p class="betweenSymbol">-</p>
+                <a-input
+                  style="width: 80px"
+                  v-model:value="searchData.useTimeInputValL"
+                  placeholder="请输入"
+                />
+              </template>
+              <a-select
+                :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+                v-model:value="searchData.useTimeTypeVal"
+                :options="searchData.useTimeType"
+                style="width: 60px"
+                class="custom-select filterBoxR-right"
+              />
+            </a-input-group>
           </div>
         </div>
-      </div>
-      <div class="filterBox">
-        <div class="filterBoxL">答题时长</div>
-        <div class="filterBoxR flexBox">
-          <a-input-group compact class="lineSelect maxSelect sepcialSelect">
-            <a-select :getPopupContainer="triggerNode=>triggerNode.parentNode"
-              v-model:value="searchData.useTimeVal"
-              :options="searchData.useTimeList"
-              style="width: 100px"
-              class="custom-select"
-            />
-            <a-input style="width: 80px" v-model:value="searchData.useTimeInputVal"
-            @input="timeLang" placeholder="请输入" />
-            <template v-if="searchData.useTimeVal=='between'||searchData.useTimeVal=='notBetween'">
-              <p class="betweenSymbol">-</p>
-              <a-input style="width: 80px" v-model:value="searchData.useTimeInputValL" placeholder="请输入" />
-            </template>
-            <a-select :getPopupContainer="triggerNode=>triggerNode.parentNode"
-              v-model:value="searchData.useTimeTypeVal"
-              :options="searchData.useTimeType"
-              style="width: 60px"
-              class="custom-select"
-            />
-          </a-input-group>
-        </div>
-      </div>
-      <!-- 全部条件 -->
-      <div class="allBox" v-show="isAllOpen">
-        <div class="filterBox">
-          <div class="filterBoxL">作答时间</div>
-          <div class="filterBoxR filterBoxDate">
-            <!-- <a-time-picker
+        <!-- 全部条件 -->
+        <div class="allBox" v-show="isAllOpen">
+          <div class="filterBox">
+            <div class="filterBoxL">作答时间</div>
+            <div class="filterBoxR filterBoxDate">
+              <!-- <a-time-picker
               class="timePick"
               v-model:value="searchData.answerVal"
               placeholder="请选择答题时间区间"
               valueFormat="HH:mm:ss"
             /> -->
-            <a-range-picker
-              class="timePick"
-              v-model:value="searchData.answerVal"
-              format="YYYY-MM-DD HH:mm:ss"
-              :show-time="{
-                hideDisabledOptions: true,
-                defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-              }"
-              valueFormat="YYYY-MM-DD HH:mm:ss"
-            />
+              <a-range-picker
+                class="timePick"
+                v-model:value="searchData.answerVal"
+                format="YYYY-MM-DD HH:mm:ss"
+                :show-time="{
+                  hideDisabledOptions: true,
+                  defaultValue: [
+                    moment('00:00:00', 'HH:mm:ss'),
+                    moment('23:59:59', 'HH:mm:ss'),
+                  ],
+                }"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
+              />
+            </div>
           </div>
-        </div>
-        <div class="filterBox">
-          <div class="filterBoxL">提交时间</div>
-          <div class="filterBoxR filterBoxDate">
-            <!-- <a-time-picker
+          <div class="filterBox">
+            <div class="filterBoxL">提交时间</div>
+            <div class="filterBoxR filterBoxDate">
+              <!-- <a-time-picker
               class="timePick"
               v-model:value="searchData.subTimeVal"
               placeholder="请选择答题时间区间"
               valueFormat="HH:mm:ss"
             /> -->
-            <a-range-picker
-              class="timePick"
-              v-model:value="searchData.subTimeVal"
-              format="YYYY-MM-DD HH:mm:ss"
-              :show-time="{
-                hideDisabledOptions: true,
-                defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-              }"
-              valueFormat="YYYY-MM-DD HH:mm:ss"
-            />
+              <a-range-picker
+                class="timePick"
+                v-model:value="searchData.subTimeVal"
+                format="YYYY-MM-DD HH:mm:ss"
+                :show-time="{
+                  hideDisabledOptions: true,
+                  defaultValue: [
+                    moment('00:00:00', 'HH:mm:ss'),
+                    moment('23:59:59', 'HH:mm:ss'),
+                  ],
+                }"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
+              />
+            </div>
           </div>
-        </div>
-        <div class="filterBox">
-          <div class="filterBoxL">发布方式</div>
-          <div class="filterBoxR flexBox">
-            <a-select
-              :getPopupContainer="triggerNode=>triggerNode.parentNode"
-              mode="multiple" class="lineSelect maxSelect custom-select"
-              v-model:value="searchData.publishVal"
-              :maxTagCount="maxTagCount"
-              :maxTagTextLength="12"
-              :options="publish_types"
-              placeholder="请选择发布方式">
-              <template #dropdownRender="{ menuNode: VNodes }">
-                <div style="padding: 4px 12px; cursor: pointer">
-                  <a-button size="small" type="primary" @click="selectAll('publish')">全选</a-button>
-                  <a-button style="margin-left: 6px;" size="small"  @click="cancelSelectAll('publish')">清空</a-button>
-                </div>
-                <a-divider style="margin: 4px 0" />
-                <v-nodes :vnodes="VNodes" />
-              </template>
-            </a-select>
+          <div class="filterBox">
+            <div class="filterBoxL">发布方式</div>
+            <div class="filterBoxR flexBox">
+              <a-select
+                :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+                mode="multiple"
+                class="lineSelect maxSelect custom-select"
+                v-model:value="searchData.publishVal"
+                :maxTagCount="maxTagCount"
+                :maxTagTextLength="12"
+                :options="publish_types"
+                placeholder="请选择发布方式"
+              >
+                <template #dropdownRender="{ menuNode: VNodes }">
+                  <div style="padding: 4px 12px; cursor: pointer">
+                    <a-button
+                      size="small"
+                      type="primary"
+                      @click="selectAll('publish')"
+                      >全选</a-button
+                    >
+                    <a-button
+                      style="margin-left: 6px"
+                      size="small"
+                      @click="cancelSelectAll('publish')"
+                      >清空</a-button
+                    >
+                  </div>
+                  <a-divider style="margin: 4px 0" />
+                  <v-nodes :vnodes="VNodes" />
+                </template>
+              </a-select>
+            </div>
           </div>
-        </div>
-        <div class="filterBox">
-          <div class="filterBoxL">作答状态</div>
-          <div class="filterBoxR flexBox">
-            <a-select
-              :getPopupContainer="triggerNode=>triggerNode.parentNode"
-              mode="multiple" class="lineSelect maxSelect custom-select"
-              v-model:value="searchData.answerStatus"
-              :options="searchData.answerStatusList"
-              :maxTagCount="maxTagCount"
-              :maxTagTextLength="12"
-              placeholder="请选择作答状态"
-            >
-              <template #dropdownRender="{ menuNode: VNodes }">
-                <div style="padding: 4px 12px; cursor: pointer">
-                  <a-button size="small" type="primary" @click="selectAll('answerStatus')">全选</a-button>
-                  <a-button style="margin-left: 6px;" size="small"  @click="cancelSelectAll('answerStatus')">清空</a-button>
-                </div>
-                <a-divider style="margin: 4px 0" />
-                <v-nodes :vnodes="VNodes" />
-              </template>
-            </a-select>
+          <div class="filterBox">
+            <div class="filterBoxL">作答状态</div>
+            <div class="filterBoxR flexBox">
+              <a-select
+                :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+                mode="multiple"
+                class="lineSelect maxSelect custom-select"
+                v-model:value="searchData.answerStatus"
+                :options="searchData.answerStatusList"
+                :maxTagCount="maxTagCount"
+                :maxTagTextLength="12"
+                placeholder="请选择作答状态"
+              >
+                <template #dropdownRender="{ menuNode: VNodes }">
+                  <div style="padding: 4px 12px; cursor: pointer">
+                    <a-button
+                      size="small"
+                      type="primary"
+                      @click="selectAll('answerStatus')"
+                      >全选</a-button
+                    >
+                    <a-button
+                      style="margin-left: 6px"
+                      size="small"
+                      @click="cancelSelectAll('answerStatus')"
+                      >清空</a-button
+                    >
+                  </div>
+                  <a-divider style="margin: 4px 0" />
+                  <v-nodes :vnodes="VNodes" />
+                </template>
+              </a-select>
+            </div>
           </div>
-        </div>
-        <div class="filterBox">
-          <div class="filterBoxL">项目版本</div>
-          <div class="filterBoxR flexBox">
-            <a-select
-              :getPopupContainer="triggerNode=>triggerNode.parentNode"
-              class="lineSelect maxSelect custom-select" mode="multiple"
-              v-model:value="searchData.versions" :options="versions"
-              :maxTagCount="maxTagCount"
-              :maxTagTextLength="12"
-              placeholder="请选择版本"
-              @change="changeVersion"
-            >
-              <template #dropdownRender="{ menuNode: VNodes }">
-                <div style="padding: 4px 12px; cursor: pointer">
-                  <a-button size="small" type="primary" @click="selectAll('version')">全选</a-button>
-                  <a-button style="margin-left: 6px;" size="small"  @click="cancelSelectAll('version')">清空</a-button>
-                </div>
-                <a-divider style="margin: 4px 0" />
-                <v-nodes :vnodes="VNodes" />
-              </template>
-            </a-select>
+          <div class="filterBox">
+            <div class="filterBoxL">项目版本</div>
+            <div class="filterBoxR flexBox">
+              <a-select
+                :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+                class="lineSelect maxSelect custom-select"
+                mode="multiple"
+                v-model:value="searchData.versions"
+                :options="versions"
+                :maxTagCount="maxTagCount"
+                :maxTagTextLength="12"
+                placeholder="请选择版本"
+                @change="changeVersion"
+              >
+                <template #dropdownRender="{ menuNode: VNodes }">
+                  <div style="padding: 4px 12px; cursor: pointer">
+                    <a-button
+                      size="small"
+                      type="primary"
+                      @click="selectAll('version')"
+                      >全选</a-button
+                    >
+                    <a-button
+                      style="margin-left: 6px"
+                      size="small"
+                      @click="cancelSelectAll('version')"
+                      >清空</a-button
+                    >
+                  </div>
+                  <a-divider style="margin: 4px 0" />
+                  <v-nodes :vnodes="VNodes" />
+                </template>
+              </a-select>
+            </div>
           </div>
-        </div>
-        <div class="filterBox">
-          <div class="filterBoxL filerIp">IP地址</div>
-          <div class="filterBoxR flexBox">
-            <a-input
-              v-model:value="searchData.ip"
-              class="lineSelect maxSelect" placeholder="请输入"
-              :maxlength="15"
-              @input="numInput"
-            />
+          <div class="filterBox">
+            <div class="filterBoxL filerIp">IP地址</div>
+            <div class="filterBoxR flexBox">
+              <a-input
+                v-model:value="searchData.ip"
+                class="lineSelect maxSelect"
+                placeholder="请输入"
+                :maxlength="15"
+                @input="numInput"
+              />
+            </div>
           </div>
-        </div>
-        <div class="filterBox">
-          <div class="filterBoxL">配额逻辑</div>
-          <div class="filterBoxR flexBox">
-            <a-select
-              :getPopupContainer="triggerNode=>triggerNode.parentNode"
-              class="lineSelect maxSelect custom-select" mode="multiple"
-              v-model:value="searchData.logics" :options="logics"
-              :maxTagCount="maxTagCount"
-              :maxTagTextLength="12"
-              placeholder="请选择配额逻辑"
-              @change="changeLogics"
-            >
-              <template #dropdownRender="{ menuNode: VNodes }">
-                <div style="padding: 4px 12px; cursor: pointer">
-                  <a-button size="small" type="primary" @click="selectAll('logics')">全选</a-button>
-                  <a-button style="margin-left: 6px;" size="small"  @click="cancelSelectAll('logics')">清空</a-button>
-                </div>
-                <a-divider style="margin: 4px 0" />
-                <v-nodes :vnodes="VNodes" />
-              </template>
-            </a-select>
+          <div class="filterBox">
+            <div class="filterBoxL">配额逻辑</div>
+            <div class="filterBoxR flexBox">
+              <a-select
+                :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+                class="lineSelect maxSelect custom-select"
+                mode="multiple"
+                v-model:value="searchData.logics"
+                :options="logics"
+                :maxTagCount="maxTagCount"
+                :maxTagTextLength="12"
+                placeholder="请选择配额逻辑"
+                @change="changeLogics"
+              >
+                <template #dropdownRender="{ menuNode: VNodes }">
+                  <div style="padding: 4px 12px; cursor: pointer">
+                    <a-button
+                      size="small"
+                      type="primary"
+                      @click="selectAll('logics')"
+                      >全选</a-button
+                    >
+                    <a-button
+                      style="margin-left: 6px"
+                      size="small"
+                      @click="cancelSelectAll('logics')"
+                      >清空</a-button
+                    >
+                  </div>
+                  <a-divider style="margin: 4px 0" />
+                  <v-nodes :vnodes="VNodes" />
+                </template>
+              </a-select>
+            </div>
           </div>
-        </div>
-        <!-- <div class="filterBox">
+          <!-- <div class="filterBox">
           <div class="filterBoxL">是否被标记</div>
           <div class="filterBoxR flexBox">
             <a-switch v-model:checked="searchData.isMark" />
           </div>
         </div> -->
+        </div>
+        <div class="isAllOpen">
+          <div
+            class="isAllOpenBtn"
+            @click="isAllOpenClick"
+            :class="{ act: isAllOpen }"
+          >
+            {{ !isAllOpen ? "更多筛选类型" : "收起"
+            }}<CaretDownFilled class="isAllOpenIcon" />
+          </div>
+        </div>
       </div>
-      <div class="isAllOpen">
-        <div class="isAllOpenBtn" @click="isAllOpenClick" :class="{act:isAllOpen}">{{!isAllOpen?'更多筛选类型':'收起'}}<CaretDownFilled class="isAllOpenIcon" /></div>
-      </div>
-    </div>
-    <div class="searchBoxR" v-if="!isModal">
-      <div class="searchBtmL">
-        <span v-if="resShowFlag">
-          已筛选<i>{{props.count||0}}</i>份问卷
-        </span>
-      </div>
-      <div class="searchBtmR">
-        <a-button class="searchClean" @click="clearModal">清空</a-button>
-        <a-button class="searchClean" @click="savePlan">保存方案</a-button>
-        <a-button type="primary" @click="getSurveysAnswers">筛选</a-button>
+      <div class="searchBoxR" v-if="!isModal">
+        <div class="searchBtmL">
+          <span v-if="resShowFlag">
+            已筛选<i>{{ props.count || 0 }}</i
+            >份问卷
+          </span>
+        </div>
+        <div class="searchBtmR">
+          <a-button class="searchClean" @click="clearModal">清空</a-button>
+          <a-button class="searchClean" @click="savePlan">保存方案</a-button>
+          <a-button type="primary" @click="getSurveysAnswers">筛选</a-button>
+        </div>
       </div>
     </div>
   </div>
-</div>
-<div class="listSetting" v-if="false">
-  <div class="listSettingBtn">
-    <div class="listSettingBtnL">
-      <a-button type="primary" class="btnLeft">无效样本处理</a-button>
-      <a-button type="primary">缺失值处理</a-button>
-    </div>
-    <div class="listSettingBtnR">
-      <a-select :getPopupContainer="triggerNode=>triggerNode.parentNode" class="lineSelect custom-select" v-model:value="value2" :options="options2">
-      </a-select>
-      <a-select :getPopupContainer="triggerNode=>triggerNode.parentNode" class="lineSelect custom-select" v-model:value="value2" :options="options2">
-      </a-select>
+  <div class="listSetting" v-if="false">
+    <div class="listSettingBtn">
+      <div class="listSettingBtnL">
+        <a-button type="primary" class="btnLeft">无效样本处理</a-button>
+        <a-button type="primary">缺失值处理</a-button>
+      </div>
+      <div class="listSettingBtnR">
+        <a-select
+          :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+          class="lineSelect custom-select"
+          v-model:value="value2"
+          :options="options2"
+        >
+        </a-select>
+        <a-select
+          :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+          class="lineSelect custom-select"
+          v-model:value="value2"
+          :options="options2"
+        >
+        </a-select>
+      </div>
     </div>
+    <div class="listSettingCount">共选择 10 条数据</div>
   </div>
-  <div class="listSettingCount">共选择 10 条数据</div>
-</div>
-<newModal
-  ref="newModalRef"
-  @newSave="newSave"
-/>
+  <newModal ref="newModalRef" @newSave="newSave" />
 </template>
 <script setup>
-import { ref,toRefs,toRaw, reactive,defineProps,onBeforeMount,onMounted ,watch,nextTick ,computed} from 'vue';
-import { useRouter, useRoute } from 'vue-router';
-import { useStore } from 'vuex';
-import moment from 'moment';
-import { CaretDownFilled ,DeleteFilled ,MinusSquareOutlined,PlusSquareOutlined ,DeleteOutlined} from '@ant-design/icons-vue';
+import {
+  ref,
+  toRefs,
+  toRaw,
+  reactive,
+  defineProps,
+  onBeforeMount,
+  onMounted,
+  watch,
+  nextTick,
+  computed,
+} from "vue";
+import { useRouter, useRoute } from "vue-router";
+import { useStore } from "vuex";
+import moment from "moment";
+import {
+  CaretDownFilled,
+  DeleteFilled,
+  MinusSquareOutlined,
+  PlusSquareOutlined,
+  DeleteOutlined,
+} from "@ant-design/icons-vue";
 import { stringToMoment } from "ant-design-vue/lib/_util/moment-util";
-import { Modal } from 'ant-design-vue';
-import { message } from 'ant-design-vue';
+import { Modal } from "ant-design-vue";
+import { message } from "ant-design-vue";
 import answerListBox from "./answerList.vue";
-import newModal from './newModal'
-const VNodes=(_, { attrs }) => attrs.vnodes;
-const store = useStore()
+import newModal from "./newModal";
+const VNodes = (_, { attrs }) => attrs.vnodes;
+const store = useStore();
 const props = defineProps({
-  versions:{
-    type:Array,
-    default:()=>[]
+  versions: {
+    type: Array,
+    default: () => [],
   },
-  logics:{
-    type:Array
+  logics: {
+    type: Array,
   },
-  questions:{
-    type:Array,
-    default:()=>[]
+  questions: {
+    type: Array,
+    default: () => [],
   },
-  count:{
-    type:Number,
-    default:0
+  count: {
+    type: Number,
+    default: 0,
   },
   // 发布方式
-  publish_types:{
-    type:Array,
-    default:()=>[]
+  publish_types: {
+    type: Array,
+    default: () => [],
   },
-  isModal:{
-    type:Boolean,
-    default:false
+  isModal: {
+    type: Boolean,
+    default: false,
   },
   // 回显数据
-  filterData:{
-    type:Object,
-    default:()=>{}
+  filterData: {
+    type: Object,
+    default: () => {},
   },
   // 手动更改筛选条件
-  isArt:{
-    type:Boolean,
-    default:false
+  isArt: {
+    type: Boolean,
+    default: false,
   },
   // 是否为方案保存并且应用
-  nowPlanVal:{
-    type:Number,
-    default:-1
+  nowPlanVal: {
+    type: Number,
+    default: -1,
   },
-})
-const { questions,isModal,isArt,nowPlanVal } = toRefs(props)
-const filterData = computed(()=>props.filterData)
-console.log('filterData+++++',filterData.value);
-const versions = computed(()=>{
-  const nVre =props.versions.map(el=>{
-    el.value=el.value+''
-    return el
-  })
-  return nVre
-})
-const publish_types = computed(()=>{
-  const nVre =props.publish_types.map(el=>{
-    el.value=el.value+''
-    return el
-  })
-  return nVre
-})
-const logics = computed(()=>{
-  const nVre =props.logics.map(el=>{
-    el.value=el.value+''
-    return el
-  })
-  return nVre
-})
-const emit = defineEmits(['onSearch'])
+});
+const { questions, isModal, isArt, nowPlanVal } = toRefs(props);
+const filterData = computed(() => props.filterData);
+console.log("filterData+++++", filterData.value);
+const versions = computed(() => {
+  const nVre = props.versions.map((el) => {
+    el.value = el.value + "";
+    return el;
+  });
+  return nVre;
+});
+const publish_types = computed(() => {
+  const nVre = props.publish_types.map((el) => {
+    el.value = el.value + "";
+    return el;
+  });
+  return nVre;
+});
+const logics = computed(() => {
+  const nVre = props.logics.map((el) => {
+    el.value = el.value + "";
+    return el;
+  });
+  return nVre;
+});
+const emit = defineEmits(["onSearch"]);
 const route = useRoute();
 const sn = route.query.sn;
 // 是否展开
-const isOpen = ref(true)
-const isOpenClick = ()=>{
-  isOpen.value = !isOpen.value
-}
+const isOpen = ref(true);
+const isOpenClick = () => {
+  isOpen.value = !isOpen.value;
+};
 // 下拉框tag显示数量
-const maxTagCount = 1
+const maxTagCount = 1;
 // 全部条件是否展开
-const isAllOpen = ref(false)
-const isAllOpenClick = ()=>{
-  isAllOpen.value = !isAllOpen.value
-}
+const isAllOpen = ref(false);
+const isAllOpenClick = () => {
+  isAllOpen.value = !isAllOpen.value;
+};
 // 添加全部选项
 // 题目答案
 
-const changeVersion = (e,op)=>{
+const changeVersion = (e, op) => {
   // console.log('changeVersion',e,op);
   // const list = JSON.parse(JSON.stringify(versions.value))
   // if(list.length!==e.length){
   //   searchData.value.versions = searchData.value.versions.filter(el=>el!==-1)
   // }
-}
-const changeLogics = (e,op)=>{
-
-}
+};
+const changeLogics = (e, op) => {};
 // 多选框全选
-const selectAll = (type)=>{
-  const searchDataVal = searchData.value
-  if(type=='version'){
-    searchDataVal.versions.length = 0
-    versions.value.map(el=>{
-      searchDataVal.versions.push(el.value+'')
-    })
+const selectAll = (type) => {
+  const searchDataVal = searchData.value;
+  if (type == "version") {
+    searchDataVal.versions.length = 0;
+    versions.value.map((el) => {
+      searchDataVal.versions.push(el.value + "");
+    });
   }
-  if(type=='answerStatus'){
-    searchDataVal.answerStatus.length = 0
-    searchDataVal.answerStatusList.map(el=>{
-      searchDataVal.answerStatus.push(el.value)
-    })
+  if (type == "answerStatus") {
+    searchDataVal.answerStatus.length = 0;
+    searchDataVal.answerStatusList.map((el) => {
+      searchDataVal.answerStatus.push(el.value);
+    });
   }
-  if(type=='publish'){
-    searchDataVal.publishVal.length = 0
-    searchDataVal.publishList.map(el=>{
-      searchDataVal.publishVal.push(el.value)
-    })
+  if (type == "publish") {
+    searchDataVal.publishVal.length = 0;
+    searchDataVal.publishList.map((el) => {
+      searchDataVal.publishVal.push(el.value);
+    });
   }
-  if(type=='logics'){
-    searchDataVal.logics.length = 0
-    logics.value.map(el=>{
-      searchDataVal.logics.push(el.value)
-    })
+  if (type == "logics") {
+    searchDataVal.logics.length = 0;
+    logics.value.map((el) => {
+      searchDataVal.logics.push(el.value);
+    });
   }
-}
+};
 // 多选框取消全选
-const cancelSelectAll = (type)=>{
-  const searchDataVal = searchData.value
-  if(type=='version'){
-    searchDataVal.versions.length = 0
+const cancelSelectAll = (type) => {
+  const searchDataVal = searchData.value;
+  if (type == "version") {
+    searchDataVal.versions.length = 0;
   }
-  if(type=='answerStatus'){
-    searchDataVal.answerStatus.length = 0
+  if (type == "answerStatus") {
+    searchDataVal.answerStatus.length = 0;
   }
-  if(type=='publish'){
-    searchDataVal.publishVal.length = 0
+  if (type == "publish") {
+    searchDataVal.publishVal.length = 0;
   }
-  if(type=='logics'){
-    searchDataVal.logics.length = 0
+  if (type == "logics") {
+    searchDataVal.logics.length = 0;
   }
-}
+};
 // 查询条件默认
-const showData ={
-    // 筛选条件
-    filterType:'0',
-    // 筛选条件
-    filterTypeList:[
-      {
-        value: '0',
-        label: '全部条件',
-      },
-      {
-        value: '1',
-        label: '任意条件',
-      }
-    ],
-    // 答题时长
-    useTimeVal:'>=',
-    useTimeList:[
-      {
-        value: '>=',
-        label: '大于等于',
-      },
-      {
-        value: '<=',
-        label: '小于等于',
-      },
-      {
-        value: '>',
-        label: '大于',
-      },
-      {
-        value: '<',
-        label: '小于',
-      },
-      {
-        value: 'between',
-        label: '介于',
-      },
-      {
-        value: 'notBetween',
-        label: '不介于',
-      },
-    ],
-    useTimeInputVal:null,
-    useTimeInputValL:null,
-    useTimeTypeVal:'0',
-    useTimeType:[
-      {
-        value: '0',
-        label: '秒',
-      },
-      {
-        value: '1',
-        label: '分',
-      },
-      {
-        value: '2',
-        label: '时',
-      },
-    ],
-    // 作答时长
-    answerVal:[],
-    // 提交时间
-    subTimeVal:[],
-    // 发布方式
-    publishVal:[],
-    publishList:[
-      // {
-      //   value: '-1',
-      //   label: '全部',
-      // },
-      {
-        value: '0',
-        label: '链接二维码',
-      },
-      // {
-      //   value: '3',
-      //   label: '邮件',
-      // },
-      // {
-      //   value: '2',
-      //   label: '短信',
-      // },
-      // {
-      //   value: '1',
-      //   label: '代码嵌入',
-      // },
-    ],
-    // 作答状态
-    answerStatus:['0','1','2'],
-    answerStatusList:[
-      // {
-      //   value: '-1',
-      //   label: '全部',
-      // },
-      // {
-      //   value: '-2',
-      //   label: '未作答',
-      // },
-      {
-        value: '0',
-        label: '进行中 ',
-      },
-      {
-        value: '1',
-        label: '已完成',
-      },
-      {
-        value: '2',
-        label: '被甄别',
-      },
-    ],
-    // 版本
-    versions:[],
-    // 配额逻辑
-    logics:[],
-    // 是否标记
-    isMark:false,
-}
+const showData = {
+  // 筛选条件
+  filterType: "0",
+  // 筛选条件
+  filterTypeList: [
+    {
+      value: "0",
+      label: "全部条件",
+    },
+    {
+      value: "1",
+      label: "任意条件",
+    },
+  ],
+  // 答题时长
+  useTimeVal: ">=",
+  useTimeList: [
+    {
+      value: ">=",
+      label: "大于等于",
+    },
+    {
+      value: "<=",
+      label: "小于等于",
+    },
+    {
+      value: ">",
+      label: "大于",
+    },
+    {
+      value: "<",
+      label: "小于",
+    },
+    {
+      value: "between",
+      label: "介于",
+    },
+    {
+      value: "notBetween",
+      label: "不介于",
+    },
+  ],
+  useTimeInputVal: null,
+  useTimeInputValL: null,
+  useTimeTypeVal: "0",
+  useTimeType: [
+    {
+      value: "0",
+      label: "秒",
+    },
+    {
+      value: "1",
+      label: "分",
+    },
+    {
+      value: "2",
+      label: "时",
+    },
+  ],
+  // 作答时长
+  answerVal: [],
+  // 提交时间
+  subTimeVal: [],
+  // 发布方式
+  publishVal: [],
+  publishList: [
+    // {
+    //   value: '-1',
+    //   label: '全部',
+    // },
+    {
+      value: "0",
+      label: "链接二维码",
+    },
+    // {
+    //   value: '3',
+    //   label: '邮件',
+    // },
+    // {
+    //   value: '2',
+    //   label: '短信',
+    // },
+    // {
+    //   value: '1',
+    //   label: '代码嵌入',
+    // },
+  ],
+  // 作答状态
+  answerStatus: ["0", "1", "2"],
+  answerStatusList: [
+    // {
+    //   value: '-1',
+    //   label: '全部',
+    // },
+    // {
+    //   value: '-2',
+    //   label: '未作答',
+    // },
+    {
+      value: "0",
+      label: "进行中 ",
+    },
+    {
+      value: "1",
+      label: "已完成",
+    },
+    {
+      value: "2",
+      label: "被甄别",
+    },
+  ],
+  // 版本
+  versions: [],
+  // 配额逻辑
+  logics: [],
+  // 是否标记
+  isMark: false,
+};
 const filterPlan = ref({
-   // 方案
-    filterListVal:'-1',
-    filterList:[]
-})
-watch(()=>nowPlanVal.value,(nval)=>{
-  filterPlan.value.filterListVal = nval+''
-})
-const defaultData =ref(showData)
+  // 方案
+  filterListVal: "-1",
+  filterList: [],
+});
+watch(
+  () => nowPlanVal.value,
+  (nval) => {
+    filterPlan.value.filterListVal = nval + "";
+  }
+);
+const defaultData = ref(showData);
 // 题目答案列表
-const answerList = ref([{}])
-const answerGroupList = ref([])
-const getFilterData = ()=>{
+const answerList = ref([{}]);
+const answerGroupList = ref([]);
+const getFilterData = () => {
   let fData = {
     // 筛选条件
-    filterType:'0',
+    filterType: "0",
     // 答题时长左侧 大于等于
-    useTimeVal:'>=',
+    useTimeVal: ">=",
     // 答题时长右侧 秒时分
-    useTimeTypeVal:'0',
+    useTimeTypeVal: "0",
     // 答题时长中间输入框
-    useTimeInputVal:null,
-    useTimeInputValL:null,
+    useTimeInputVal: null,
+    useTimeInputValL: null,
     // 作答时间
-    answerVal:[],
+    answerVal: [],
     // 完成时间
-    subTimeVal:[],
+    subTimeVal: [],
     // 发布方式
-    publishVal:[],
+    publishVal: [],
     // 作答状态
-    answerStatus:[],
-    ip:null,
+    answerStatus: [],
+    ip: null,
     // 版本号
-    versions:[],
+    versions: [],
     // 配额
-    logics:[],
-    isMark:null,
+    logics: [],
+    isMark: null,
     // 题目答案
-    answer:[],
-  }
-  if(filterData.value?.answer){
-    let nAnswer = filterData.value?.answer
-    if(typeof filterData.value?.answer ==='string'){
-      nAnswer = JSON.parse(filterData.value?.answer)
+    answer: [],
+  };
+  if (filterData.value?.answer) {
+    let nAnswer = filterData.value?.answer;
+    if (typeof filterData.value?.answer === "string") {
+      nAnswer = JSON.parse(filterData.value?.answer);
     }
-     
+
     // answerList
     // answerGroupList
     // fData.answer = filterData.value?.answer.join()
-    console.log('nAnswer',filterData.value);
-    answerList.value = [{}]
-    answerGroupList.value = []
-    if(typeof nAnswer ==='object'){
-      answerList.value = []
-      answerGroupList.value = []
-      nAnswer.map(el=>{
-        if(el.group===0){
-          el.child.map(cel=>{
-            answerList.value.push(asAssembly(cel))
-          })
+    console.log("nAnswer", filterData.value);
+    answerList.value = [{}];
+    answerGroupList.value = [];
+    if (typeof nAnswer === "object") {
+      answerList.value = [];
+      answerGroupList.value = [];
+      nAnswer.map((el) => {
+        if (el.group === 0) {
+          el.child.map((cel) => {
+            answerList.value.push(asAssembly(cel));
+          });
         }
-        if(el.group===1){
+        if (el.group === 1) {
           const data = {
-              val:el.filter_type,
-              list:[]
-            }
-          el.child.map(cel=>{
-            data.list.push(asAssembly(cel))
-          })
-          answerGroupList.value.push(data)
+            val: el.filter_type,
+            list: [],
+          };
+          el.child.map((cel) => {
+            data.list.push(asAssembly(cel));
+          });
+          answerGroupList.value.push(data);
         }
-      })
-      if(nAnswer.length ===0){
-        answerList.value = [{}]
+      });
+      if (nAnswer.length === 0) {
+        answerList.value = [{}];
       }
     }
-    console.log('拼装answerList.value',answerList.value);
-    console.log('拼装answerGroupList++++++',answerGroupList.value);
-  }else{
-    fData.answer = [{}]
-    answerList.value = [{}]
-    answerGroupList.value = []
+    console.log("拼装answerList.value", answerList.value);
+    console.log("拼装answerGroupList++++++", answerGroupList.value);
+  } else {
+    fData.answer = [{}];
+    answerList.value = [{}];
+    answerGroupList.value = [];
   }
   // 筛选条件
-  if(filterData.value?.filter_type){
-    fData.filterType = filterData.value?.filter_type+''
+  if (filterData.value?.filter_type) {
+    fData.filterType = filterData.value?.filter_type + "";
   }
   // 答题时长左侧 大于等于
-  if(filterData.value?.use_time_operator){
-    fData.useTimeVal = filterData.value?.use_time_operator+''
+  if (filterData.value?.use_time_operator) {
+    fData.useTimeVal = filterData.value?.use_time_operator + "";
   }
   // 答题时长右侧 秒时分
-  if(filterData.value?.use_time_type){
-    fData.useTimeTypeVal = filterData.value?.use_time_type+''
+  if (filterData.value?.use_time_type) {
+    fData.useTimeTypeVal = filterData.value?.use_time_type + "";
   }
   // 答题时长中间输入框
-  if(filterData.value?.use_time_left){
-    fData.useTimeInputVal = filterData.value?.use_time_left+''
+  if (filterData.value?.use_time_left) {
+    fData.useTimeInputVal = filterData.value?.use_time_left + "";
   }
-  if(filterData.value?.use_time_right){
-    fData.useTimeInputValL = filterData.value?.use_time_right+''
+  if (filterData.value?.use_time_right) {
+    fData.useTimeInputValL = filterData.value?.use_time_right + "";
   }
   // ip
-  if(filterData.value?.answer_ip){
-    fData.ip = filterData.value?.answer_ip+''
+  if (filterData.value?.answer_ip) {
+    fData.ip = filterData.value?.answer_ip + "";
   }
-  if(filterData.value?.is_mark){
-    fData.isMark = filterData.value?.is_mark+''
+  if (filterData.value?.is_mark) {
+    fData.isMark = filterData.value?.is_mark + "";
   }
   // 配额
-  if(!filterData.value?.id){
+  if (!filterData.value?.id) {
     for (let i = 0; i < logics.value.length; i++) {
       const el = logics.value[i];
-      fData.logics.push(el.value)
+      fData.logics.push(el.value);
     }
-  }else{
-    if(filterData.value?.logics){
-      fData.logics = filterData.value?.logics.split(',')
+  } else {
+    if (filterData.value?.logics) {
+      fData.logics = filterData.value?.logics.split(",");
     }
   }
   // 版本号
-  if(!filterData.value?.id){
+  if (!filterData.value?.id) {
     for (let i = 0; i < versions.value.length; i++) {
       const el = versions.value[i];
-      fData.versions.push(el.value)
+      fData.versions.push(el.value);
     }
-  }else{
-    if(filterData.value?.publish_version){
-      fData.versions = filterData.value?.publish_version.split(',')
+  } else {
+    if (filterData.value?.publish_version) {
+      fData.versions = filterData.value?.publish_version.split(",");
     }
   }
   // 作答时间
-  if(filterData.value?.created_at_between){
-    fData.answerVal = filterData.value?.created_at_between.split(',')
+  if (filterData.value?.created_at_between) {
+    fData.answerVal = filterData.value?.created_at_between.split(",");
   }
   // 完成时间
-  if(filterData.value?.completed_at_between){
-    fData.subTimeVal = filterData.value?.completed_at_between.split(',')
+  if (filterData.value?.completed_at_between) {
+    fData.subTimeVal = filterData.value?.completed_at_between.split(",");
   }
   // 发布方式
-  if(!filterData.value?.id){
+  if (!filterData.value?.id) {
     for (let i = 0; i < publish_types.value.length; i++) {
       const el = publish_types.value[i];
-      fData.publishVal.push(el.value)
+      fData.publishVal.push(el.value);
     }
-  }else{
-    if(filterData.value?.publish_type){
-      console.log('filterData.value?.publish_type',filterData.value);
-      fData.publishVal = filterData.value?.publish_type.split(',')
+  } else {
+    if (filterData.value?.publish_type) {
+      console.log("filterData.value?.publish_type", filterData.value);
+      fData.publishVal = filterData.value?.publish_type.split(",");
     }
   }
   // 作答状态
-  if(!filterData.value?.id){
+  if (!filterData.value?.id) {
     for (let i = 0; i < showData.answerStatusList.length; i++) {
       const el = showData.answerStatusList[i];
-      fData.answerStatus.push(el.value)
+      fData.answerStatus.push(el.value);
     }
-  }else{
-    if(filterData.value?.answer_status){
-      fData.answerStatus = filterData.value?.answer_status.split(',')
+  } else {
+    if (filterData.value?.answer_status) {
+      fData.answerStatus = filterData.value?.answer_status.split(",");
     }
   }
-  let retData ={...showData}
-  if(isModal.value||isArt.value){
-    retData = {...showData,...fData}
+  let retData = { ...showData };
+  if (isModal.value || isArt.value) {
+    retData = { ...showData, ...fData };
   }
-  console.log('defaultData',retData);
-  return retData
-}
-const asAssembly = (data)=>{
+  console.log("defaultData", retData);
+  return retData;
+};
+const asAssembly = (data) => {
   const nel = {
-    val:data.question_index,
-    value:data.row,
-    operVal:data.operator,
+    val: data.question_index,
+    value: data.row,
+    operVal: data.operator,
+  };
+  if (typeof data.answer === "string") {
+    nel.asVal = data.answer.split();
   }
-  if(typeof data.answer ==='string'){
-    nel.asVal=data.answer.split()
-  }
-  if(typeof data.answer ==='object'){
-    if(data.answer.date&&data.answer.date_2){
-      nel.datBeteVal=[data.answer.date,data.answer.date_2]
-    }else{
-      nel.dateVal = data.answer.date
+  if (typeof data.answer === "object") {
+    if (data.answer.date && data.answer.date_2) {
+      nel.datBeteVal = [data.answer.date, data.answer.date_2];
+    } else {
+      nel.dateVal = data.answer.date;
     }
-    if(data.answer.time&&data.answer.time_2){
-      nel.timeBetVal=[data.answer.time,data.answer.time_2]
-    }else{
-      nel.timeVal = data.answer.time
+    if (data.answer.time && data.answer.time_2) {
+      nel.timeBetVal = [data.answer.time, data.answer.time_2];
+    } else {
+      nel.timeVal = data.answer.time;
     }
   }
-  return nel
-}
+  return nel;
+};
 
-const resetSearchData = JSON.parse(JSON.stringify(showData))
-defaultData.value = getFilterData()
-const searchData = ref(defaultData.value)
-const getSurveysAnswerFilter =async ()=>{
+const resetSearchData = JSON.parse(JSON.stringify(showData));
+defaultData.value = getFilterData();
+const searchData = ref(defaultData.value);
+const getSurveysAnswerFilter = async () => {
   try {
-    const subData = {sn}
-    const {data} = await store.dispatch('dataFilter/getSurveysAnswerFilter',subData)
-    const nullData = [{
-      value:'-1',
-      label:'默认方案'
-    }]
-    data.map(el=>{
-      el.label = el.title
-      el.value = el.id+''
-    })
+    const subData = { sn };
+    const { data } = await store.dispatch(
+      "dataFilter/getSurveysAnswerFilter",
+      subData
+    );
+    const nullData = [
+      {
+        value: "-1",
+        label: "默认方案",
+      },
+    ];
+    data.map((el) => {
+      el.label = el.title;
+      el.value = el.id + "";
+    });
     // 开始数据清洗
-    const newData = []
+    const newData = [];
     // 判断是否有改动
-    let isFlag = false
+    let isFlag = false;
     for (let i = 0; i < data.length; i++) {
       let el = data[i];
       for (let x = 0; x < el.answer.length; x++) {
         let cel = el.answer[x];
-        const asArr =await store.dispatch('dataFilter/cleanAnswer',{question:questions.value,answer:cel})
-        el.answer[x] = asArr.answer
-        isFlag = asArr.isFlag
+        const asArr = await store.dispatch("dataFilter/cleanAnswer", {
+          question: questions.value,
+          answer: cel,
+        });
+        el.answer[x] = asArr.answer;
+        isFlag = asArr.isFlag;
       }
-      newData.push(el)
+      newData.push(el);
     }
-    if(isFlag){
+    if (isFlag) {
       // message.warning('由于项目改动，部分不可用筛选条件已为您自动删除')
     }
-    filterPlan.value.filterList = [...nullData,...newData]
-    console.log('获取方案',searchData.value);
+    filterPlan.value.filterList = [...nullData, ...newData];
+    console.log("获取方案", searchData.value);
   } catch (error) {
     console.error(error);
   }
-}
-watch(()=>questions.value,nval=>{
-  getSurveysAnswerFilter()
-})
+};
+watch(
+  () => questions.value,
+  (nval) => {
+    getSurveysAnswerFilter();
+  }
+);
 // 保存方案
-const newModalRef = ref(null)
-const savePlan = ()=>{
-  newModalRef.value.saveVis = true
-}
-const postSurveysAnswers =async (e)=>{
+const newModalRef = ref(null);
+const savePlan = () => {
+  newModalRef.value.saveVis = true;
+};
+const postSurveysAnswers = async (e) => {
   try {
     const subData = {
       sn,
       ...filterFormater(),
-      ...e
-    }
-    const {data} = await store.dispatch('dataFilter/postSurveysAnswers',subData)
-    message.success('方案保存成功')
+      ...e,
+    };
+    const { data } = await store.dispatch(
+      "dataFilter/postSurveysAnswers",
+      subData
+    );
+    message.success("方案保存成功");
     // 重新请求接口
-    await getSurveysAnswerFilter()
-    newModalRef.value.saveVis = false
+    await getSurveysAnswerFilter();
+    newModalRef.value.saveVis = false;
   } catch (error) {
     console.error(error);
   }
-}
-const newSave = (e)=>{
-  postSurveysAnswers(e)
-}
+};
+const newSave = (e) => {
+  postSurveysAnswers(e);
+};
 // 添加条件列表
-const addList = ()=>{
-  const data = {}
-  answerList.value.push(data)
-}
+const addList = () => {
+  const data = {};
+  answerList.value.push(data);
+};
 // 添加组条件
-const addGroup = ()=>{
+const addGroup = () => {
   const data = {
-    val:'0',
-    list:[{
-    }]
-  }
-  answerGroupList.value.push(data)
-}
+    val: "0",
+    list: [{}],
+  };
+  answerGroupList.value.push(data);
+};
 // 组条件删除
-const delGroup =index=>{
-  const newList = [...answerGroupList.value,...answerList.value]
+const delGroup = (index) => {
+  const newList = [...answerGroupList.value, ...answerList.value];
   console.log(newList);
-  if(newList.length==1){
-    if(answerGroupList.value.length==1){
-      answerGroupList.value = [{val:'0',list:[{}]}]
+  if (newList.length == 1) {
+    if (answerGroupList.value.length == 1) {
+      answerGroupList.value = [{ val: "0", list: [{}] }];
     }
-    return
+    return;
   }
-  answerGroupList.value = answerGroupList.value.filter((el,i)=>i!=index)
-}
+  answerGroupList.value = answerGroupList.value.filter((el, i) => i != index);
+};
 
 // 拼装answer
-const getAnswer = ()=>{
-  const newAnswerList = toRaw(answerList.value)
-  const newAnswerGroupListVal =  toRaw(answerGroupList.value)
-  console.log('newAnswerList',newAnswerList);
-  console.log('newAnswerGroupListVal',newAnswerGroupListVal);
+const getAnswer = () => {
+  const newAnswerList = toRaw(answerList.value);
+  const newAnswerGroupListVal = toRaw(answerGroupList.value);
+  console.log("newAnswerList", newAnswerList);
+  console.log("newAnswerGroupListVal", newAnswerGroupListVal);
   // 单项拼装
-  let aslJson = []
-  newAnswerList.map(el=>{
-    const defObj ={
+  let aslJson = [];
+  newAnswerList.map((el) => {
+    const defObj = {
       group: 0, //是否分组
       filter_type: 0, //显示满足以下样本
-      child: []
-    }
-    defObj.child.push({...answerAss(el)})
+      child: [],
+    };
+    defObj.child.push({ ...answerAss(el) });
     // 非空判断
     // if(verifAnswer(defObj.child[0]))return false
-    if(el.val){
-      aslJson.push(defObj)
+    if (el.val) {
+      aslJson.push(defObj);
     }
-  })
+  });
   // 组拼装
-  let asglJson = []
-  newAnswerGroupListVal.map(el=>{
-    const defObj ={
+  let asglJson = [];
+  newAnswerGroupListVal.map((el) => {
+    const defObj = {
       group: 1, //是否分组
       filter_type: el.val, //显示满足以下样本
-      child: []
-    }
-    el.list.map(cel=>{
+      child: [],
+    };
+    el.list.map((cel) => {
       // const qType = questions.value.find(sel=>sel.question_index==cel.val)
       // //题目index
       // if(cel.val)childObj.question_index = cel.val
@@ -909,182 +1041,191 @@ const getAnswer = ()=>{
       //     cel.answer.time=cel.timeVal??''
       //   }
       // }
-      if(cel.val){
-        defObj.child.push({...answerAss(cel)})
+      if (cel.val) {
+        defObj.child.push({ ...answerAss(cel) });
       }
-    })
-    if(defObj.child.length>0){
-      asglJson.push(defObj)
+    });
+    if (defObj.child.length > 0) {
+      asglJson.push(defObj);
     }
-  })
-  console.log('拼装结果',[...aslJson,...asglJson]);
-  return [...aslJson,...asglJson]
-}
-const answerAss = (el)=>{
-  const opValList = ['between','notbetween']
-  const qType = questions.value.find(cel=>cel.question_index==el.val)
-  const data = {}
+  });
+  console.log("拼装结果", [...aslJson, ...asglJson]);
+  return [...aslJson, ...asglJson];
+};
+const answerAss = (el) => {
+  const opValList = ["between", "notbetween"];
+  const qType = questions.value.find((cel) => cel.question_index == el.val);
+  const data = {};
   //题目index
-  if(el.val)data.question_index = el.val
+  if (el.val) data.question_index = el.val;
   //题目type
-  if(qType?.question_type)data.question_type = qType?.question_type
+  if (qType?.question_type) data.question_type = qType?.question_type;
   //标签
-  if(el.value)data.row = el.value
+  if (el.value) data.row = el.value;
   //大于等于啥的
-  if(el.operVal)data.operator = el.operVal
+  if (el.operVal) data.operator = el.operVal;
   // 最后那个答案
-  if(el.asVal||el.asVal==0)data.answer = (typeof el.asVal =='object'?el.asVal.join():el.asVal)
+  if (el.asVal || el.asVal == 0)
+    data.answer = typeof el.asVal == "object" ? el.asVal.join() : el.asVal;
   // 最后那个答案如果是时间
-  if(el?.answerType=='datetime'){
-    data.answer = {}
-    if(opValList.includes(el?.operVal)){
-      if(el.datBeteVal.length>0){
-        data.answer.date=el.datBeteVal[0]
-        data.answer.date_2=el.datBeteVal[1]
+  if (el?.answerType == "datetime") {
+    data.answer = {};
+    if (opValList.includes(el?.operVal)) {
+      if (el.datBeteVal.length > 0) {
+        data.answer.date = el.datBeteVal[0];
+        data.answer.date_2 = el.datBeteVal[1];
       }
-      if(el.timeBetVal.length>0){
-        data.answer.time=el.timeBetVal[0]
-        data.answer.time_2=el.timeBetVal[1]
+      if (el.timeBetVal.length > 0) {
+        data.answer.time = el.timeBetVal[0];
+        data.answer.time_2 = el.timeBetVal[1];
       }
-    }else{
-      data.answer.date=el.dateVal??''
-      data.answer.time=el.timeVal??''
+    } else {
+      data.answer.date = el.dateVal ?? "";
+      data.answer.time = el.timeVal ?? "";
     }
   }
-  return data
-}
+  return data;
+};
 // 开始搜索
-const resShowFlag = ref(false)
-const getSurveysAnswers = (type)=>{
-  const subData = filterFormater()
+const resShowFlag = ref(false);
+const getSurveysAnswers = (type) => {
+  const subData = filterFormater();
   // console.log('subData-----',subData);
   // subData.answer = JSON.parse(subData.answer)
-  emit('onSearch',{...subData,isFilterFlag:true,type})
-  resShowFlag.value = true
-  console.log('查询',resShowFlag.value);
-}
-const filterFormater = ()=>{
-  const searchObj = JSON.parse(JSON.stringify(searchData.value))
-  console.log('searchObj',searchObj);
-  const answer = getAnswer()??[]
-  const subData = {page:1}
+  emit("onSearch", { ...subData, isFilterFlag: true, type });
+  resShowFlag.value = true;
+  console.log("查询", resShowFlag.value);
+};
+const filterFormater = () => {
+  const searchObj = JSON.parse(JSON.stringify(searchData.value));
+  console.log("searchObj", searchObj);
+  const answer = getAnswer() ?? [];
+  const subData = { page: 1 };
   // 筛选方式
-  if(searchObj.filterType)subData.filter_type = searchObj.filterType
-  else subData.filter_type=''
+  if (searchObj.filterType) subData.filter_type = searchObj.filterType;
+  else subData.filter_type = "";
   // 题目答案json
-  if(answer.length>0)subData.answer = answer
-  else subData.answer=''
+  if (answer.length > 0) subData.answer = answer;
+  else subData.answer = "";
   // 答题时长-左
-  if(searchObj.useTimeVal)subData.use_time_operator = searchObj.useTimeVal
-  else subData.use_time_operator=''
+  if (searchObj.useTimeVal) subData.use_time_operator = searchObj.useTimeVal;
+  else subData.use_time_operator = "";
   // 答题时长-右
-  if(searchObj.useTimeTypeVal)subData.use_time_type = searchObj.useTimeTypeVal
-  else subData.use_time_type=''
+  if (searchObj.useTimeTypeVal)
+    subData.use_time_type = searchObj.useTimeTypeVal;
+  else subData.use_time_type = "";
   // 答题时长-数字
-  if(searchObj.useTimeInputVal)subData.use_time_left = searchObj.useTimeInputVal
-  else subData.use_time_left=''
-  if(searchObj.useTimeInputValL)subData.use_time_right = searchObj.useTimeInputValL
-  else subData.use_time_right=''
+  if (searchObj.useTimeInputVal)
+    subData.use_time_left = searchObj.useTimeInputVal;
+  else subData.use_time_left = "";
+  if (searchObj.useTimeInputValL)
+    subData.use_time_right = searchObj.useTimeInputValL;
+  else subData.use_time_right = "";
   // 作答时间
-  if(searchObj.answerVal.length>0)subData.created_at_between = searchObj.answerVal.join()
-  else subData.created_at_between=''
+  if (searchObj.answerVal.length > 0)
+    subData.created_at_between = searchObj.answerVal.join();
+  else subData.created_at_between = "";
   // 提交时间
-  if(searchObj.subTimeVal.length>0)subData.completed_at_between = searchObj.subTimeVal.join()
-  else subData.completed_at_between=''
+  if (searchObj.subTimeVal.length > 0)
+    subData.completed_at_between = searchObj.subTimeVal.join();
+  else subData.completed_at_between = "";
   // 发布方式
-  if(searchObj.publishVal.length>0)subData.publish_type = searchObj.publishVal.join()
-  else subData.publish_type=''
+  if (searchObj.publishVal.length > 0)
+    subData.publish_type = searchObj.publishVal.join();
+  else subData.publish_type = "";
   // 作答状态
-  if(searchObj.answerStatus.length>0)subData.answer_status = searchObj.answerStatus.join()
-  else subData.answer_status=''
+  if (searchObj.answerStatus.length > 0)
+    subData.answer_status = searchObj.answerStatus.join();
+  else subData.answer_status = "";
   // IP地址
-  if(searchObj.ip)subData.answer_ip = searchObj.ip
-  else subData.answer_ip=''
+  if (searchObj.ip) subData.answer_ip = searchObj.ip;
+  else subData.answer_ip = "";
   // 版本
-  if(searchObj.versions.length>0)subData.publish_version = searchObj.versions.join()
-  else subData.publish_version=''
+  if (searchObj.versions.length > 0)
+    subData.publish_version = searchObj.versions.join();
+  else subData.publish_version = "";
   // 配额
-  if(searchObj.logics.length>0)subData.logics = searchObj.logics.join()
-  else subData.logics=''
+  if (searchObj.logics.length > 0) subData.logics = searchObj.logics.join();
+  else subData.logics = "";
   // 是否标记
-  if(searchObj.isMark)subData.is_mark = searchObj.isMark
-  else subData.is_mark=''
-  console.log('subData',subData);
+  if (searchObj.isMark) subData.is_mark = searchObj.isMark;
+  else subData.is_mark = "";
+  console.log("subData", subData);
   // 记录条件
-  store.dispatch('dataFilter/dataFilterInfo',subData)
-  console.log('当前搜索条件',subData.answer );
-  subData.answer = JSON.stringify(subData.answer)
-  return subData
-}
+  store.dispatch("dataFilter/dataFilterInfo", subData);
+  console.log("当前搜索条件", subData.answer);
+  subData.answer = JSON.stringify(subData.answer);
+  return subData;
+};
 // 作答时长限制
-const timeLang = (e)=>{
-  const val = e.target.value
-  const reg = /[^0-9]+/g
-  searchData.value.useTimeInputVal = val.replace(reg,'')
-}
+const timeLang = (e) => {
+  const val = e.target.value;
+  const reg = /[^0-9]+/g;
+  searchData.value.useTimeInputVal = val.replace(reg, "");
+};
 // ip地址限制
-const numInput = (e)=>{
-  const val = e.target.value
-  const spli = val.split('.')
-  const reg = /[^0-9.]+/g
-  searchData.value.ip = val.replace(reg,'')
+const numInput = (e) => {
+  const val = e.target.value;
+  const spli = val.split(".");
+  const reg = /[^0-9.]+/g;
+  searchData.value.ip = val.replace(reg, "");
   // if(spli[spli.length-1].length>=3&&spli.length<4){
   //   searchData.value.ip = searchData.value.ip +'.'
   // }
-}
-const searchPlan = ref({})
-const changePlan = (e)=>{
-  const nowPlan = filterPlan.value.filterList.find(el=>el.id ==e)
-  if(nowPlan){
-    emit('searchPlan',nowPlan)
-    console.log('切换方案',filterData.value,searchPlan.value);
-  }else{
-    emit('searchPlan',{})
-    clearInfo('get')
+};
+const searchPlan = ref({});
+const changePlan = (e) => {
+  const nowPlan = filterPlan.value.filterList.find((el) => el.id == e);
+  if (nowPlan) {
+    emit("searchPlan", nowPlan);
+    console.log("切换方案", filterData.value, searchPlan.value);
+  } else {
+    emit("searchPlan", {});
+    clearInfo("get");
   }
-}
+};
 // 添加答案提示
-const verifAnswer = (as)=>{
-  let errFont = ''
-  if(!as.row){
-    errFont = '请选择标签'
-  }else if(!as.row){
-    errFont = '请选择筛选规则'
+const verifAnswer = (as) => {
+  let errFont = "";
+  if (!as.row) {
+    errFont = "请选择标签";
+  } else if (!as.row) {
+    errFont = "请选择筛选规则";
   }
-  document.getElementsByClassName('scrollBox')[0].parentNode.scrollTop = 290
+  document.getElementsByClassName("scrollBox")[0].parentNode.scrollTop = 290;
   message.error(errFont);
-  return true
-}
+  return true;
+};
 // 清空
-const clearInfo = (type)=>{
-  filterPlan.value.filterListVal = '-1'
-  answerList.value = [{}]
-  answerGroupList.value = []
-  console.log('resetSearchData',resetSearchData);
-  searchData.value = JSON.parse(JSON.stringify(resetSearchData))
-  searchData.value.versions.length = 0
+const clearInfo = (type) => {
+  filterPlan.value.filterListVal = "-1";
+  answerList.value = [{}];
+  answerGroupList.value = [];
+  console.log("resetSearchData", resetSearchData);
+  searchData.value = JSON.parse(JSON.stringify(resetSearchData));
+  searchData.value.versions.length = 0;
   // 版本号
-  versions.value.map(el=>{
-    searchData.value.versions.push(el.value)
-  })
+  versions.value.map((el) => {
+    searchData.value.versions.push(el.value);
+  });
   // 发布方式
-  publish_types.value.map(el=>{
-    searchData.value.publishVal.push(el.value)
-  })
+  publish_types.value.map((el) => {
+    searchData.value.publishVal.push(el.value);
+  });
   // 作答状态
-  searchData.value.answerStatus = []
-  showData.answerStatusList.map(el=>{
-    searchData.value.answerStatus.push(el.value)
-  })
-  console.log('---------------',searchData.value);
+  searchData.value.answerStatus = [];
+  showData.answerStatusList.map((el) => {
+    searchData.value.answerStatus.push(el.value);
+  });
+  console.log("---------------", searchData.value);
   // 记录条件
-  store.dispatch('dataFilter/dataFilterInfo',{})
+  store.dispatch("dataFilter/dataFilterInfo", {});
   // 清空数据时重新默认请求
-  if(type==='get'){
-    emit('onSearch',{page:1,isFilterFlag:false})
+  if (type === "get") {
+    emit("onSearch", { page: 1, isFilterFlag: false });
   }
-}
-const clearModal = ()=>{
+};
+const clearModal = () => {
   Modal.confirm({
     title: "确认消息",
     content: "清空筛选条件后，筛选条件都将恢复默认样式",
@@ -1092,106 +1233,131 @@ const clearModal = ()=>{
     okText: "确认",
     class: "custom-modal custom-modal-title-confirm-notice",
     onOk: () => {
-      resShowFlag.value = false
-      clearInfo('get')
+      resShowFlag.value = false;
+      clearInfo("get");
     },
-    onCancel: () => {}
+    onCancel: () => {},
   });
-}
-const openModal = ()=>{
-  emit('openModal')
-}
+};
+const openModal = () => {
+  emit("openModal");
+};
 const options2 = ref([
   {
-    value: 'lucy',
-    label: 'Lucy',
+    value: "lucy",
+    label: "Lucy",
   },
 ]);
 // 默认全选
-watch(()=>versions.value,nval=>{
-  if(filterData.value?.id)return
-  searchData.value.versions.length = 0
-  for (let i = 0; i < nval.length; i++) {
-    const el = nval[i];
-    searchData.value.versions.push(el.value)
+watch(
+  () => versions.value,
+  (nval) => {
+    if (filterData.value?.id) return;
+    searchData.value.versions.length = 0;
+    for (let i = 0; i < nval.length; i++) {
+      const el = nval[i];
+      searchData.value.versions.push(el.value);
+    }
   }
-})
+);
 // 默认全选
-watch(()=>publish_types.value,nval=>{
-  if(filterData.value?.id)return
-  searchData.value.publishVal.length = 0
-  for (let i = 0; i < nval.length; i++) {
-    const el = nval[i];
-    searchData.value.publishVal.push(el.value)
+watch(
+  () => publish_types.value,
+  (nval) => {
+    if (filterData.value?.id) return;
+    searchData.value.publishVal.length = 0;
+    for (let i = 0; i < nval.length; i++) {
+      const el = nval[i];
+      searchData.value.publishVal.push(el.value);
+    }
   }
-})
+);
 // 默认全选
-watch(()=>logics.value,nval=>{
-  if(filterData.value?.id)return
-  searchData.value.logics.length = 0
-  nval.map(el=>{
-    searchData.value.logics.push(el.value)
-  })
-})
+watch(
+  () => logics.value,
+  (nval) => {
+    if (filterData.value?.id) return;
+    searchData.value.logics.length = 0;
+    nval.map((el) => {
+      searchData.value.logics.push(el.value);
+    });
+  }
+);
 // 切换方案用
-watch(()=>filterData.value,nVal=>{
-  searchData.value = getFilterData()
-  console.log('切换方案watch',searchData.value);
-})
+watch(
+  () => filterData.value,
+  (nVal) => {
+    searchData.value = getFilterData();
+    console.log("切换方案watch", searchData.value);
+  }
+);
 
-watch(()=>resShowFlag.value,nval=>{
-  console.log('resShowFlag.value',nval);
-},{
-  immediate:true
-})
-defineExpose({isOpen,getSurveysAnswers,getSurveysAnswerFilter,clearInfo,resShowFlag,changePlan,filterPlan})
+watch(
+  () => resShowFlag.value,
+  (nval) => {
+    console.log("resShowFlag.value", nval);
+  },
+  {
+    immediate: true,
+  }
+);
+defineExpose({
+  isOpen,
+  getSurveysAnswers,
+  getSurveysAnswerFilter,
+  clearInfo,
+  resShowFlag,
+  changePlan,
+  filterPlan,
+});
 </script>
 <style scoped lang='scss'>
-.newSearchContent{
+.newSearchContent {
   width: 100%;
-  background: #F5F5F5;
+  background: #f5f5f5;
   opacity: 1;
   margin-top: 24px;
   padding: 17px 32px 14px;
   border-radius: 6px;
   // min-width: 1000px;
-  .title{
+  .title {
     font-size: 14px;
     font-weight: normal;
     color: rgba(0, 0, 0, 0.85);
     display: flex;
     // justify-content: space-between;
-    .titleL{}
-    .titleM{
+    .titleL {
+    }
+    .titleM {
       margin-left: 20px;
       color: #999;
-      >i{
+      > i {
         color: #70b936;
         font-style: normal;
       }
     }
-    .titleR{
+    .titleR {
       display: flex;
       align-items: center;
       color: #70b936;
-      flex:1;
+      flex: 1;
       justify-content: flex-end;
-      .openIcon{
-        transition: all .2s ease-in-out;
+      .openIcon {
+        transition: all 0.2s ease-in-out;
       }
-      .titleRBox{
+      .titleRBox {
         cursor: pointer;
         display: inline-block;
       }
     }
-    .act{
-      .openIcon{
+    .act {
+      .openIcon {
         transform: rotate(-180deg);
       }
     }
   }
 }
-.searchBox{
+.searchBox {
   display: flex;
   justify-content: space-between;
   padding: 22px 0;
@@ -1199,295 +1365,309 @@ defineExpose({isOpen,getSurveysAnswers,getSurveysAnswerFilter,clearInfo,resShowF
   position: relative;
   overflow-x: auto;
   padding-bottom: 42px;
-  &::after{
-    content: '';
+  &::after {
+    content: "";
     position: absolute;
     top: 0;
     left: 0;
     width: 100%;
     height: 1px;
-    background: #E8E8E8;
+    background: #e8e8e8;
   }
-  .searchBoxL{
+  .searchBoxL {
     padding-bottom: 20px;
     position: relative;
     width: 100%;
-    &::after{
-      content: '';
+    &::after {
+      content: "";
       position: absolute;
       bottom: 0;
       left: 0;
       width: 100%;
       height: 1px;
-      background: #E8E8E8;
+      background: #e8e8e8;
     }
-    .filterBox{
+    .filterBox {
       display: flex;
       align-items: center;
-      &:not(:first-child){
+      color: #8c8c8c;
+      &:not(:first-child) {
         margin-top: 24px;
       }
-      .filterBoxL{
+      .filterBoxL {
         // width: 80px;
         width: 60px;
         margin-right: 20px;
         flex-shrink: 0;
       }
-      .noWidth{
+      .noWidth {
         width: initial;
         margin-right: 12px;
       }
-      .filterBoxR{
-        .filterSelect{
+      .filterBoxR {
+        &-left {
+          &::v-deep .ant-select-selector {
+            border-top-left-radius: 4px;
+            border-bottom-left-radius: 4px;
+          }
+        }
+        &-right {
+          &::v-deep .ant-select-selector {
+            border-top-right-radius: 4px;
+            border-bottom-right-radius: 4px;
+          }
+        }
+        .filterSelect {
           width: 240px;
-          &:not(:first-child){
+          &:not(:first-child) {
             margin-left: 12px;
           }
         }
-        .minSelect{
+        .minSelect {
           width: 100px;
         }
-        .filterBoxRList{
-          .filterLineBox{
+        .filterBoxRList {
+          .filterLineBox {
             // display: flex;
             align-items: center;
             max-width: 950px;
-            &:not(:first-child){
+            &:not(:first-child) {
               margin-top: 12px;
             }
           }
-          .filterGroupBox{
+          .filterGroupBox {
             width: 1000px;
             margin-top: 13px;
-            background: #E9ECF1;
+            background: #e9ecf1;
             padding: 12px 16px;
-            .filterGroupTop{
+            .filterGroupTop {
               display: flex;
               // justify-content: space-between;
               align-items: center;
-              .filterGroupTopL{
+              .filterGroupTopL {
                 // color: #8C8C8C;
-                .filterGroupSelect{
+                .filterGroupSelect {
                   width: 240px;
                   margin: 0 12px;
                 }
               }
-              .filterGroupTopR{}
+              .filterGroupTopR {
+              }
             }
-            .filterGroupBtm{
+            .filterGroupBtm {
               margin-top: 12px;
-              .filterGroupBtmList{
+              .filterGroupBtmList {
                 width: 100%;
                 // display: flex;
                 align-items: center;
-                &:not(:first-child){
+                &:not(:first-child) {
                   margin-top: 12px;
                 }
               }
             }
           }
         }
-        p{
+        p {
           margin: 0;
           margin-left: 12px;
         }
-        .addBtn{
+        .addBtn {
           display: flex;
           margin-top: 16px;
-          .addBtnLi{
+          .addBtnLi {
             cursor: pointer;
             color: #70b936;
-            &:not(:first-child){
+            &:not(:first-child) {
               margin-left: 24px;
             }
-            .addIcon{
+            .addIcon {
               margin-right: 8px;
               font-size: 14px;
             }
           }
         }
       }
-      .filterBoxDate{
-        .timePick{
+      .filterBoxDate {
+        .timePick {
           width: 370px !important;
         }
       }
     }
-    .filterBox.highBox{
+    .filterBox.highBox {
       align-items: initial;
-      .filterBoxL{
+      .filterBoxL {
         padding-top: 6px;
       }
     }
-    .lineSelect{
+    .lineSelect {
       width: 200px;
-      &:not(:first-child){
+      &:not(:first-child) {
         margin-left: 12px;
       }
     }
-    &:deep(.lineSelect){
+    &:deep(.lineSelect) {
       width: 200px;
-      &:not(:first-child){
+      &:not(:first-child) {
         margin-left: 12px;
       }
     }
-    .lineSelect.minSelect{
+    .lineSelect.minSelect {
       width: 100px;
       flex-shrink: 0;
     }
-    .lineSelect.maxSelect{
+    .lineSelect.maxSelect {
       width: 240px;
       flex-shrink: 0;
     }
   }
-  .searchBoxR{
+  .searchBoxR {
     position: absolute;
-    bottom:0;
+    bottom: 0;
     right: 0;
     width: 100%;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    .searchBtmL{
-      i{
+    .searchBtmL {
+      i {
         color: #70b936;
         font-style: normal;
       }
     }
-    .searchBtmR{}
-    .searchClean{
+    .searchBtmR {
+    }
+    .searchClean {
       margin-right: 12px;
     }
-
   }
 }
-.flexBox{
+.flexBox {
   display: flex;
   align-items: center;
 }
-.filterDelIcon{
+.filterDelIcon {
   cursor: pointer;
   color: #dadada;
   margin-left: 16px;
   font-size: 22px;
-  transition: all .3s ease-in-out;
-  &:hover{
+  transition: all 0.3s ease-in-out;
+  &:hover {
     color: #70b936;
   }
 }
-.filterDelAddIcon{
+.filterDelAddIcon {
   font-size: 18px;
   color: #bfbfbf;
-  &:hover{
+  &:hover {
     color: #434343;
   }
 }
-.filterAddIcon{
+.filterAddIcon {
   font-size: 18px;
   color: #bfbfbf;
-  &:hover{
+  &:hover {
     color: #434343;
   }
 }
-.isAllOpen{
+.isAllOpen {
   margin-top: 24px;
   color: #70b936;
-  .isAllOpenIcon{
+  .isAllOpenIcon {
     margin-left: 8px;
     transition: all 0.2s ease-in-out;
   }
 }
-.isAllOpen{
-  .act.isAllOpenBtn{
-    .isAllOpenIcon{
+.isAllOpen {
+  .act.isAllOpenBtn {
+    .isAllOpenIcon {
       transform: rotate(-180deg);
     }
   }
 }
-.isAllOpenBtn{
+.isAllOpenBtn {
   cursor: pointer;
   display: inline-block;
 }
-.allBox{
+.allBox {
   margin-top: 24px;
 }
-::v-deep .timePick{
+::v-deep .timePick {
   width: 240px;
 }
-.listSetting{
+.listSetting {
   margin-top: 24px;
-  .listSettingBtn{
+  .listSettingBtn {
     display: flex;
     justify-content: space-between;
-    .btnLeft{
+    .btnLeft {
       margin-right: 12px;
     }
-    .listSettingBtnR{
+    .listSettingBtnR {
       display: flex;
-      >.lineSelect{
+      > .lineSelect {
         width: 190px;
-        &:not(:first-child){
+        &:not(:first-child) {
           margin-left: 12px;
         }
       }
     }
   }
-  .listSettingCount{
+  .listSettingCount {
     font-size: 14px;
     font-weight: normal;
     color: #70b936;
     margin-top: 24px;
   }
 }
-.suffix-icon{
+.suffix-icon {
   position: relative;
   width: 100%;
   z-index: 2;
 }
-::v-deep .timePick{
-  .ant-time-picker-icon{
+::v-deep .timePick {
+  .ant-time-picker-icon {
     z-index: 0;
   }
 }
-::v-deep .ant-select-selection-overflow{
-  .ant-select-selection-overflow-item{
-    .ant-select-selection-item{
+::v-deep .ant-select-selection-overflow {
+  .ant-select-selection-overflow-item {
+    .ant-select-selection-item {
       margin-right: 3px;
     }
   }
 }
-.sepcialSelect{
+.sepcialSelect {
   width: 340px !important;
   align-items: center;
   display: flex;
-  >p.betweenSymbol{
-    margin: 0 4px!important;
+  > p.betweenSymbol {
+    margin: 0 4px !important;
   }
 }
-.betSpan{
+.betSpan {
   margin-left: 6px;
   margin-right: -6px;
 }
-.filerIp{
+.filerIp {
   text-align-last: justify;
 }
-:deep(.ant-select-dropdown){
-  top:35px !important;
+:deep(.ant-select-dropdown) {
+  top: 35px !important;
 }
-.manage{
+.manage {
   margin-left: 12px;
   cursor: pointer;
   color: #70b936;
 }
 
-.isModal{
-  background:transparent;
-  margin-top:0;
+.isModal {
+  background: transparent;
+  margin-top: 0;
   padding: 0;
-  .searchBox{
-    margin-top:0;
+  .searchBox {
+    margin-top: 0;
     padding: 0;
-    &:after{
+    &:after {
       height: 0;
     }
   }
diff --git a/src/views/DataAnalyse/index.vue b/src/views/DataAnalyse/index.vue
index 637f5b5e..85c5ff6f 100644
--- a/src/views/DataAnalyse/index.vue
+++ b/src/views/DataAnalyse/index.vue
@@ -150,6 +150,7 @@ export default defineComponent({
     background-color: #ffffff;
     height: calc(100vh - 146px);
     box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.1);
+    border-radius: 0px 6px 6px 6px;
   }
 }
 </style>
diff --git a/src/views/Publish/launch-center/components/shareLinks.vue b/src/views/Publish/launch-center/components/shareLinks.vue
index 36357866..4df490cb 100644
--- a/src/views/Publish/launch-center/components/shareLinks.vue
+++ b/src/views/Publish/launch-center/components/shareLinks.vue
@@ -123,7 +123,7 @@ export default {
 .link-container {
   padding: 32px 24px;
   background: #fff;
-  border-radius: 6px;
+  border-radius: 0px 6px 6px 6px;
   .title {
     font-size: 16px;
     font-weight: bold;
diff --git a/src/views/Publish/link.vue b/src/views/Publish/link.vue
index f847acd6..77f5111a 100644
--- a/src/views/Publish/link.vue
+++ b/src/views/Publish/link.vue
@@ -670,7 +670,7 @@ onMounted(() => {
   background: #fff;
   box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.1);
   height: calc(100% - 40px);
-  border-radius: 6px;
+  border-radius: 0px 6px 6px 6px;
   .title {
     font-size: 16px;
     font-weight: bold;