style：ui样式

src/App.vue

@@ -81,13 +81,14 @@ div {
 
 .scrollbar {
   &::-webkit-scrollbar {
-    width: 5px;
+    width: 4px;
     height: 8px;
     background-color: #ffffff;
   }
 
   &::-webkit-scrollbar-thumb {
-    background-color: #e2e5e6;
+    background-color: #D8D8D8;
+    border-radius: 10px;
   }
 }
 @media screen and (min-width: 600px) {

src/Layouts/BaseLayout.vue

@@ -475,7 +475,7 @@ onMounted(() => {
     // width: 88px;
     height: 32px;
     line-height: 18px;
-    border-radius: 6px;
+    border-radius: 4px;
   }
   .share-button {
     margin-left: 10px;

src/font/demo_index.html

@@ -54,6 +54,36 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe80c;</span>
+                <div class="name">下拉</div>
+                <div class="code-name">&amp;#xe80c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe80d;</span>
+                <div class="name">电脑</div>
+                <div class="code-name">&amp;#xe80d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe80e;</span>
+                <div class="name">手机</div>
+                <div class="code-name">&amp;#xe80e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe80b;</span>
+                <div class="name">展开1</div>
+                <div class="code-name">&amp;#xe80b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe80a;</span>
+                <div class="name">收起</div>
+                <div class="code-name">&amp;#xe80a;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe60e;</span>
                 <div class="name">文件 (1)</div>
@@ -2922,9 +2952,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1669789588035') format('woff2'),
+  src: url('iconfont.woff2?t=1670306788389') format('woff2'),
-       url('iconfont.woff?t=1669789588035') format('woff'),
+       url('iconfont.woff?t=1670306788389') format('woff'),
-       url('iconfont.ttf?t=1669789588035') format('truetype');
+       url('iconfont.ttf?t=1670306788389') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -2950,6 +2980,51 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-xiala1"></span>
+            <div class="name">
+              下拉
+            </div>
+            <div class="code-name">.icon-xiala1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-diannao1"></span>
+            <div class="name">
+              电脑
+            </div>
+            <div class="code-name">.icon-diannao1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shouji1"></span>
+            <div class="name">
+              手机
+            </div>
+            <div class="code-name">.icon-shouji1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-zhankai11"></span>
+            <div class="name">
+              展开1
+            </div>
+            <div class="code-name">.icon-zhankai11
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shouqi3"></span>
+            <div class="name">
+              收起
+            </div>
+            <div class="code-name">.icon-shouqi3
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-a-wenjian1"></span>
             <div class="name">
@@ -7252,6 +7327,46 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiala1"></use>
+                </svg>
+                <div class="name">下拉</div>
+                <div class="code-name">#icon-xiala1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-diannao1"></use>
+                </svg>
+                <div class="name">电脑</div>
+                <div class="code-name">#icon-diannao1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shouji1"></use>
+                </svg>
+                <div class="name">手机</div>
+                <div class="code-name">#icon-shouji1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zhankai11"></use>
+                </svg>
+                <div class="name">展开1</div>
+                <div class="code-name">#icon-zhankai11</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shouqi3"></use>
+                </svg>
+                <div class="name">收起</div>
+                <div class="code-name">#icon-shouqi3</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-a-wenjian1"></use>

src/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3121635 */
-  src: url('iconfont.woff2?t=1669789588035') format('woff2'),
+  src: url('iconfont.woff2?t=1670306788389') format('woff2'),
-       url('iconfont.woff?t=1669789588035') format('woff'),
+       url('iconfont.woff?t=1670306788389') format('woff'),
-       url('iconfont.ttf?t=1669789588035') format('truetype');
+       url('iconfont.ttf?t=1670306788389') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,26 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-xiala1:before {
+  content: "\e80c";
+}
+
+.icon-diannao1:before {
+  content: "\e80d";
+}
+
+.icon-shouji1:before {
+  content: "\e80e";
+}
+
+.icon-zhankai11:before {
+  content: "\e80b";
+}
+
+.icon-shouqi3:before {
+  content: "\e80a";
+}
+
 .icon-a-wenjian1:before {
   content: "\e60e";
 }

src/font/iconfont.json

@@ -5,6 +5,41 @@
   "css_prefix_text": "icon-",
   "description": "调研猩球前台icon",
   "glyphs": [
+    {
+      "icon_id": "33251082",
+      "name": "下拉",
+      "font_class": "xiala1",
+      "unicode": "e80c",
+      "unicode_decimal": 59404
+    },
+    {
+      "icon_id": "33251122",
+      "name": "电脑",
+      "font_class": "diannao1",
+      "unicode": "e80d",
+      "unicode_decimal": 59405
+    },
+    {
+      "icon_id": "33251123",
+      "name": "手机",
+      "font_class": "shouji1",
+      "unicode": "e80e",
+      "unicode_decimal": 59406
+    },
+    {
+      "icon_id": "33174927",
+      "name": "展开1",
+      "font_class": "zhankai11",
+      "unicode": "e80b",
+      "unicode_decimal": 59403
+    },
+    {
+      "icon_id": "33170963",
+      "name": "收起",
+      "font_class": "shouqi3",
+      "unicode": "e80a",
+      "unicode_decimal": 59402
+    },
     {
       "icon_id": "33133939",
       "name": "文件 (1)",

src/views/DataAnalyse/components/diagram/newModal.vue

@@ -345,12 +345,23 @@ watch(
     if (nval) {
       console.log('exportInfo', exportInfo)
       await getSurveysHead()
-      selectAll()
+      // selectAll()
+      selectInitialize()
     } else {
       await store.dispatch('dataFilter/exportInfo', { flag: false, sn: null })
     }
   }
 )
+const selectInitialize = () => {
+  const contains_columns = formState.contains_columns
+  contains_columns.length = 0
+  console.log('answer_columns', answer_columns)
+  answer_columns.value.map((el) => {
+    if(el.value=='sn'||el.value=='publish_type'||el.value=='status'||el.value=='created_at'||el.value=='completed_at'||el.value=='use_time') {
+      contains_columns.push(el.value)
+    }
+  })
+}
 const selectAll = () => {
   const contains_columns = formState.contains_columns
   contains_columns.length = 0
@@ -582,7 +593,7 @@ const getSurveysHead = async () => {
     dataCount.value = 0
     versions.value = []
     const res = await store.dispatch('dataFilter/getSurveysHead', { sn })
-    console.log(res)
+    console.log('res.answer_columns---------------',res)
     // 版本
     versions.value = res.filters.versions
     // 发布方式
@@ -592,7 +603,7 @@ const getSurveysHead = async () => {
     // 筛选条件
     questions.value = res?.filters?.answer_questions
     // 作答信息
-    answer_columns.value = res.answer_columns[0].children
+    answer_columns.value = [...res.answer_columns[0].children,...res.answer_columns[1].children] 
   } catch (error) {
     console.error(error)
   }

src/views/DataAnalyse/index.vue

@@ -13,7 +13,7 @@
                      property="name"
                      @menuCheck="checkHandle"></left-menu-bar>
     </div>
-    <div class="right">
+    <div class="right scrollbar">
       <router-view :key="new Date().getTime()"></router-view>
     </div>
   </div>

src/views/DataAnalyse/particulars/list.vue

@@ -45,7 +45,8 @@
               <a-dropdown :trigger="['click']">
                 <a class="ant-dropdown-link" @click.prevent>
                   更多
-                  <DownOutlined />
+                  <!-- <DownOutlined /> -->
+                  <i class="icon iconfont">&#xe80c;</i>
                 </a>
                 <template #overlay>
                   <a-menu>
@@ -119,7 +120,7 @@ import DataTable from '@views/DataAnalyse/components/DataTable'
 import newDataTable from '@views/DataAnalyse/components/newDataTable'
 import { downloadFile } from '@views/DataAnalyse/composables/downloadFile'
 import search from '@/views/DataAnalyse/components/diagram/search'
-import { DownOutlined } from '@ant-design/icons-vue'
+// import { DownOutlined } from '@ant-design/icons-vue'
 import newSearch from '@/views/DataAnalyse/components/diagram/newSearch'
 import newBtnList from '@/views/DataAnalyse/components/diagram/newBtnList'
 import newModal from '@/views/DataAnalyse/components/diagram/newModal'
@@ -306,7 +307,7 @@ const getSurveysHead = async () => {
     today_answer_count.value = res.today_answer_count
     // 配置
     answer_columns.value = res.answer_columns
-    console.log('answer_columns', answer_columns.value)
+    console.log('answer_columns13123156447898978798798789798789', answer_columns.value)
     columns.value = res.columns
     // 筛选条件
     questions.value = res?.filters?.answer_questions

src/views/DataAnalyse/recycleBin/binList/detailData.vue

@@ -42,7 +42,7 @@
           <a-button class="custom-button" type="link" @click="checkInfo(record)">查看</a-button>
           <a-dropdown>
             <a class="ant-dropdown-link" style="display: inline-block" @click.prevent>
-              更多 <DownOutlined />
+              更多 <i class="icon iconfont">&#xe80c;</i>
             </a>
             <template #overlay>
               <a-menu>
@@ -87,7 +87,7 @@
 </template>
 <script>
 import { defineComponent, ref, onMounted, computed, toRefs, reactive, watch } from "vue";
-import { DownOutlined } from "@ant-design/icons-vue";
+// import { DownOutlined } from "@ant-design/icons-vue";
 import { useRoute } from "vue-router";
 import { message, Modal } from "ant-design-vue";
 import { getRecycles, editRecycles, deleteRecycles } from "@/api/recycleBin";
@@ -136,7 +136,7 @@ const actions = [
 
 export default defineComponent({
   components: {
-    DownOutlined,
+    // DownOutlined,
     QsDetail,
   },
   props: {},

src/views/DownloadCenter/TableList.vue

@@ -273,7 +273,7 @@ export default defineComponent({
 .status-text {
   font-size: 14px;
   display: flex;
-  justify-content: center;
+  // justify-content: center;
   align-items: center;
   &::before {
     content: "";

src/views/ProjectManage/fragment/TableList.vue

@@ -64,7 +64,8 @@
             @click.prevent
           >
             更多
-            <DownOutlined />
+            <!-- <DownOutlined /> -->
+            <i class="icon iconfont">&#xe80c;</i>
           </a>
           <template #overlay>
             <SurveyAction
@@ -267,7 +268,7 @@ import {
   onBeforeUnmount,
   computed,
 } from "vue";
-import { DownOutlined } from "@ant-design/icons-vue";
+// import { DownOutlined } from "@ant-design/icons-vue";
 import { useStore } from "vuex";
 
 import { getSurveyList, getSurveySorts } from "../api.js";
@@ -362,7 +363,7 @@ export default defineComponent({
     Search,
     CreateSurvey,
     CreateWord,
-    DownOutlined,
+    // DownOutlined,
     SurveyAction,
     MoveGroup,
     editLabel,
@@ -740,7 +741,7 @@ export default defineComponent({
       onCreate,
       onWord,
       wordVisible,
-      DownOutlined,
+      // DownOutlined,
       columns,
       visible,
       visibleMove,

src/views/TempMarket/fragment/TableList.vue

@@ -70,7 +70,8 @@
             @click.prevent
           >
             更多
-            <DownOutlined />
+            <!-- <DownOutlined /> -->
+            <i class="icon iconfont">&#xe80c;</i>
           </a>
           <template #overlay v-if="record.type === 1">
             <a-menu>
@@ -181,7 +182,7 @@ import {
   getCurrentInstance,
 } from "vue";
 import { useRouter } from "vue-router";
-import { DownOutlined } from "@ant-design/icons-vue";
+// import { DownOutlined } from "@ant-design/icons-vue";
 
 import { delTemplate, getTemplateList } from "@/api/template-market";
 import { getSurveySorts } from "@/views/ProjectManage/api.js";
@@ -240,7 +241,7 @@ export default defineComponent({
   name: "TableList",
   components: {
     Search,
-    DownOutlined,
+    // DownOutlined,
     MoveGroup,
     editLabel,
     ReName,
@@ -579,7 +580,7 @@ export default defineComponent({
       actionClick,
       update,
       onCreate,
-      DownOutlined,
+      // DownOutlined,
       columns,
       visible,
       visibleMove,

src/views/planetDesign/Theme/components/MobileButton/index.vue

@@ -24,7 +24,7 @@ const emit = defineEmits(["mobile"]);
 
 const mobileList = reactive([
   { name: '手机', icon: '', type: 'mobile', class: 'mo-phone' },
-  { name: '电脑', icon: '', type: 'pc', class: 'mo-computer' }
+  { name: '电脑', icon: '', type: 'pc', class: 'mo-computer' }
 ])
 const handlerChange = (e) => {
   emit('mobile', e)
@@ -40,6 +40,8 @@ const handlerChange = (e) => {
   width: 100px;
   height: 40px;
   background: #ffffff;
+  display: flex;
+  justify-content: center;
   text-align: center;
   line-height: 37px;
   cursor: pointer;
@@ -49,6 +51,9 @@ const handlerChange = (e) => {
 }
 .mo-computer{
   border-radius: 0px 4px 4px 0px;
+  i {
+    font-size: 22px;
+  }
 }
 .mobile {
   opacity: 0.5;

src/views/planetDesign/Theme/components/ThemeExample/index.vue

@@ -81,11 +81,12 @@ const isMobile = ref('pc')
   display: none;
 }
 .theme-example-bg::-webkit-scrollbar {
-  width: 6px;
+  width: 4px;
-  background-color: #ddd;
+  background-color: #ffffff;
 }
 .theme-example-bg::-webkit-scrollbar-thumb {
-  background-color: #a5b1c6;
+  background-color: #D8D8D8;
+  border-radius: 10px;
 }
 .theme-mobile {
   height: 100%;

src/views/planetDesign/Theme/components/ThemeLeft/index.vue

@@ -44,18 +44,19 @@ const choiceSkin = (e) => {
 
 <style lang="scss" scoped>
 .theme-left::-webkit-scrollbar {
-  width: 6px;
+  width: 4px;
-  background-color: #ddd;
+  background-color: #ffffff;
 }
 .theme-left::-webkit-scrollbar-thumb {
-  background-color: #a5b1c6;
+  background-color: #D8D8D8;
+  border-radius: 10px;
 }
 
 .theme-left {
   float: left;
   width: 290px;
   height: 100%;
-  box-shadow: 0px 0px 6px 1px rgb(0 0 0 / 10%);
+  // box-shadow: 0px 0px 6px 1px rgb(0 0 0 / 10%);
   overflow-x: hidden;
   overflow-y: auto;
   .header {

src/views/planetDesign/Theme/components/ThemeRight/index.vue

@@ -285,11 +285,12 @@ const editButtonText = (item) => {
 
 <style lang="scss" scoped>
 .theme-right::-webkit-scrollbar {
-  width: 6px;
+  width: 4px;
-  background-color: #ddd;
+  background-color: #ffffff;
 }
 .theme-right::-webkit-scrollbar-thumb {
-  background-color: #a5b1c6;
+  background-color: #D8D8D8;
+  border-radius: 10px;
 }
 .theme-right {
   float: right;
@@ -339,17 +340,18 @@ const editButtonText = (item) => {
       width: 220px;
       height: 1px;
       background: #f5f5f5;
-      margin: 0 15px 14px 15px;
+      // margin: 0 15px 14px 15px;
+      margin: 0 15px;
     }
     .show {
       font-size: 14px;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
       color: #434343;
-      padding: 32px 20px 10px 10px;
+      padding: 32px 20px 10px;
     }
     .checkbox-group {
-      margin-left: 10px;
+      margin-left: 20px;
     }
     .checkbox {
       margin-bottom: 10px;

src/views/planetDesign/redpacket/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="answer-setting">
+  <div class="answer-setting scrollbar">
     <div class="section">
       <div class="section-title">我的抽奖</div>
       <div style="width:100%;text-align:right;display:flex;justify-content:end;">
@@ -815,7 +815,7 @@ export default defineComponent({
   padding: 24px 44px 60px;
   border-radius: 6px;
   background: #ffffff;
-  box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.1);
+  // box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.1);
   &:last-child {
     margin-bottom: 0;
   }