diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 0388f784..aceb2a63 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -2,9 +2,19 @@ import { getAction, postAction } from './manage' // 获取检索历史数据 const getSearchHistoryData = (params) => getAction('/home/lawsHomeNormalSearchHistory/page', params) // 一般检索(标题)——资源类型改变获取下面筛选项统计数据 -const getSearchParamNum = (params) => postAction('/home/lawsHomeNormalSearchData/getNormalSearchTitleCount', params) +const getSearchParamNum = (params) => getAction('/home/lawsHomeSearch/getNormalSearchTitleCount', params) +// 一般检索（标题）—— 查询 +const generalSearchTitleSearch = (params) => getAction('/home/lawsHomeSearch/getNormalSearchTitlePage', params) // 一般检索(全文)——资源类型改变获取下面筛选项统计数据 -const getSearchParamNumFullText = (params) => postAction('/home/lawsHomeSearch/getNormalSearchAllCount', params) +const getSearchParamNumFullText = (params) => getAction('/home/lawsHomeSearch/getNormalSearchAllCount', params) +// 一般检索（全文）—— 查询 +const generalSearchFullTextSearch = (params) => getAction('/home/lawsHomeSearch/getNormalSearchAllPage', params) +// 一般检索-国内标准获取展示字段 +const getDomesticStandardField = (params) => getAction('/laws/standard/domestic/getFormModel', params) +// 一般检索-国外标准获取展示字段 +const getOverseasStandardField = (params) => getAction('/laws/standard/overseas/getFormModel', params) +// 一般检索-企标获取展示字段 +const getEnterpriseStandardField = (params) => getAction('/laws/standard/enterprise/getFormModel', params) // 国内标准的高级搜索，查询搜索条件 const getDomesticStandardQuery = (params) => getAction('/laws/standard/domestic/getQueryCondition', params) @@ -23,7 +33,12 @@ const getEnterStandardList = (params) => getAction('/laws/standard/enterprise/ge export { getSearchHistoryData, getSearchParamNum, + generalSearchTitleSearch, getSearchParamNumFullText, + generalSearchFullTextSearch, + getDomesticStandardField, + getOverseasStandardField, + getEnterpriseStandardField, getDomesticStandardQuery, getOverseasStandardQuery, getEnterStandardQuery, diff --git a/src/assets/icon/iconfont.css b/src/assets/icon/iconfont.css index 6f7e0eff..cc77a193 100644 --- a/src/assets/icon/iconfont.css +++ b/src/assets/icon/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4236293 */ - src: url('iconfont.woff2?t=1698992919545') format('woff2'), - url('iconfont.woff?t=1698992919545') format('woff'), - url('iconfont.ttf?t=1698992919545') format('truetype'); + src: url('iconfont.woff2?t=1699953801277') format('woff2'), + url('iconfont.woff?t=1699953801277') format('woff'), + url('iconfont.ttf?t=1699953801277') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-Searchbar_Search_icon:before { + content: "\e64a"; +} + .icon-nav_apartment:before { content: "\e714"; } diff --git a/src/assets/icon/iconfont.js b/src/assets/icon/iconfont.js index a9c0b297..3e38def0 100644 --- a/src/assets/icon/iconfont.js +++ b/src/assets/icon/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_4236293='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,t,i,o,e,v=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_4236293,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?v(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),h()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(i=h,o=c.document,e=!1,n(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,s())})}function s(){e||(e=!0,i())}function n(){try{o.documentElement.doScroll("left")}catch(a){return void setTimeout(n,50)}s()}}(window); +window._iconfont_svg_string_4236293='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,t,i,o,e,v=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_4236293,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?v(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),h()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(i=h,o=c.document,e=!1,n(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,s())})}function s(){e||(e=!0,i())}function n(){try{o.documentElement.doScroll("left")}catch(a){return void setTimeout(n,50)}s()}}(window); diff --git a/src/assets/icon/iconfont.json b/src/assets/icon/iconfont.json index 14931f4f..60de867e 100644 --- a/src/assets/icon/iconfont.json +++ b/src/assets/icon/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "12150232", + "name": "Search bar_Search_icon", + "font_class": "Searchbar_Search_icon", + "unicode": "e64a", + "unicode_decimal": 58954 + }, { "icon_id": "16880564", "name": "nav_apartment", diff --git a/src/assets/icon/iconfont.ttf b/src/assets/icon/iconfont.ttf index f63c1e8f..98ee83bf 100644 Binary files a/src/assets/icon/iconfont.ttf and b/src/assets/icon/iconfont.ttf differ diff --git a/src/assets/icon/iconfont.woff b/src/assets/icon/iconfont.woff index 6d3f188f..12b7a1fa 100644 Binary files a/src/assets/icon/iconfont.woff and b/src/assets/icon/iconfont.woff differ diff --git a/src/assets/icon/iconfont.woff2 b/src/assets/icon/iconfont.woff2 index cbe1c922..c53f84d4 100644 Binary files a/src/assets/icon/iconfont.woff2 and b/src/assets/icon/iconfont.woff2 differ diff --git a/src/common/lang/dashboard/en.js b/src/common/lang/dashboard/en.js index 0828d056..ece5cb9a 100644 --- a/src/common/lang/dashboard/en.js +++ b/src/common/lang/dashboard/en.js @@ -7,6 +7,16 @@ module.exports = { searchHistory: '检索历史', queryCondition: 'Query Condition', retrievalMode: 'Retrieval Mode', - resourceType: 'Resource Type' + resourceType: 'Resource Type', + standardClass: 'Standard Class', + dynamicType: 'Dynamic Type', + applicableVehicleType: 'Applicable Vehicle Type', + standardType: 'Standard Type', + state: 'State', + enterpriseStandardCode: 'Enterprise Standard Code', + standardState: 'Standard State', + standardGradeClassification: 'Standard Grade Classification', + all: 'All', + releaseDate: 'Release Date' } } diff --git a/src/common/lang/dashboard/zh.js b/src/common/lang/dashboard/zh.js index 1e490f48..1f30516c 100644 --- a/src/common/lang/dashboard/zh.js +++ b/src/common/lang/dashboard/zh.js @@ -7,6 +7,16 @@ module.exports = { searchHistory: '检索历史', queryCondition: '查询条件', retrievalMode: '检索方式', - resourceType: '资源类型' + resourceType: '资源类型', + standardClass: '标准类别', + dynamicType: '动力类型', + applicableVehicleType: '适用车辆类型', + standardType: '标准类型', + state: '状态', + enterpriseStandardCode: '企业标准代号', + standardState: '标准状态', + standardGradeClassification: '标准等级分类', + all: '全部', + releaseDate: '发布日期' } } diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue index 43b6d4d7..31420fc3 100644 --- a/src/views/dashboard/search/GeneralSearch.vue +++ b/src/views/dashboard/search/GeneralSearch.vue @@ -1,9 +1,16 @@