【add】-全局配置文件的增加

package.json

@@ -9,19 +9,23 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "@fullcalendar/daygrid": "^5.11.3",
+    "@fullcalendar/interaction": "^5.11.3",
+    "@fullcalendar/vue": "^5.11.3",
     "@tinymce/tinymce-vue": "^2.1.0",
     "ant-design-vue": "^1.7.6",
     "area-data": "^5.0.6",
     "axios": "^0.21.1",
+    "compression-webpack-plugin": "5.0.1",
     "core-js": "^3.6.5",
     "dayjs": "^1.10.6",
     "echarts": "^5.2.1",
-    "compression-webpack-plugin": "^5.0.1",
     "enquire.js": "^2.1.6",
     "jsencrypt": "^3.2.1",
     "lodash.pick": "^4.4.0",
     "nprogress": "^0.2.0",
     "tinymce": "^5.3.2",
+    "tippy.js": "^6.3.7",
     "vue": "^2.6.11",
     "vue-area-linkage": "^5.1.0",
     "vue-ls": "^3.2.2",

src/components/jero/JYearDate.vue

@@ -12,6 +12,7 @@
     :open="opent"
     @openChange="handleChange"
     @panelChange="onPanelChange"
+    v-bind="$attrs"
   > </a-date-picker>
 
 </template>

src/permission.js

@@ -13,7 +13,7 @@ import {notification} from 'ant-design-vue'
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 // ,'/signupentrance','/signUpPage'
 
