Skip to content

dev / trimble-admin-pro

Go to a project
Toggle navigation
Toggle navigation pinning
e6c114c6 by chenyunhao
Options

修复问题

1 parent 27abcbec
Inline Side-by-side
Showing 10 changed files with 60 additions and 46 deletions
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1668413447292" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1970" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M303.995259 384l88.727704-51.693037 87.267556 51.693037V159.990519h256v704.018962H267.851852a75.851852 75.851852 0 0 1-75.851852-75.851851V235.823407a75.851852 75.851852 0 0 1 75.851852-75.851851h36.143407V384z" fill="#ffffff" p-id="1971"></path><path d="M736.009481 160.009481h20.138667a75.851852 75.851852 0 0 1 75.851852 75.851852v552.277334a75.851852 75.851852 0 0 1-75.851852 75.851852h-20.157629V160.009481z" fill="#ffffff" fill-opacity=".5" p-id="1972"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1668413650569" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4960" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M876 161.5H396c-6.6 0-12 5.4-12 12v159.4h365.1c6.6 0 12 5.4 12 12V491H876c6.6 0 12-5.4 12-12V173.5c0-6.6-5.4-12-12-12z" fill="#ffffff" p-id="4961"></path><path d="M438.9 408.5c-45.4 0-82.3 36.9-82.3 82.3 0 14.8 12 26.7 26.7 26.7 14.8 0 26.7-12 26.7-26.7 0-15.9 12.9-28.8 28.8-28.8s28.8 12.9 28.8 28.8-12.9 28.8-28.8 28.8c-14.8 0-26.7 12-26.7 26.7v36.6c0 14.8 12 26.7 26.7 26.7 14.8 0 26.7-12 26.7-26.7v-14.4c32.3-11.1 55.5-41.8 55.5-77.8 0.1-45.3-36.8-82.2-82.1-82.2z m-27.3 248.3c0 15 12.2 27.2 27.2 27.2s27.2-12.2 27.2-27.2-12.2-27.2-27.2-27.2c-15-0.1-27.2 12.1-27.2 27.2z m0 0" fill="#ffffff" p-id="4962"></path><path d="M841.2 515.8c-12.4 0-22.5-10.1-22.5-22.5s10.1-22.5 22.5-22.5c20.7 0 37.5-16.8 37.5-37.5V208.5c0-20.7-16.8-37.5-37.5-37.5H440.3c-20.7 0-37.5 16.8-37.5 37.5V256c0 12.4-10.1 22.5-22.5 22.5s-22.5-10.1-22.5-22.5v-47.4c0-45.5 37-82.5 82.5-82.5h400.8c45.5 0 82.5 37 82.5 82.5v224.8c0.1 45.4-36.9 82.4-82.4 82.4z" fill="#ffffff" p-id="4963"></path><path d="M708.1 307.5H187.7c-45.5 0-82.5 37-82.5 82.5v304c0 45.5 37 82.5 82.5 82.5h81.6l0.1 42.2c0.1 34.4 16.7 46.6 26.5 50.8 3.7 1.6 8.8 3 15.1 3 10.6 0 24.4-4.2 40-19.1l80.7-77h276.4c45.5 0 82.5-37 82.5-82.5V390c0-45.5-37-82.5-82.5-82.5zM745.6 694c0 20.7-16.8 37.5-37.5 37.5H413.8L320 821c-1.9 1.9-3.7 3.2-5.1 4.2-0.3-1.7-0.4-3.9-0.5-6.6l-0.2-87.1H187.7c-20.7 0-37.5-16.8-37.5-37.5V390c0-20.7 16.8-37.5 37.5-37.5h520.4c20.7 0 37.5 16.8 37.5 37.5v304z" fill="#ffffff" p-id="4964"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1668413469482" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3223" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M426.666667 426.666667H384V298.666667h298.666667v128h-256z m0-42.666667h213.333333V341.333333h-213.333333v42.666667zM256 170.666667h554.666667v682.666666H256V170.666667z m42.666667 42.666666v597.333334h469.333333V213.333333H298.666667z m85.333333 298.666667h42.666667v42.666667H384v-42.666667z m128 0h42.666667v42.666667h-42.666667v-42.666667z m128 0h42.666667v42.666667h-42.666667v-42.666667z m-256 85.333333h42.666667v42.666667H384v-42.666667z m128 0h42.666667v42.666667h-42.666667v-42.666667z m-128 85.333334h42.666667v42.666666H384v-42.666666z m128 0h42.666667v42.666666h-42.666667v-42.666666z m128-85.333334h42.666667v128h-42.666667v-128zM256 170.666667h554.666667v42.666666H256V170.666667z" fill="#ffffff" p-id="3224"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1668413625663" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4320" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M334.933333 217.6c-12.8 0-23.466667-6.4-27.733333-17.066667L249.6 85.333333c-8.533333-14.933333-2.133333-34.133333 14.933333-42.666666 14.933333-8.533333 34.133333-2.133333 42.666667 14.933333l57.6 115.2c8.533333 14.933333 2.133333 34.133333-14.933333 42.666667-4.266667 2.133333-8.533333 2.133333-14.933334 2.133333zM708.266667 209.066667c-4.266667 0-10.666667-2.133333-14.933334-4.266667-14.933333-8.533333-21.333333-27.733333-14.933333-42.666667l57.6-115.2c8.533333-14.933333 27.733333-21.333333 42.666667-14.933333 14.933333 8.533333 21.333333 27.733333 14.933333 42.666667L736 192c-4.266667 10.666667-17.066667 17.066667-27.733333 17.066667z" fill="#ffffff" p-id="4321"></path><path d="M955.733333 217.6H83.2c-17.066667 0-32-14.933333-32-32s14.933333-32 32-32h872.533333c17.066667 0 32 14.933333 32 32s-12.8 32-32 32z" fill="#ffffff" p-id="4322"></path><path d="M763.733333 746.666667H288c-61.866667 0-113.066667-51.2-113.066667-113.066667V200.533333c0-17.066667 14.933333-32 32-32s32 14.933333 32 32v433.066667c0 27.733333 21.333333 49.066667 49.066667 49.066667h477.866667c27.733333 0 49.066667-21.333333 49.066666-49.066667v-448c0-17.066667 14.933333-32 32-32s32 14.933333 32 32v448c0 61.866667-51.2 113.066667-115.2 113.066667z" fill="#ffffff" p-id="4323"></path><path d="M836.266667 347.733333H221.866667c-17.066667 0-32-14.933333-32-32s14.933333-32 32-32h614.4c17.066667 0 32 14.933333 32 32s-14.933333 32-32 32z" fill="#ffffff" p-id="4324"></path><path d="M497.066667 582.4c-17.066667 0-36.266667-8.533333-46.933334-21.333333l-34.133333-38.4c-10.666667-12.8-10.666667-34.133333 2.133333-44.8s34.133333-10.666667 44.8 2.133333l34.133334 38.4 153.6-87.466667c14.933333-8.533333 34.133333-4.266667 42.666666 12.8 8.533333 14.933333 4.266667 34.133333-12.8 42.666667L526.933333 576c-10.666667 4.266667-21.333333 6.4-29.866666 6.4z" fill="#ffffff" p-id="4325"></path><path d="M307.2 977.066667c-4.266667 0-8.533333 0-12.8-2.133334-17.066667-6.4-23.466667-25.6-17.066667-42.666666l89.6-224c6.4-17.066667 25.6-23.466667 42.666667-17.066667 17.066667 6.4 23.466667 25.6 17.066667 42.666667l-89.6 224c-4.266667 10.666667-17.066667 19.2-29.866667 19.2zM725.333333 994.133333c-12.8 0-25.6-8.533333-29.866666-19.2l-89.6-224c-6.4-17.066667 2.133333-34.133333 17.066666-42.666666 17.066667-6.4 34.133333 2.133333 42.666667 17.066666l89.6 224c6.4 17.066667-2.133333 34.133333-17.066667 42.666667-4.266667 2.133333-8.533333 2.133333-12.8 2.133333z" fill="#ffffff" p-id="4326"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
...@@ -64,7 +64,7 @@ export const constantRouterMap = [{ ...@@ -64,7 +64,7 @@ export const constantRouterMap = [{
64 name: 'dictionary', 64 name: 'dictionary',
65 meta: { 65 meta: {
66 title: '天宝宝典', 66 title: '天宝宝典',
67 icon: 'nested' 67 icon: 'bd'
68 }, 68 },
69 children: [{ 69 children: [{
70 path: '/dictionary/reservation', 70 path: '/dictionary/reservation',
...@@ -112,7 +112,7 @@ export const constantRouterMap = [{ ...@@ -112,7 +112,7 @@ export const constantRouterMap = [{
112 name: 'dictionary', 112 name: 'dictionary',
113 meta: { 113 meta: {
114 title: '天宝计算器', 114 title: '天宝计算器',
115 icon: 'nested' 115 icon: 'jsq'
116 }, 116 },
117 children: [{ 117 children: [{
118 path: '/calculator/pvpage', 118 path: '/calculator/pvpage',
...@@ -156,7 +156,7 @@ export const constantRouterMap = [{ ...@@ -156,7 +156,7 @@ export const constantRouterMap = [{
156 name: 'live', 156 name: 'live',
157 meta: { 157 meta: {
158 title: '教育教学', 158 title: '教育教学',
159 icon: 'nested' 159 icon: 'jx'
160 }, 160 },
161 children: [{ 161 children: [{
162 path: '/edu/live', 162 path: '/edu/live',
...@@ -260,14 +260,22 @@ export const constantRouterMap = [{ ...@@ -260,14 +260,22 @@ export const constantRouterMap = [{
260 name: 'artice', 260 name: 'artice',
261 meta: { 261 meta: {
262 title: '常见问题答疑', 262 title: '常见问题答疑',
263 icon: 'nested' 263 icon: 'dy'
264 }, 264 },
265 children: [{ 265 children: [{
266 path: '/artice/classify',
267 name: 'articeClassify',
268 component: () => import('@/views/Q&A/classify/list'),
269 meta: {
270 title: '常见问题分类',
271 icon: ''
272 }
273 }, {
266 path: '/artice/list', 274 path: '/artice/list',
267 name: 'articleList', 275 name: 'articleList',
268 component: () => import('@/views/Q&A/article/list'), 276 component: () => import('@/views/Q&A/article/list'),
269 meta: { 277 meta: {
270 title: '文章列表', 278 title: '常见问题列表',
271 icon: '' 279 icon: ''
272 } 280 }
273 }, 281 },
...@@ -276,30 +284,12 @@ export const constantRouterMap = [{ ...@@ -276,30 +284,12 @@ export const constantRouterMap = [{
276 name: 'articleDetail', 284 name: 'articleDetail',
277 component: () => import('@/views/Q&A/article/detail'), 285 component: () => import('@/views/Q&A/article/detail'),
278 meta: { 286 meta: {
279 title: '设置文章', 287 title: '设置常见问题',
280 icon: '' 288 icon: ''
281 }, 289 },
282 hidden: true 290 hidden: true
283 }, 291 },
284 { 292 {
285 path: '/report/article',
286 name: 'reportArticle',
287 component: () => import('@/views/Q&A/report/article'),
288 meta: {
289 title: '文章统计',
290 icon: ''
291 }
292 },
293 {
294 path: '/artice/classify',
295 name: 'articeClassify',
296 component: () => import('@/views/Q&A/classify/list'),
297 meta: {
298 title: '文章分类',
299 icon: ''
300 }
301 },
302 {
303 path: '/artice/classify/detail', 293 path: '/artice/classify/detail',
304 name: 'articeClassifyDetail', 294 name: 'articeClassifyDetail',
305 component: () => import('@/views/Q&A/classify/detail'), 295 component: () => import('@/views/Q&A/classify/detail'),
...@@ -310,20 +300,11 @@ export const constantRouterMap = [{ ...@@ -310,20 +300,11 @@ export const constantRouterMap = [{
310 hidden: true 300 hidden: true
311 }, 301 },
312 { 302 {
313 path: '/report/classify',
314 name: 'reportClassify',
315 component: () => import('@/views/Q&A/report/classify'),
316 meta: {
317 title: '分类统计',
318 icon: ''
319 }
320 },
321 {
322 path: '/keyword/list', 303 path: '/keyword/list',
323 name: 'keywordList', 304 name: 'keywordList',
324 component: () => import('@/views/Q&A/keyword/list'), 305 component: () => import('@/views/Q&A/keyword/list'),
325 meta: { 306 meta: {
326 title: '关键词', 307 title: '搜索热词',
327 icon: '' 308 icon: ''
328 } 309 }
329 }, 310 },
...@@ -332,17 +313,26 @@ export const constantRouterMap = [{ ...@@ -332,17 +313,26 @@ export const constantRouterMap = [{
332 name: 'keywordDetail', 313 name: 'keywordDetail',
333 component: () => import('@/views/Q&A/keyword/detail'), 314 component: () => import('@/views/Q&A/keyword/detail'),
334 meta: { 315 meta: {
335 title: '设置关键词', 316 title: '设置搜索热词',
336 icon: '' 317 icon: ''
337 }, 318 },
338 hidden: true 319 hidden: true
339 }, 320 },
340 { 321 {
322 path: '/report/article',
323 name: 'reportArticle',
324 component: () => import('@/views/Q&A/report/article'),
325 meta: {
326 title: '常见问题统计',
327 icon: ''
328 }
329 },
330 {
341 path: '/report/keyword', 331 path: '/report/keyword',
342 name: 'reportKeyword', 332 name: 'reportKeyword',
343 component: () => import('@/views/Q&A/report/keyword'), 333 component: () => import('@/views/Q&A/report/keyword'),
344 meta: { 334 meta: {
345 title: '关键词统计', 335 title: '搜索热词统计',
346 icon: '' 336 icon: ''
347 } 337 }
348 }, 338 },
......
...@@ -106,3 +106,4 @@ a:hover { ...@@ -106,3 +106,4 @@ a:hover {
106 .maxItem { 106 .maxItem {
107 width: 100%; 107 width: 100%;
108 } 108 }
109
......
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
49 } 49 }
50 50
51 .svg-icon { 51 .svg-icon {
52 margin-right: 16px; 52 font-size: 20px;
53 margin-right: 10px;
53 } 54 }
54 55
55 .el-menu { 56 .el-menu {
...@@ -61,6 +62,8 @@ ...@@ -61,6 +62,8 @@
61 // menu hover 62 // menu hover
62 .submenu-title-noDropdown, 63 .submenu-title-noDropdown,
63 .el-submenu__title { 64 .el-submenu__title {
65 display: flex;
66 align-items: center;
64 &:hover { 67 &:hover {
65 background-color: $menuHover !important; 68 background-color: $menuHover !important;
66 } 69 }
...@@ -100,6 +103,7 @@ ...@@ -100,6 +103,7 @@
100 103
101 .el-tooltip { 104 .el-tooltip {
102 padding: 0 !important; 105 padding: 0 !important;
106
103 .svg-icon { 107 .svg-icon {
104 margin-left: 20px; 108 margin-left: 20px;
105 } 109 }
...@@ -111,6 +115,7 @@ ...@@ -111,6 +115,7 @@
111 115
112 &>.el-submenu__title { 116 &>.el-submenu__title {
113 padding: 0 !important; 117 padding: 0 !important;
118
114 .svg-icon { 119 .svg-icon {
115 margin-left: 20px; 120 margin-left: 20px;
116 } 121 }
......
...@@ -37,7 +37,17 @@ ...@@ -37,7 +37,17 @@
37 prop="articleTitle" 37 prop="articleTitle"
38 min-width="200" 38 min-width="200"
39 ></el-table-column> 39 ></el-table-column>
40 <el-table-column label="排序值" prop="orderId" min-width="100"></el-table-column> 40
41 <el-table-column>
42 <template slot="header" slot-scope="scope">
43 排序值
44 <el-tooltip effect="dark" content="值越大排序越前" placement="top">
45 <i :data="scope" class="el-icon-question" style="cursor: pointer;"></i>
46 </el-tooltip>
47 </template>
48 <template slot-scope="scope">{{scope.row.orderId}}</template>
49 </el-table-column>
50
41 <el-table-column :show-overflow-tooltip="false" label="浏览次数" prop="viewNumber" width="130"></el-table-column> 51 <el-table-column :show-overflow-tooltip="false" label="浏览次数" prop="viewNumber" width="130"></el-table-column>
42 <el-table-column label="状态"> 52 <el-table-column label="状态">
43 <template slot-scope="scope"> 53 <template slot-scope="scope">
......
...@@ -43,7 +43,17 @@ ...@@ -43,7 +43,17 @@
43 >下线</el-tag> 43 >下线</el-tag>
44 </template> 44 </template>
45 </el-table-column> 45 </el-table-column>
46 <el-table-column label="排序" prop="orderId"></el-table-column> 46
47 <el-table-column>
48 <template slot="header" slot-scope="scope">
49 排序值
50 <el-tooltip effect="dark" content="值越大排序越前" placement="top">
51 <i :data="scope" class="el-icon-question" style="cursor: pointer;"></i>
52 </el-tooltip>
53 </template>
54 <template slot-scope="scope">{{scope.row.orderId}}</template>
55 </el-table-column>
56
47 <el-table-column label="操作"> 57 <el-table-column label="操作">
48 <template slot-scope="scope"> 58 <template slot-scope="scope">
49 <el-button type="text" @click="handleShowEdit(scope.row)">编辑</el-button> 59 <el-button type="text" @click="handleShowEdit(scope.row)">编辑</el-button>
......
...@@ -37,10 +37,6 @@ ...@@ -37,10 +37,6 @@
37 <label>浏览人数</label> 37 <label>浏览人数</label>
38 <h5>{{dashboardInfo.viewPerson}}</h5> 38 <h5>{{dashboardInfo.viewPerson}}</h5>
39 </div> 39 </div>
40 <div class="item">
41 <label>分享次数</label>
42 <h5>{{dashboardInfo.shareNumber}}</h5>
43 </div>
44 </div> 40 </div>
45 </div> 41 </div>
46 42
...@@ -53,11 +49,9 @@ ...@@ -53,11 +49,9 @@
53 min-width="300" 49 min-width="300"
54 :show-overflow-tooltip="true" 50 :show-overflow-tooltip="true"
55 ></el-table-column> 51 ></el-table-column>
56 <el-table-column label="分类" prop="classifyName"></el-table-column> 52 <!-- <el-table-column label="分类" prop="classifyName"></el-table-column> -->
57 <el-table-column label="标签" prop="tagName"></el-table-column>
58 <el-table-column label="浏览次数" prop="viewNumber"></el-table-column> 53 <el-table-column label="浏览次数" prop="viewNumber"></el-table-column>
59 <el-table-column label="浏览人数" prop="viewPerson"></el-table-column> 54 <el-table-column label="浏览人数" prop="viewPerson"></el-table-column>
60 <el-table-column label="分享次数" prop="shareNumber"></el-table-column>
61 </el-table> 55 </el-table>
62 </el-container> 56 </el-container>
63 <!-- 分页 --> 57 <!-- 分页 -->
......