From 9e2449bfe448fe23cc370a664cc54c1884b33f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com> Date: Fri, 22 Oct 2021 14:49:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E7=9F=A5=E5=85=AC?= =?UTF-8?q?=E5=91=8A=E4=B8=BA=E5=85=AC=E7=A4=BA=E5=85=AC=E5=91=8A=EF=BC=8C?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E9=9C=80=E6=B1=82=E4=B8=BA=E4=BA=A7=E4=B8=9A?= =?UTF-8?q?=E9=9C=80=E6=B1=82=EF=BC=8C=E5=8F=8A=E4=BA=A7=E4=B8=9A=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=88=97=E8=A1=A8=E5=B8=83=E5=B1=80=E5=92=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=B7=E6=A0=BC=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C?= =?UTF-8?q?(=E5=B8=A6=E5=8D=95=E4=BD=8D)=EF=BC=8C=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E4=B8=8B=E7=9A=84=E6=96=87=E5=AD=97=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/home/demand.js | 2 +- src/api/home/notice.js | 4 +- src/api/search.js | 2 +- src/router/index.js | 4 +- src/utils/index.js | 270 +++++++++++++++----------- src/views/about.vue | 6 +- src/views/components/footer/index.vue | 4 +- src/views/components/header/index.vue | 4 +- src/views/home/demand.vue | 101 ++++++---- src/views/home/home.vue | 2 +- src/views/home/notice.vue | 2 +- src/views/index copy.vue | 4 +- src/views/index.vue | 4 +- src/views/portrait.vue | 2 +- src/views/result.vue | 16 +- src/views/search.vue | 2 +- 16 files changed, 249 insertions(+), 180 deletions(-) diff --git a/src/api/home/demand.js b/src/api/home/demand.js index 0c93c72..2a5fa7b 100644 --- a/src/api/home/demand.js +++ b/src/api/home/demand.js @@ -1,6 +1,6 @@ import request from '@/utils/request'; -// 获取企业需求列表 +// 获取产业需求列表 export function getEnterpriseNeedList(params) { return request({ // url: '/enterprise/getEnterpriseNeedList', diff --git a/src/api/home/notice.js b/src/api/home/notice.js index b074370..dea1b19 100644 --- a/src/api/home/notice.js +++ b/src/api/home/notice.js @@ -7,14 +7,14 @@ export function getDictListByStatus(params) { params }); } -// 通知公告标签 +// 公示公告标签 export function getLabel(params) { return request({ url: '/mPolicy/getLabel', params }); } -// 获取通知公告列表 +// 获取公示公告列表 export function getPolicyList(data) { const params = { pageNum: data.pageNum, diff --git a/src/api/search.js b/src/api/search.js index b227074..debea8a 100644 --- a/src/api/search.js +++ b/src/api/search.js @@ -45,7 +45,7 @@ export function getInfo(params) { params }); } -// 获取企业需求数据回显 +// 获取产业需求数据回显 export function getInfo2(params) { return request({ // url: '/enterprise/getInfo', diff --git a/src/router/index.js b/src/router/index.js index 0fd3385..f52147c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -39,13 +39,13 @@ export const constantRoutes = [ path: 'notice', component: resolve => require(['@/views/home/notice'], resolve), name: 'notice', - meta: { title: '通知公告' } + meta: { title: '公示公告' } }, { path: 'demand', component: resolve => require(['@/views/home/demand'], resolve), name: 'demand', - meta: { title: '企业需求' } + meta: { title: '产业需求' } }, { path: 'achievements', diff --git a/src/utils/index.js b/src/utils/index.js index 918580f..efa42c2 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,18 +1,25 @@ -import { parseTime } from './ruoyi' +import { parseTime } from './ruoyi'; /** * 表格时间格式化 */ export function formatDate(cellValue) { - if (cellValue == null || cellValue == "") return ""; - var date = new Date(cellValue) - var year = date.getFullYear() - var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 - var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() - var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() - var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() - var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() - return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds + if (cellValue == null || cellValue == '') return ''; + var date = new Date(cellValue); + var year = date.getFullYear(); + var month = + date.getMonth() + 1 < 10 + ? '0' + (date.getMonth() + 1) + : date.getMonth() + 1; + var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate(); + var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours(); + var minutes = + date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes(); + var seconds = + date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds(); + return ( + year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds + ); } /** @@ -22,27 +29,27 @@ export function formatDate(cellValue) { */ export function formatTime(time, option) { if (('' + time).length === 10) { - time = parseInt(time) * 1000 + time = parseInt(time) * 1000; } else { - time = +time + time = +time; } - const d = new Date(time) - const now = Date.now() + const d = new Date(time); + const now = Date.now(); - const diff = (now - d) / 1000 + const diff = (now - d) / 1000; if (diff < 30) { - return '刚刚' + return '刚刚'; } else if (diff < 3600) { // less 1 hour - return Math.ceil(diff / 60) + '分钟前' + return Math.ceil(diff / 60) + '分钟前'; } else if (diff < 3600 * 24) { - return Math.ceil(diff / 3600) + '小时前' + return Math.ceil(diff / 3600) + '小时前'; } else if (diff < 3600 * 24 * 2) { - return '1天前' + return '1天前'; } if (option) { - return parseTime(time, option) + return parseTime(time, option); } else { return ( d.getMonth() + @@ -54,7 +61,7 @@ export function formatTime(time, option) { '时' + d.getMinutes() + '分' - ) + ); } } @@ -63,18 +70,18 @@ export function formatTime(time, option) { * @returns {Object} */ export function getQueryObject(url) { - url = url == null ? window.location.href : url - const search = url.substring(url.lastIndexOf('?') + 1) - const obj = {} - const reg = /([^?&=]+)=([^?&=]*)/g + url = url == null ? window.location.href : url; + const search = url.substring(url.lastIndexOf('?') + 1); + const obj = {}; + const reg = /([^?&=]+)=([^?&=]*)/g; search.replace(reg, (rs, $1, $2) => { - const name = decodeURIComponent($1) - let val = decodeURIComponent($2) - val = String(val) - obj[name] = val - return rs - }) - return obj + const name = decodeURIComponent($1); + let val = decodeURIComponent($2); + val = String(val); + obj[name] = val; + return rs; + }); + return obj; } /** @@ -83,14 +90,14 @@ export function getQueryObject(url) { */ export function byteLength(str) { // returns the byte length of an utf8 string - let s = str.length + let s = str.length; for (var i = str.length - 1; i >= 0; i--) { - const code = str.charCodeAt(i) - if (code > 0x7f && code <= 0x7ff) s++ - else if (code > 0x7ff && code <= 0xffff) s += 2 - if (code >= 0xDC00 && code <= 0xDFFF) i-- + const code = str.charCodeAt(i); + if (code > 0x7f && code <= 0x7ff) s++; + else if (code > 0x7ff && code <= 0xffff) s += 2; + if (code >= 0xdc00 && code <= 0xdfff) i--; } - return s + return s; } /** @@ -98,13 +105,13 @@ export function byteLength(str) { * @returns {Array} */ export function cleanArray(actual) { - const newArray = [] + const newArray = []; for (let i = 0; i < actual.length; i++) { if (actual[i]) { - newArray.push(actual[i]) + newArray.push(actual[i]); } } - return newArray + return newArray; } /** @@ -112,13 +119,13 @@ export function cleanArray(actual) { * @returns {Array} */ export function param(json) { - if (!json) return '' + if (!json) return ''; return cleanArray( Object.keys(json).map(key => { - if (json[key] === undefined) return '' - return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]) + if (json[key] === undefined) return ''; + return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]); }) - ).join('&') + ).join('&'); } /** @@ -126,21 +133,21 @@ export function param(json) { * @returns {Object} */ export function param2Obj(url) { - const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' '); if (!search) { - return {} + return {}; } - const obj = {} - const searchArr = search.split('&') + const obj = {}; + const searchArr = search.split('&'); searchArr.forEach(v => { - const index = v.indexOf('=') + const index = v.indexOf('='); if (index !== -1) { - const name = v.substring(0, index) - const val = v.substring(index + 1, v.length) - obj[name] = val + const name = v.substring(0, index); + const val = v.substring(index + 1, v.length); + obj[name] = val; } - }) - return obj + }); + return obj; } /** @@ -148,9 +155,9 @@ export function param2Obj(url) { * @returns {string} */ export function html2Text(val) { - const div = document.createElement('div') - div.innerHTML = val - return div.textContent || div.innerText + const div = document.createElement('div'); + div.innerHTML = val; + return div.textContent || div.innerText; } /** @@ -161,20 +168,20 @@ export function html2Text(val) { */ export function objectMerge(target, source) { if (typeof target !== 'object') { - target = {} + target = {}; } if (Array.isArray(source)) { - return source.slice() + return source.slice(); } Object.keys(source).forEach(property => { - const sourceProperty = source[property] + const sourceProperty = source[property]; if (typeof sourceProperty === 'object') { - target[property] = objectMerge(target[property], sourceProperty) + target[property] = objectMerge(target[property], sourceProperty); } else { - target[property] = sourceProperty + target[property] = sourceProperty; } - }) - return target + }); + return target; } /** @@ -183,18 +190,18 @@ export function objectMerge(target, source) { */ export function toggleClass(element, className) { if (!element || !className) { - return + return; } - let classString = element.className - const nameIndex = classString.indexOf(className) + let classString = element.className; + const nameIndex = classString.indexOf(className); if (nameIndex === -1) { - classString += '' + className + classString += '' + className; } else { classString = classString.substr(0, nameIndex) + - classString.substr(nameIndex + className.length) + classString.substr(nameIndex + className.length); } - element.className = classString + element.className = classString; } /** @@ -203,9 +210,9 @@ export function toggleClass(element, className) { */ export function getTime(type) { if (type === 'start') { - return new Date().getTime() - 3600 * 1000 * 24 * 90 + return new Date().getTime() - 3600 * 1000 * 24 * 90; } else { - return new Date(new Date().toDateString()) + return new Date(new Date().toDateString()); } } @@ -216,38 +223,38 @@ export function getTime(type) { * @return {*} */ export function debounce(func, wait, immediate) { - let timeout, args, context, timestamp, result + let timeout, args, context, timestamp, result; const later = function() { // 据上一次触发时间间隔 - const last = +new Date() - timestamp + const last = +new Date() - timestamp; // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait if (last < wait && last > 0) { - timeout = setTimeout(later, wait - last) + timeout = setTimeout(later, wait - last); } else { - timeout = null + timeout = null; // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用 if (!immediate) { - result = func.apply(context, args) - if (!timeout) context = args = null + result = func.apply(context, args); + if (!timeout) context = args = null; } } - } + }; return function(...args) { - context = this - timestamp = +new Date() - const callNow = immediate && !timeout + context = this; + timestamp = +new Date(); + const callNow = immediate && !timeout; // 如果延时不存在，重新设定延时 - if (!timeout) timeout = setTimeout(later, wait) + if (!timeout) timeout = setTimeout(later, wait); if (callNow) { - result = func.apply(context, args) - context = args = null + result = func.apply(context, args); + context = args = null; } - return result - } + return result; + }; } /** @@ -259,17 +266,17 @@ export function debounce(func, wait, immediate) { */ export function deepClone(source) { if (!source && typeof source !== 'object') { - throw new Error('error arguments', 'deepClone') + throw new Error('error arguments', 'deepClone'); } - const targetObj = source.constructor === Array ? [] : {} + const targetObj = source.constructor === Array ? [] : {}; Object.keys(source).forEach(keys => { if (source[keys] && typeof source[keys] === 'object') { - targetObj[keys] = deepClone(source[keys]) + targetObj[keys] = deepClone(source[keys]); } else { - targetObj[keys] = source[keys] + targetObj[keys] = source[keys]; } - }) - return targetObj + }); + return targetObj; } /** @@ -277,16 +284,16 @@ export function deepClone(source) { * @returns {Array} */ export function uniqueArr(arr) { - return Array.from(new Set(arr)) + return Array.from(new Set(arr)); } /** * @returns {string} */ export function createUniqueString() { - const timestamp = +new Date() + '' - const randomNum = parseInt((1 + Math.random()) * 65536) + '' - return (+(randomNum + timestamp)).toString(32) + const timestamp = +new Date() + ''; + const randomNum = parseInt((1 + Math.random()) * 65536) + ''; + return (+(randomNum + timestamp)).toString(32); } /** @@ -296,7 +303,7 @@ export function createUniqueString() { * @returns {boolean} */ export function hasClass(ele, cls) { - return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)')) + return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)')); } /** @@ -305,7 +312,7 @@ export function hasClass(ele, cls) { * @param {string} cls */ export function addClass(ele, cls) { - if (!hasClass(ele, cls)) ele.className += ' ' + cls + if (!hasClass(ele, cls)) ele.className += ' ' + cls; } /** @@ -315,23 +322,21 @@ export function addClass(ele, cls) { */ export function removeClass(ele, cls) { if (hasClass(ele, cls)) { - const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)') - ele.className = ele.className.replace(reg, ' ') + const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)'); + ele.className = ele.className.replace(reg, ' '); } } export function makeMap(str, expectsLowerCase) { - const map = Object.create(null) - const list = str.split(',') + const map = Object.create(null); + const list = str.split(','); for (let i = 0; i < list.length; i++) { - map[list[i]] = true + map[list[i]] = true; } - return expectsLowerCase - ? val => map[val.toLowerCase()] - : val => map[val] + return expectsLowerCase ? val => map[val.toLowerCase()] : val => map[val]; } - -export const exportDefault = 'export default ' + +export const exportDefault = 'export default '; export const beautifierConf = { html: { @@ -372,19 +377,54 @@ export const beautifierConf = { e4x: true, indent_empty_lines: true } -} +}; // 首字母大小 export function titleCase(str) { - return str.replace(/( |^)[a-z]/g, L => L.toUpperCase()) + return str.replace(/( |^)[a-z]/g, L => L.toUpperCase()); } // 下划转驼峰 export function camelCase(str) { - return str.replace(/-[a-z]/g, str1 => str1.substr(-1).toUpperCase()) + return str.replace(/-[a-z]/g, str1 => str1.substr(-1).toUpperCase()); } export function isNumberStr(str) { - return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str) + return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str); +} + +export function numberFormat(arg) { + var regPos = /^\d+(\.\d+)?$/; //非负浮点数 + var regNeg = /^(-(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*)))$/; //负浮点数 + if (regPos.test(arg) || regNeg.test(arg)) { + function strNumSize(tempNum) { + var stringNum = tempNum.toString(); + var index = stringNum.indexOf('.'); + var newNum = stringNum; + if (index != -1) { + newNum = stringNum.substring(0, index); + } + return newNum.length; + } + var moneyUnits = ['', '万', '亿', '万亿']; + var dividend = 10000; + var curentNum = arg - 0; + //转换数字 + var curentUnit = moneyUnits[0]; + //转换单位 + for (var i = 0; i < 4; i++) { + curentUnit = moneyUnits[i]; + if (strNumSize(curentNum) < 5) { + break; + } + curentNum = curentNum / dividend; + } + var m = { num: 0, unit: '' }; + console.log(curentNum); + m.num = curentNum.toFixed(2); + m.unit = curentUnit; + return m.num + m.unit; + } else { + return arg; + } } - diff --git a/src/views/about.vue b/src/views/about.vue index df1b355..bf10370 100644 --- a/src/views/about.vue +++ b/src/views/about.vue @@ -43,7 +43,7 @@
-
通知公告
+
公示公告
更多 @@ -91,11 +91,11 @@
-
嘉策公众号
+
嘉策公众号
-
嘉策QQ群
+
嘉策QQ群
diff --git a/src/views/components/footer/index.vue b/src/views/components/footer/index.vue index 49bcce2..47e5103 100644 --- a/src/views/components/footer/index.vue +++ b/src/views/components/footer/index.vue @@ -24,11 +24,11 @@
-
嘉策公众号
+
嘉策公众号
-
嘉策QQ群
+
嘉策QQ群
diff --git a/src/views/components/header/index.vue b/src/views/components/header/index.vue index ef61bf0..7d11d51 100644 --- a/src/views/components/header/index.vue +++ b/src/views/components/header/index.vue @@ -81,11 +81,11 @@ export default { }, { path: '/notice', - name: '通知公告' + name: '公示公告' }, { path: '/demand', - name: '企业需求' + name: '产业需求' }, { path: '/achievements', diff --git a/src/views/home/demand.vue b/src/views/home/demand.vue index c374b28..16c7761 100644 --- a/src/views/home/demand.vue +++ b/src/views/home/demand.vue @@ -3,7 +3,7 @@
- 企业需求检索 + 产业需求检索
-
- 【￥{{ item.price }}】 +
{{ item.title }}
-
- {{ item.fieldName }} - {{ item.typeName }} -
+
-
+ +
+
+ {{ + item.fieldName + }} + {{ item.typeName }} + +
+ {{ setNumber(item.price) }}
@@ -89,7 +97,7 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryParams.pageNum" - :page-sizes="[6, 12, 18, 24]" + :page-sizes="[8, 16, 24, 32]" :page-size="queryParams.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @@ -110,6 +118,7 @@ import { mapGetters } from 'vuex'; import { getDictListByStatus } from '@/api/home/info'; import { getEnterpriseNeedList } from '@/api/home/demand'; +import { numberFormat } from '@/utils'; export default { data() { return { @@ -117,7 +126,7 @@ export default { activeName: '1', queryParams: { pageNum: 1, - pageSize: 6, + pageSize: 8, title: '', field: '', // 技术领域id type: '' // 需求类型id @@ -140,6 +149,9 @@ export default { } }, methods: { + setNumber(val) { + return numberFormat(val); + }, getList() { this.loading = true; getEnterpriseNeedList(this.queryParams).then(({ data }) => { @@ -249,44 +261,55 @@ export default { // display: flex; // flex-direction: column; // justify-content: space-between; - width: calc((100% - 24px) / 3); - height: 292px; - margin-right: 12px; + width: calc((100% - 30px) / 4); + // height: 292px; + margin-right: 10px; box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.08); border: 1px solid #ffa32c; - margin-bottom: 14px; + margin-bottom: 10px; cursor: pointer; border-radius: 6px; overflow: hidden; - padding: 30px 20px; - .title { - font-size: 18px; - color: #333; - .txt { - color: #ffa32c; + padding: 10px; + .box_item { + display: flex; + flex-direction: column; + justify-content: space-between; + height: 100%; + .title { + font-size: 16px; + font-weight: bold; + color: #333; } - } - .tags { - margin-top: 22px; - .el-tag { - margin-right: 10px; + .tags { + display: flex; + justify-content: space-between; + align-items: center; + font-size: 14px; + margin-top: 10px; + .el-tag { + margin-right: 10px; + } + .txt { + color: #ffa32c; + } + } + .text { + min-height: 124px; + // max-height: 134px; + font-size: 14px; + color: #666; + line-height: 27px; + } + .time { + margin-top: 20px; + text-align: right; + font-size: 16px; + color: #999; } - } - .text { - min-height: 124px; - max-height: 134px; - font-size: 16px; - color: #666; - line-height: 27px; - } - .time { - margin-top: 20px; - text-align: right; - font-size: 16px; - color: #999; } } - .screen_item:nth-of-type(3n + 0) { + .screen_item:nth-of-type(4n + 0) { margin-right: 0; } } diff --git a/src/views/home/home.vue b/src/views/home/home.vue index d6f0443..0ea7a90 100644 --- a/src/views/home/home.vue +++ b/src/views/home/home.vue @@ -110,7 +110,7 @@ target="_blank" :to="{ path: '/portrait', - query: { key: 'policyNotice', val: '政策公告' } + query: { key: 'policyNotice', val: '公示公告' } }" >
diff --git a/src/views/home/notice.vue b/src/views/home/notice.vue index f4fbad5..68e5bb3 100644 --- a/src/views/home/notice.vue +++ b/src/views/home/notice.vue @@ -3,7 +3,7 @@
- 通知公告检索 + 公示公告检索 企业画像检索 政策解读检索 资讯快报检索 - 政策公告检索 + 公示公告检索 来源：{{ formData.source }} - 价格：{{ formData.price }} + 价格：{{ setNumber(formData.price) }}
-
通知公告
+
公示公告
更多 @@ -157,11 +159,11 @@
-
嘉策公众号
+
嘉策公众号
-
嘉策QQ群
+
嘉策QQ群
@@ -190,6 +192,7 @@ import { import { getPolicyList, getRead } from '@/api/home/notice'; import { mapGetters } from 'vuex'; import { add, cancel } from '@/api/search'; +import { numberFormat } from '@/utils'; import Editor from '@/components/Editor'; import headerPage from './components/header'; // import headerPage2 from './components/header2'; @@ -226,6 +229,9 @@ export default { ...mapGetters(['token']) }, methods: { + setNumber(val) { + return numberFormat(val); + }, toSearch() { if (!this.input.length) return this.msgError('请输入搜索关键字'); let routerJump = this.$router.resolve({ @@ -266,7 +272,7 @@ export default { this.formData = data; }); } else if (this.type == 'companyNeed') { - // 企业需求 + // 产业需求 getInfo2({ id }).then(({ data }) => { this.formData = data; }); diff --git a/src/views/search.vue b/src/views/search.vue index 1331f6b..ecf9940 100644 --- a/src/views/search.vue +++ b/src/views/search.vue @@ -9,7 +9,7 @@ 政策 政策解读 资讯快报 - 企业需求 + 产业需求 科学成功