-const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration', '/screen'] // no redirect whitelist
+const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] // no redirect whitelist, '/screen'
 
 router.beforeEach(async (to, from, next) => {
   // 会员系统的单点登录

src/screenApi/api.js

@@ -1,6 +1,7 @@
 
-import { getActionZxd } from '@/screenApi/manage'
+import { getActionZxd, getActionWP, getActionISO } from '@/screenApi/manage'
 
+/******制修订大屏接口--------开始 **********/
 // 汽车标准项目总体情况；包括发布的国行标、在研的国行标、立项上报的国行标、外文版项目数量
 const StanderProjectGeneralSituation = (params) => getActionZxd( '/serviceInterface/getDpData1', params)
 
@@ -27,10 +28,8 @@ const GetReleaseStandardData = (params) => getActionZxd( '/serviceInterface/getD
 const GetReleaseStandardSCData = (params) => getActionZxd( '/serviceInterface/getDpData5_2_1', params)
 // 历年计划下达情况--（各SC）逐年下达计划数量 -- 通过SC查询
 const GetReleaseStandardDataBySC = (params) => getActionZxd( '/serviceInterface/getDpData5_2_2', params)
-
 /*历年标准发布情况-------结束*/
 
-
 // 各SC超期情况统计
 const GetOverdueData = (params) => getActionZxd( '/serviceInterface/getDpData7_ext', params)
 
@@ -42,7 +41,33 @@ const GetCompletionProjectData = (params) => getActionZxd( '/serviceInterface/ge
 
 // 第一起草单位贡献度排名
 const GetEnterpriseContributionData = (params) => getActionZxd( '/serviceInterface/getDpData8', params)
+/******制修订大屏接口--------结束 **********/
 
+/******WP29--------结束 **********/
+// 法规数量统计
+const GetRegulationQuantityData = (params) => getActionWP('/laws/bzsLawRegulationInfo/getScreenLawsInfo', params)
+// 专家数量统计
+const GetExpertQuantityData = (params) => getActionWP('/expertinfo/bzsExpertInfo/getScreenExpertStatistics', params)
+// 会议信息日历
+const GetMeetingCalendarData = (params) => getActionWP('/meetinginfo/bzsMeetingInfo/getScreenMeetingInfoCalendar', params)
+// 会议信息统计
+const GetMeetingInformationData = (params) => getActionWP('/meetinginfo/bzsMeetingInfo/queryScreenMeetingInfo', params)
+
+/******WP29--------结束 **********/
+
+
+
+/******ISO--------结束 **********/
+// 中国牵头标准信息统计
+const GetLeadingStandardData = (params) => getActionISO('/standard/bzsProjectStandard/screenStandardstats', params)
+// 国际会议统计
+const GetISOMeetingCalendarData = (params) => getActionISO('/mainpage/bzsmainpage/getScreenMeetingInfoCalendar', params)
+// 国际专家统计
+const GetExpertChartData = (params) => getActionISO('/expertinfo/bzsExpertInfo/queryScreenExpertInfo', params)
+// 获取技术领域的下拉框数据
+const GetTechnicalFieldData = (params) => getActionISO('/expertinfo/bzsExpertInfo/getQuerySelect', params)
+
+/******ISO--------结束 **********/
 
 
 export {
@@ -50,18 +75,26 @@ export {
   GetPreparationRevisionSituation,
   GetPreparationRevisionSC,
   GetCentralizedData,
-
   GetReleasePlanData,
   GetReleasePlanSCData,
   GetReleasePlanDataBySC,
-
   GetReleaseStandardData,
   GetReleaseStandardSCData,
   GetReleaseStandardDataBySC,
-
   GetOverdueData,
   GetShouldBeCompletedProjectData,
   GetCompletionProjectData,
+  GetEnterpriseContributionData,
+
+
+  GetRegulationQuantityData,
+  GetExpertQuantityData,
+  GetMeetingCalendarData,
+  GetMeetingInformationData,
+
+  GetLeadingStandardData,
+  GetISOMeetingCalendarData,
+  GetExpertChartData,
+  GetTechnicalFieldData
 
-  GetEnterpriseContributionData
 }

src/screenApi/manage.js

@@ -21,7 +21,7 @@ export function getActionWP(url, parameter) {
 }
 export function getActionISO(url, parameter) {
   return axios({
-    url: '/ISOApi' + url,
+    url: '/ISO' + url,
     method: 'get',
     params: parameter
   })

src/screenRequest/request.js

@@ -90,10 +90,16 @@ const err = (error) => {
 service.interceptors.request.use(config => {
   if (config.url.indexOf('/zxd') === 0) {
     config.headers['verifyToken'] = '1SRifTFQz86Wnqz'
-  }
+  } else if(config.url.indexOf('/WPApi') === 0) {
-  const token = Vue.ls.get(ACCESS_TOKEN)
+    config.headers['X-Access-Token'] = 'GUG2weX1Pg5lOzKxhcrQKSjqsT6YBaZV'
-  if (token) {
+  } else if(config.url.indexOf('/ISO') === 0) {
-    config.headers['X-Access-Token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
+    config.headers['X-Access-Token'] = 'GUG2weX1Pg5lOzKxhcrQKSjqsT6YBaZV'
+  } else {
+    // 来款的请求
+    const token = Vue.ls.get(ACCESS_TOKEN)
+    if (token) {
+      config.headers['X-Access-Token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
+    }
   }
   //update-begin-author:taoyan date:2020707 for:多租户
   let tenantid = Vue.ls.get(TENANT_ID)

yarn.lock

@@ -923,6 +923,46 @@
     "@babel/helper-validator-identifier" "^7.14.9"
     to-fast-properties "^2.0.0"
 
+"@fullcalendar/common@~5.11.3":
+  version "5.11.3"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/common/-/common-5.11.3.tgz#6d555a06925b8a6d1556570c9f039960539908d5"
+  integrity sha512-welVwyfQOXQQGfDwBMSfYEPbiO1cPfUD+C7jd3ZoweJR+dSO11ddFugxIQ7dGfABAGZ63oq/+LW9FsmAJezVNg==
+  dependencies:
+    tslib "^2.1.0"
+
+"@fullcalendar/core@~5.11.3":
+  version "5.11.3"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/core/-/core-5.11.3.tgz#26f276347eb83185e03e4086772910c85406b88e"
+  integrity sha512-YUFxCvVJytUwFeXCx4J17kFMM7Ixwn9zBjVRw5NM2bMwgR6VAhSnlZc6yNQSOIy7Hj2TF0vDkO/4JNlTvxyAXw==
+  dependencies:
+    "@fullcalendar/common" "~5.11.3"
+    preact "^10.0.5"
+    tslib "^2.1.0"
+
+"@fullcalendar/daygrid@^5.11.3":
+  version "5.11.3"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/daygrid/-/daygrid-5.11.3.tgz#6bc1f956c95f84438428aa6e7a106c863a791a70"
+  integrity sha512-PCK0y80DRNCzWuC5lGpIWqCgKDvql1ah7rXql5lu+Gn2EeFj15ZQ8diMFjtNIQucEmFaNOXnR05Pgcry1n6Shg==
+  dependencies:
+    "@fullcalendar/common" "~5.11.3"
+    tslib "^2.1.0"
+
+"@fullcalendar/interaction@^5.11.3":
+  version "5.11.3"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/interaction/-/interaction-5.11.3.tgz#c6712c1305ecb8e975953c7ff462222b49204187"
+  integrity sha512-L955wkDjza62K96ndstvYs2Fd4V0kayTDpqW8W7huFG3Ox8MutpLqKAa2SCaTvcNIlWS4oexGQRiQAaJG7u47A==
+  dependencies:
+    "@fullcalendar/common" "~5.11.3"
+    tslib "^2.1.0"
+
+"@fullcalendar/vue@^5.11.3":
+  version "5.11.3"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/vue/-/vue-5.11.3.tgz#85fade64b33cfbc223fffecc34055d88a65924cd"
+  integrity sha512-MZ/43sISJRxlvb6NVIZt5L+7qD32gk6mdKe/22w5c4uoPxU6jtS18OiJmVoiP66iVzWBEPUbdd7Trk1sYJbYhg==
+  dependencies:
+    "@fullcalendar/core" "~5.11.3"
+    tslib "^2.1.0"
+
 "@gar/promisify@^1.0.1":
   version "1.1.2"
   resolved "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz"