diff --git a/src/App.vue b/src/App.vue
index 9d4dd1bf..19723018 100644
--- a/src/App.vue
+++ b/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) {
diff --git a/src/Layouts/BaseLayout.vue b/src/Layouts/BaseLayout.vue
index 41ce5e16..6ccf08ae 100644
--- a/src/Layouts/BaseLayout.vue
+++ b/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;
diff --git a/src/font/demo_index.html b/src/font/demo_index.html
index fa054356..5ac11e47 100644
--- a/src/font/demo_index.html
+++ b/src/font/demo_index.html
@@ -54,6 +54,36 @@
+ -
+
+
下拉
+ 
+
+
+ -
+
+
电脑
+ 
+
+
+ -
+
+
手机
+ 
+
+
+ -
+
+
展开1
+ 
+
+
+ -
+
+
收起
+ 
+
+
-
文件 (1)
@@ -2922,9 +2952,9 @@
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1669789588035') format('woff2'),
- url('iconfont.woff?t=1669789588035') format('woff'),
- url('iconfont.ttf?t=1669789588035') format('truetype');
+ src: url('iconfont.woff2?t=1670306788389') format('woff2'),
+ url('iconfont.woff?t=1670306788389') format('woff'),
+ url('iconfont.ttf?t=1670306788389') format('truetype');
}
第二步:定义使用 iconfont 的样式
@@ -2950,6 +2980,51 @@
+ -
+
+
+ 下拉
+
+ .icon-xiala1
+
+
+
+ -
+
+
+ 电脑
+
+ .icon-diannao1
+
+
+
+ -
+
+
+ 手机
+
+ .icon-shouji1
+
+
+
+ -
+
+
+ 展开1
+
+ .icon-zhankai11
+
+
+
+ -
+
+
+ 收起
+
+ .icon-shouqi3
+
+
+
-
@@ -7252,6 +7327,46 @@
+ -
+
+
下拉
+ #icon-xiala1
+
+
+ -
+
+
电脑
+ #icon-diannao1
+
+
+ -
+
+
手机
+ #icon-shouji1
+
+
+ -
+
+
展开1
+ #icon-zhankai11
+
+
+ -
+
+
收起
+ #icon-shouqi3
+
+
-
-
diff --git a/src/views/DataAnalyse/particulars/list.vue b/src/views/DataAnalyse/particulars/list.vue
index d26f629e..15839a4b 100644
--- a/src/views/DataAnalyse/particulars/list.vue
+++ b/src/views/DataAnalyse/particulars/list.vue
@@ -45,7 +45,8 @@
更多
-
+
+
@@ -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
diff --git a/src/views/DataAnalyse/recycleBin/binList/detailData.vue b/src/views/DataAnalyse/recycleBin/binList/detailData.vue
index 41fe1f55..e3280a5b 100644
--- a/src/views/DataAnalyse/recycleBin/binList/detailData.vue
+++ b/src/views/DataAnalyse/recycleBin/binList/detailData.vue
@@ -42,7 +42,7 @@
查看
- 更多
+ 更多
@@ -87,7 +87,7 @@