Selaa lähdekoodia

Merge branch 'custom' of http://8.136.199.33:3000/eta_front/eta_report_front into bug5807fc

ldong 1 kuukausi sitten
vanhempi
commit
e90b10767f

+ 1 - 1
package.json

@@ -14,7 +14,7 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
     "normalize.css": "^8.0.1",
-    "vant": "^3.3.4",
+    "vant": "^4.6.4",
     "vue": "^3.2.16",
     "vue-router": "^4.0.12",
     "vuex": "^4.0.2",

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 193 - 193
public/eta_comp.js


+ 5 - 0
src/api/api.js

@@ -30,4 +30,9 @@ export const smartReportDetail=params=>{
 //获取分享信息
 export const getShareInfo=params=>{
   return get('/smart_report/wechat_share/detail',params)
+}
+
+//外部报告
+export const getExternalReport = params => {
+  return get('/report/share/outside/report/detail',params)
 }

BIN
src/assets/img/file/excel_icon.png


BIN
src/assets/img/file/img_icon.png


BIN
src/assets/img/file/pdf_icon.png


BIN
src/assets/img/file/word_icon.png


+ 5 - 0
src/router/index.js

@@ -51,6 +51,11 @@ const routes=[
     name: "detailSmartPdf",
     component: () => import("@/views/smartReport/detailPdf.vue"),
   },
+  {
+    path: "/reportshare_external",
+    name: "reportshareExternal",
+    component: () => import("@/views/report/reportExternalDetail.vue"),
+  },
 ]
 
 const router = createRouter({

+ 1 - 1
src/views/report/reportDetail.vue

@@ -71,7 +71,7 @@
       <div id="abstract">
         <div class="abstract_cont">
           <div v-if="reportInfo.Abstract">摘要:{{ reportInfo.Abstract }}</div>
-          <div style="color: #666; margintop: 1.2rem">
+          <div style="color: #666; margintop: 1.2rem" v-if="configInfo.Disclaimer">
             *注:请务必阅读&nbsp;<strong
               style="fontweight: normal; cursor: pointer; color: #3e8ce6"
               @click="showTips"

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 89 - 0
src/views/report/reportExternalDetail.vue


+ 1 - 1
src/views/reportEn/detail.vue

@@ -33,7 +33,7 @@
       <div id="abstract">
         <div class="abstract_cont">
           <div v-if="reportInfo.Abstract">Abstract:{{ reportInfo.Abstract }}</div>
-          <div style="color: #666; margintop: 1.2rem">
+          <div style="color: #666; margintop: 1.2rem" v-if="configInfo.DisclaimerEn">
             *Note: Please be sure to read the <strong
               style="fontweight: normal; cursor: pointer; color: #3e8ce6"
               @click="showTips"

+ 1 - 1
src/views/smartReport/detail.vue

@@ -65,7 +65,7 @@
 
         <div class="abstract" v-if="reportInfo && !!reportInfo.NeedSplice">
           <div v-if="reportInfo.Abstract">摘要:{{ reportInfo.Abstract }}</div>
-          <div style="color: #666; margintop: 1.2rem">
+          <div style="color: #666; margintop: 1.2rem" v-if="configInfo.Disclaimer">
             *注:请务必阅读&nbsp;<strong
               style="fontweight: normal; cursor: pointer; color: #3e8ce6"
               @click="showTips"

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä