diff --git a/src/App.vue b/src/App.vue index 3d09aea..7a37399 100644 --- a/src/App.vue +++ b/src/App.vue @@ -149,6 +149,7 @@ watch( Cookies.set('phone', phone); window.token = token; window.phone = phone; + Session.set('roleName', 'common'); Session.set('userData', { ...Session.get('userData'), diff --git a/src/assets/caixun/company_logo2.jpg b/src/assets/caixun/company_logo2.jpg new file mode 100644 index 0000000..34f1b6a Binary files /dev/null and b/src/assets/caixun/company_logo2.jpg differ diff --git a/src/assets/caixun/nonews_icon.jpg b/src/assets/caixun/nonews_icon.jpg new file mode 100644 index 0000000..4174fed Binary files /dev/null and b/src/assets/caixun/nonews_icon.jpg differ diff --git a/src/assets/loading2.gif b/src/assets/loading2.gif new file mode 100644 index 0000000..3709a16 Binary files /dev/null and b/src/assets/loading2.gif differ diff --git a/src/components/Upload/UploadDialog.vue b/src/components/Upload/UploadDialog.vue index 8949b50..30995d9 100644 --- a/src/components/Upload/UploadDialog.vue +++ b/src/components/Upload/UploadDialog.vue @@ -99,9 +99,9 @@ btnHeight="32px" @btnClick="submit" :btnDisabled="!canSubmit" - style="margin-left: 10px" + style="margin-left: 10px;box-shadow: none;" > - 确认 + 上传 diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue index ec32417..4bf8d21 100644 --- a/src/components/Upload/index.vue +++ b/src/components/Upload/index.vue @@ -10,7 +10,7 @@ :http-request="uploadAction" :headers="uploadHeader" :limit="1" - :accept="wordFlag ? '.pdf,.docx' : '.pdf'" + :accept="'.pdf,.docx'" drag :on-success="handleAvatarSuccess" :before-upload="onBeforeUpload" @@ -21,8 +21,8 @@
将文件拖拽至此处
或
- - + + 选择文件 diff --git a/src/components/Upload/indexMultiple.vue b/src/components/Upload/indexMultiple.vue index cd9420d..2c4a63b 100644 --- a/src/components/Upload/indexMultiple.vue +++ b/src/components/Upload/indexMultiple.vue @@ -11,7 +11,7 @@ :headers="uploadHeader" drag :limit="limit" - :accept="wordFlag ? '.pdf,.docx' : '.pdf'" + :accept="'.pdf,.docx'" v-model:file-list="fileList" :on-success="handleAvatarSuccess" :before-upload="onBeforeUpload" diff --git a/src/components/tableComponents/index.vue b/src/components/tableComponents/index.vue index b30780a..c10b8ba 100644 --- a/src/components/tableComponents/index.vue +++ b/src/components/tableComponents/index.vue @@ -4,8 +4,8 @@ ref="tableRef" :data="tableData.data" v-loading="tableLoading" - style="font-size: 12px" - :cell-style="{ fontWeight: '400', fontSize: '14px', color: 'rgba(0,0,0,0.65)', height: '46px' }" + style="font-size: 12px;border-radius: 4px;border: none;" + :cell-style="{ fontWeight: '400', fontSize: '14px', color: 'rgba(0,0,0,0.65)', height: '46px', padding: '0 10px' }" :header-cell-style="{ height: '52px', background: '#fafafa', @@ -13,7 +13,9 @@ fontWeight: '400', fontSize: '14px', color: '#858585', + padding: '0 10px', }" + border @selection-change="selectionChange" @sort-change="sortChange" size="small" @@ -41,7 +43,6 @@ >
共 {{ tableData.total }} 项数据
- @@ -158,6 +159,9 @@ defineExpose({ // padding: 0 10px; // background-color: #ff9a5b; // } +.el-select-dropdown__item.is-selected{ + font-weight: normal; +} .empty_table { display: flex; @@ -168,4 +172,5 @@ defineExpose({ margin-top: 50px; margin-bottom: 50px; } + diff --git a/src/theme/app.scss b/src/theme/app.scss index 6aea7d9..9ad3e10 100644 --- a/src/theme/app.scss +++ b/src/theme/app.scss @@ -31,6 +31,7 @@ --mainColor: rgba(141, 141, 141, 0.7); --backFilter: saturate(180%) blur(3px); + --el-color-primary: #ff9900; /* 按钮样式变量 */ // --Buttons-Border-Primary-Gradient: #e38522; diff --git a/src/theme/loading.scss b/src/theme/loading.scss index c28c7b9..964982d 100644 --- a/src/theme/loading.scss +++ b/src/theme/loading.scss @@ -15,7 +15,7 @@ .loading-next .loading-next-box-warp .loading-next-box-item { width: 33.333333%; height: 33.333333%; - background: var(--el-color-primary); + background: #ff9900; float: left; animation: loading-next-animation 1.2s infinite ease; border-radius: 1px; diff --git a/src/utils/loading.ts b/src/utils/loading.ts index 5fd020c..eb78d15 100644 --- a/src/utils/loading.ts +++ b/src/utils/loading.ts @@ -1,5 +1,6 @@ import { nextTick } from 'vue'; import '/@/theme/loading.scss'; +import LoadingGif from '/@/assets/loading2.gif'; /** * 页面全局 Loading @@ -15,15 +16,7 @@ export const NextLoading = { const htmls = `
-
-
-
-
-
-
-
-
-
+ Loading...
`; diff --git a/src/views/pages/caixun/components/CaixunList.vue b/src/views/pages/caixun/components/CaixunList.vue index 1bedb14..c4dff40 100644 --- a/src/views/pages/caixun/components/CaixunList.vue +++ b/src/views/pages/caixun/components/CaixunList.vue @@ -2,13 +2,15 @@
- · {{ item.title }} + {{ item.title }} +
+
+ {{ item.publicDate }}
中国证券报
- {{ item.publicDate }}
@@ -51,7 +53,7 @@ onMounted(() => { .item { display: flex; flex-direction: column; - gap: 10px; + gap: 12px; width: 100%; border-bottom: 1px solid #f6f6f6; padding: 20px 5px; @@ -77,6 +79,12 @@ onMounted(() => { color: var(--Buttons-ningbo); } + .time-source{ + display: flex; + justify-content: space-between; + align-items: center; + } + .time { font-family: PingFangSC, PingFang SC; font-weight: normal; @@ -85,7 +93,7 @@ onMounted(() => { line-height: 20px; text-align: left; font-style: normal; - margin-top: 10px; + // margin-top: 10px; } .source { diff --git a/src/views/pages/caixun/index.vue b/src/views/pages/caixun/index.vue index d5e8faa..ebff263 100644 --- a/src/views/pages/caixun/index.vue +++ b/src/views/pages/caixun/index.vue @@ -12,13 +12,12 @@
{{ info.company_name }}
- 证券代码：{{ info.code }} | - 行业分类：{{ info.cate }} + {{ info.code }} + {{ info.cate }}
-
{{ stData.st1 }} 财讯篇数 @@ -59,7 +58,7 @@ @keyup.enter="sreachLeft" /> -
+
无搜索结果
-
- -
@@ -97,7 +95,7 @@ 财报可视化
-
+
@@ -132,7 +130,27 @@ {{ item.publicDate }}
- + + + + +
@@ -162,14 +180,13 @@
- +
微信里点“发现” 扫一下二维码便可分享至朋友圈 - + --> @@ -179,15 +196,16 @@ import { Session } from '/@/utils/storage'; import { NextLoading } from '/@/utils/loading'; import topBg from '../../../assets/caixun/home_bg_qiye.png'; import topBgJg from '../../../assets/caixun/home_bg_jianguan.png'; -import logo from '../../../assets/caixun/company_logo.png'; +import logo from '/@/assets/caixun/company_logo2.jpg'; import { Search } from '@element-plus/icons-vue'; import CaixunList from './components/CaixunList.vue'; -import emptyImg from '/@/assets/yuqingnew/nonews_icon.png'; +import emptyImg from '/@/assets/caixun/nonews_icon.jpg'; import videoImg from '/@/assets/caixun/video_icon.png'; import wxImg from '/@/assets/caixun/icon_wx.png'; import { getSmartInfoPage, getSmartH5InfoPage, getSmartVideoInfoPage, getSmartVideoUrl } from '/@/api/api'; -import QRCode from 'qrcodejs2-fixes'; +// import QRCode from 'qrcodejs2-fixes'; import { doMaiDian } from '/@/api/api'; +import QRCode from 'qrcode'; const qrcodeContainer = ref(null); @@ -209,8 +227,8 @@ const handleResize = () => { const isCommon = ref(Session.get('roleName') == 'common' || Session.get('roleName') == 'subCommon'); const tabIndex = ref(0); const info = ref({ - company_name: Session.get('userData')?.companySimpleName, - code: Session.get('userData')?.secCode, + company_name: '宁波银行', + code: '002142.SZ', cate: '股份制银行', }); @@ -257,11 +275,11 @@ async function getLeftList() { if (data?.list) { caixunList.value = data.list; leftForm.value.total = data.total; - info.value.cate = data.swIndustryName; + // info.value.cate = data.swIndustryName; } else { caixunList.value = []; leftForm.value.total = 0; - info.value.cate = ''; + // info.value.cate = ''; } stData.st1 = data.total; @@ -330,25 +348,30 @@ function sizeChangeRight(size: number) { const qrCode = ref(null); -async function openQrDialog(url, id) { +async function openQrDialog(url, id, item) { console.log('🚀 ~ openQrDialog ~ url:', url); // 埋点 doMaiDian({ type: 2 }); if (tabIndex.value == 0) { - dialogVisible.value = true; + // dialogVisible.value = true; nextTick(() => { - if (qrCode.value) { - qrcodeContainer.value.innerHTML = ''; - } - - qrCode.value = new QRCode(qrcodeContainer.value, { - text: url, - width: 180, // 二维码宽度 - height: 180, // 二维码高度 - colorDark: '#000000', // 二维码前景色 - colorLight: '#ffffff', // 二维码背景色 - correctLevel: QRCode.CorrectLevel.H, // 容错级别（L、M、Q、H） + QRCode.toDataURL(url).then((_url) => { + item.ewm = _url; }); + + // if (qrCode.value) { + // qrcodeContainer.value.innerHTML = ''; + // } + + // qrCode.value = new QRCode(qrcodeContainer.value, { + // text: url, + // width: 180, // 二维码宽度 + // height: 180, // 二维码高度 + // colorDark: '#000000', // 二维码前景色 + // colorLight: '#ffffff', // 二维码背景色 + // correctLevel: QRCode.CorrectLevel.H, // 容错级别（L、M、Q、H） + // }); + // console.log('output >>>>> qrCode.value',qrCode.value); }); } else { let { code, data } = await getSmartVideoUrl({ @@ -356,18 +379,23 @@ async function openQrDialog(url, id) { }); dialogVisible.value = true; nextTick(() => { - if (qrCode.value) { - qrcodeContainer.value.innerHTML = ''; - } - - qrCode.value = new QRCode(qrcodeContainer.value, { - text: data, - width: 180, // 二维码宽度 - height: 180, // 二维码高度 - colorDark: '#000000', // 二维码前景色 - colorLight: '#ffffff', // 二维码背景色 - correctLevel: QRCode.CorrectLevel.H, // 容错级别（L、M、Q、H） + QRCode.toDataURL(data).then((_url) => { + item.ewm = _url; }); + + // if (qrCode.value) { + // qrcodeContainer.value.innerHTML = ''; + // } + + // qrCode.value = new QRCode(qrcodeContainer.value, { + // text: data, + // width: 180, // 二维码宽度 + // height: 180, // 二维码高度 + // colorDark: '#000000', // 二维码前景色 + // colorLight: '#ffffff', // 二维码背景色 + // correctLevel: QRCode.CorrectLevel.H, // 容错级别（L、M、Q、H） + // }); + // console.log('output >>>>> qrCode.value',qrCode.value); }); } } @@ -433,9 +461,9 @@ $maxWidth: 100vw; .content { display: flex; flex-direction: column; - position: fixed; - left: 50%; - transform: translate(-50%, 0); + // position: fixed; + // left: 50%; + // transform: translate(-50%, 0); } .top { @@ -443,8 +471,8 @@ $maxWidth: 100vw; min-width: 1200px; max-width: $maxWidth; height: 117px; - background: linear-gradient(180deg, #e7effa 0%, #fafbfb 100%); - box-shadow: 0px 2px 12px 0px rgba(186, 193, 205, 0.5), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.5); + background: #fff; + // box-shadow: 0px 2px 12px 0px rgba(186, 193, 205, 0.5), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.5); border-radius: 8px; display: flex; justify-content: space-between; @@ -452,16 +480,17 @@ $maxWidth: 100vw; .top_left { display: flex; + align-items: center; height: 100%; position: relative; } .logo { - width: 118px; - height: 118px; + width: 80px; + height: 80px; background: #e46713; margin-left: 30px; - margin-top: -20px; + // margin-top: -20px; } .sub_info { @@ -492,6 +521,20 @@ $maxWidth: 100vw; line-height: 22px; text-align: left; font-style: normal; + + .code { + color: rgb(0, 122, 255); + background-color: rgba(0, 122, 255, 0.1); + padding: 4px 8px; + border-radius: 4px; + margin-right: 12px; + } + .cate { + color: #ff9900; + background-color: rgba(255, 153, 0, 0.1); + padding: 4px 8px; + border-radius: 4px; + } } } @@ -549,9 +592,11 @@ $maxWidth: 100vw; display: flex; gap: 15px; margin-top: 25px; + height: calc(100vh - 167px); .left { width: 70%; + height: 100%; border-radius: 10px; padding: 30px 30px; padding-bottom: 0; @@ -575,12 +620,12 @@ $maxWidth: 100vw; .r_list { // height: 57vh; // overflow: auto; - max-height: 55vh; + height: calc(100% - 80px); overflow-y: scroll; } .pagination { - margin-top: 12px; + margin-top: 24px; width: 100%; display: flex; text-align: center; @@ -598,8 +643,8 @@ $maxWidth: 100vw; .r_line { width: 100%; - height: 4px; - background: #f0f0f0; + height: 1px; + background: #eee; .line { width: 80px; @@ -609,18 +654,19 @@ $maxWidth: 100vw; } .right { - padding: 30px 20px; + padding: 20px; } .r_list_big_title { - height: 50px; + // height: 50px; + padding: 16px 0; } .list_big_title { - font-family: PingFangSC, PingFang SC; + font-family: PingFangSC-Medium; font-weight: bold; - font-size: 20px; - color: #1a1a1a; + font-size: 16px; + color: #333; text-align: left; font-style: normal; } @@ -628,19 +674,16 @@ $maxWidth: 100vw; .right_tabs { display: flex; margin-top: 20px; - gap: 20px; + gap: 16px; .tab_item { - width: 54px; - height: 28px; - background: #f5f7fd; - border-radius: 4px; - color: #5f6063; + padding: 8px 12px; + background: #f6f6f6; + border-radius: 20px; + color: #333; font-family: PingFangSC, PingFang SC; - font-weight: bold; font-size: 16px; - - line-height: 22px; + line-height: 16px; text-align: left; font-style: normal; display: flex; @@ -650,8 +693,9 @@ $maxWidth: 100vw; } .active { + font-weight: bold; color: var(--Buttons-ningbo); - background: #f0f4ff; + background: rgba(255, 153, 0, 0.1); } } diff --git a/src/views/pages/index/common/index.vue b/src/views/pages/index/common/index.vue index 1097eed..5ac54e9 100644 --- a/src/views/pages/index/common/index.vue +++ b/src/views/pages/index/common/index.vue @@ -3,7 +3,7 @@
- +
@@ -210,7 +210,7 @@ import ListStatus from '/@/components/TypoDetection/ListStatus.vue'; const route = useRoute(); const router = useRouter(); -const userType = ref(Session.get('userData').userType); +const userType = ref(Session.get('userData')?.userType || 0); const reportType: string[] = ['年报', '半年报', '一季报', '三季报', '', '日常公告']; const uploadDialog = ref(null); const queryFrom = ref({}); @@ -235,7 +235,7 @@ function showUploadDialog() { } function goDetail(item) { - router.push({ + const routeData = router.push({ path: '/detail', query: { id: item.id, @@ -245,6 +245,7 @@ function goDetail(item) { fileName: item.fileName, }, }); + // window.open(routeData.href, '_blank'); } // 检校 @@ -391,7 +392,7 @@ const unloadHandler = (e) => { Session.remove('indexPage'); Session.remove('indexFilter'); }; -import Cookies from 'js-cookie'; + // 页面加载时 onMounted(() => { NextLoading.done(); @@ -470,7 +471,7 @@ onUnmounted(() => { diff --git a/src/views/pages/index/index.vue b/src/views/pages/index/index.vue index 36ea266..e8e0654 100644 --- a/src/views/pages/index/index.vue +++ b/src/views/pages/index/index.vue @@ -16,7 +16,7 @@ const com: any = { // 获取账号类型 const roleName = computed(() => { - return Session.get('roleName') === 'common' || Session.get('roleName') === 'subCommon' ? 'common' : 'admin'; + return 'common'//Session.get('roleName') === 'common' || Session.get('roleName') === 'subCommon' ? 'common' : 'admin'; }); onMounted(() => {