Merge remote-tracking branch 'origin/feature/syp_workLogs'

public/index.html

@@ -36,26 +36,30 @@
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
   <script>
-    window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
+    // window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
-    // window.SITE_CONFIG['apiURL'] = 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api'
+    window.SITE_CONFIG['apiURL'] = 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api'
+    window.SITE_CONFIG['workLogURL'] = 'https://epdc-jinan-test.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
   </script>
   <% } %>
   <!-- 集成测试环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
   <script>
     window.SITE_CONFIG['apiURL'] = 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api'
+    window.SITE_CONFIG['workLogURL'] = 'https://epdc-jinan-test.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
   </script>
   <% } %>
   <!-- 验收测试环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>
   <script>
     window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
+    window.SITE_CONFIG['workLogURL'] = 'https://epdc-jinan-test.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
   </script>
   <% } %>
   <!-- 生产环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
   <script>
     window.SITE_CONFIG['apiURL'] = 'https://epdc-jinshui.elinkservice.cn/epdc-api'
+    window.SITE_CONFIG['workLogURL'] = 'https://epmet-ext9.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
   </script>
   <% } %>
 </head>

src/views/modules/worklog/worklog.vue

@@ -0,0 +1,30 @@
+<template>
+  <el-card class="worklog">
+      <iframe :src="url" class="iframe"/>
+  </el-card>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+export default {
+  data() {
+    return {
+      url: ''
+    }
+  },
+  created () {
+    const _token = Cookies.get('token') || localStorage.getItem('token')
+    const _customerId = Cookies.get('customerId') || localStorage.getItem('customerId')
+    this.url = `${window.SITE_CONFIG['workLogURL']}/#/NoteTaking?token=${_token}&customerId=${_customerId}`
+  }
+}
+</script>
+<style lang="scss" scoped>
+.worklog {
+  min-height: calc(calc(100vh - 50px - 38px - 30px) - 2px);
+}
+.iframe {
+  width: 100%;
+  min-height: calc(calc(100vh - 50px - 38px - 30px) - 2px);
+}
+</style>

src/views/pages/login.vue

@@ -151,6 +151,16 @@ export default {
           // 登陆之后从localStorage获取党委为空则从网络上拉取
           this.checkLocakStorage()
         }).catch(() => { })
+        this.$http.get(`/api/plugins/workLog/getCustomId`)
+        .then(res => {
+          if (res.data.code !== 0) {
+            return this.$message.error(res.data.msg)
+          }
+          Cookies.set('customerId',res.data.data)
+        })
+        .catch((err) => {
+          console.log(err)
+        })
       })
     }, 1000, { 'leading': true, 'trailing': false }),
     checkLocakStorage () {

vue.config.js

@@ -9,6 +9,7 @@ module.exports = {
   devServer: {
     open: true,
     port: 8001,
+    public: '192.168.51.32',
     overlay: {
       errors: false,
       warnings: false