chore: 修改证书页面

c3810565 · 王鹏飞 · 58317295 · c3810565 · c3810565 · c3810565
--- a/build/dev.ezijing.com.key
+++ b/build/dev.ezijing.com.key
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
-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
+V6z8WJKPO9KZM6D9ejtN/bbbd3j1cRiw7NSl8AUykiVHJWz9TXAflET2EpILLera
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-5NwVR75KN9uRmlkz5xnFTraRZtm3MJmA7dwXK3hrN+dFJR2vLO3KBAtpgtpPdkK1
+mlzdXUKttVpSvJixerqQPeT7HnC18NBKOydFMYPdXsgWcMXvu2BuvRClIzsjlXKM
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-KP7Py8D62wBObaav2KXoLPlMlkuDLYMnv501jHVA5CDvcd25Q7Ts01nyerP97zX2
+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
-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
+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
-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
+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
-HTVXOHxinJ/W8OFD2DBFD/Bm5fq1WUpnaugHhaJnK9wDMWOZND7MZfn9IFbLoMCV
+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
-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
+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
-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
+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
-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
+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
 -----END RSA PRIVATE KEY-----
\ No newline at end of file
--- a/build/dev.ezijing.com.pem
+++ b/build/dev.ezijing.com.pem
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
        "core-js": "^3.6.5",
        "cross-env": "^7.0.2",
        "element-ui": "^2.13.2",
+        "file-saver": "^2.0.5",
        "html2canvas": "*",
        "js-cookie": "^2.2.1",
        "js-file-download": "^0.4.12",
@@ -5708,9 +5709,9 @@
      }
    },
    "node_modules/file-saver": {
-      "version": "1.3.8",
+      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz",
+      "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
-      "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
    },
    "node_modules/file-uri-to-path": {
      "version": "1.0.0",
@@ -6597,6 +6598,11 @@
        "xmldom": "^0.1.22"
      }
    },
+    "node_modules/html2pdf.js/node_modules/file-saver": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-1.3.8.tgz",
+      "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
+    },
    "node_modules/html2pdf.js/node_modules/jspdf": {
      "version": "1.4.1",
      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-1.4.1.tgz",
@@ -18772,9 +18778,9 @@
      }
    },
    "file-saver": {
-      "version": "1.3.8",
+      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz",
+      "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
-      "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
    },
    "file-uri-to-path": {
      "version": "1.0.0",
@@ -19526,6 +19532,11 @@
            "xmldom": "^0.1.22"
          }
        },
+        "file-saver": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-1.3.8.tgz",
+          "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
+        },
        "jspdf": {
          "version": "1.4.1",
          "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-1.4.1.tgz",

--- a/package.json
+++ b/package.json
@@ -76,6 +76,7 @@
    "core-js": "^3.6.5",
    "cross-env": "^7.0.2",
    "element-ui": "^2.13.2",
+    "file-saver": "^2.0.5",
    "html2canvas": "*",
    "js-cookie": "^2.2.1",
    "js-file-download": "^0.4.12",

--- a/src/components/layout/shms/header.vue
+++ b/src/components/layout/shms/header.vue
@@ -46,7 +46,7 @@ export default {
  // localStorage.setItem("i18n_locale", key)
  computed: {
    user() {
-      return this.$store.state.user.data
+      return this.$store.state.user
    }
  },
  methods: {

--- a/src/pages/shms/certs/index.vue
+++ b/src/pages/shms/certs/index.vue
 <template>
  <div class="app-card">
    <div class="form-box">
-      <el-select @change="changes" v-model="value" size="small" clearable>
+      <el-select @change="changes" v-model="value" size="small" clearable v-if="false">
        <el-option v-for="item in options" :key="item.id" :label="item.english_name" :value="item.id"> </el-option>
      </el-select>
      <div class="down-btn" @click="downPdf">{{ $t('shmsLang.downloadBtn') }}</div>
    </div>
-    <template v-if="imgUrl">
+    <template v-if="pdfUrl">
      <div class="certs-img">
-        <img :src="setUrl(imgUrl)" />
+        <object :data="pdfUrl" style="width:100%;height: 600px;"></object>
      </div>
    </template>
    <template v-else>
@@ -23,6 +23,8 @@
 import * as api from '@/api/account.js'
 import httpRequest from '@/utils/axios'
 import fileDownload from 'js-file-download'
+import { saveAs } from 'file-saver'
 export default {
  data() {
    return {
@@ -30,12 +32,27 @@ export default {
      value: '',
      pageData: null,
      htmlTitle: 'pdf',
-      imgUrl: '',
+      imgUrl: ''
-      pdfUrl: ''
+    }
+  },
+  computed: {
+    user() {
+      return this.$store.state.user
+    },
+    certificate() {
+      try {
+        return JSON.parse(this.user.certificate)
+      } catch (error) {
+        console.log(error)
+      }
+      return {}
+    },
+    pdfUrl() {
+      return this.certificate.url
    }
  },
  mounted() {
-    this.getCondition()
+    // this.getCondition()
  },
  methods: {
    setUrl(url) {
@@ -49,7 +66,7 @@ export default {
    },
    downPdf() {
      if (this.pdfUrl) {
-        this.download()
+        saveAs(this.pdfUrl, this.certificate.file_name)
      } else {
        this.$message({
          message: 'No certificate, unable to download',
@@ -100,9 +117,6 @@ export default {
  margin: 30px auto;
  background: #fff;
  padding: 30px;
-  position: fixed;
-  left: 50%;
-  -webkit-transform: translateX(-50%);
  .form-box {
    display: flex;
    justify-content: flex-end;
@@ -121,9 +135,7 @@ export default {
    }
  }
  .certs-img {
-    width: 670px;
+    margin: 40px 0;
-    margin: 0 auto;
-    background: #fff;
    img {
      // position: absolute;
      // top: 0;

--- a/src/pages/shms/index.vue
+++ b/src/pages/shms/index.vue
@@ -41,7 +41,7 @@ export default {
  },
  computed: {
    user() {
-      return this.$store.state.user.data
+      return this.$store.state.user
    }
  },
  methods: {

--- a/src/store/index.js
+++ b/src/store/index.js
@@ -35,7 +35,7 @@ const store = new Vuex.Store({
  actions: {
    getUser({ commit }) {
      getUser().then(response => {
-        commit('setUser', response)
+        commit('setUser', response.data)
      })
    },
    // 退出登录
@@ -50,7 +50,7 @@ const store = new Vuex.Store({
    async checkLogin({ commit }) {
      const isLogin = await getUser()
        .then(response => {
-          commit('setUser', response)
+          commit('setUser', response.data)
          return true
        })
        .catch(() => {