权限

1 year ago · 2f1e872cdc
parent df681da6cd
commit 2f1e872cdc
9 changed files with 27 additions and 16 deletions
--- a/.env.development
+++ b/.env.development
@ -4,4 +4,4 @@ ENV='development'
 # base api
 VUE_APP_BASE_API=http://sstt-dangan.ali251.langye.net
 VUE_APP_UPLOAD_API=http://sstt-dangan.ali251.langye.net/api/admin/upload-file
-VUE_APP_PREVIEW_API=http://view.ali251.langye.net:8012/onlinePreview
+#VUE_APP_PREVIEW_API=https://view.langye.net/preview/onlinePreview
--- a/.env.production
+++ b/.env.production
@ -4,4 +4,4 @@ ENV = 'production'
 # base api
 VUE_APP_BASE_API = http://sstt-dangan.ali251.langye.net
 VUE_APP_UPLOAD_API =http://sstt-dangan.ali251.langye.net/api/admin/upload-file
-VUE_APP_PREVIEW_API=http://view.ali251.langye.net:8012/onlinePreview
+#VUE_APP_PREVIEW_API=https://view.langye.net/preview/onlinePreview
--- a/.env.staging
+++ b/.env.staging
@ -6,4 +6,4 @@ ENV = 'staging'
 # base api
 VUE_APP_BASE_API=http://sstt-dangan.ali251.langye.net
 VUE_APP_UPLOAD_API=http://sstt-dangan.ali251.langye.net/api/admin/upload-file
-
+#VUE_APP_PREVIEW_API=https://view.langye.net/preview/onlinePreview
--- a/public/index.html
+++ b/public/index.html
@ -7,13 +7,7 @@
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
    <title><%= webpackConfig.name %></title>

-    <script>
-      window._AMapSecurityConfig = {
-        securityJsCode: '0d59d0a3fa5483849b52b0edc4bc97ec',
-      }
-    </script>
-    <script type="text/javascript" src='https://webapi.amap.com/maps?v=1.4.11&key=795a757114c371f42cee1f8efa527684&plugin=AMap.PlaceSearch'></script>
-    <script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
+    <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/js-base64@3.6.0/base64.min.js"></script>
  </head>
  <body>
    <noscript>
--- a/src/components/viewFile/viewFile.vue
+++ b/src/components/viewFile/viewFile.vue
@ -9,7 +9,7 @@
    </div>

    <div class="dialogConcent" :style="{height:wheight+'px'}">
-      <iframe id="iframeWin" :src="baseUrl+url" frameborder="0" scrolling="auto" align="center" class="iframeWeb">
+      <iframe id="iframeWin" :src="url" frameborder="0" scrolling="auto" align="center" class="iframeWeb">
      </iframe>
    </div>

--- a/src/views/record/components/addRecord.vue
+++ b/src/views/record/components/addRecord.vue
@ -209,11 +209,26 @@
        this.form.catalog_name = data.name
        this.form.catalog_id = data.id
        this.$forceUpdate()
+      },
+      setCheck(e){
+        if(e){
+          this.checkArr = [e]
+          this.form.catalog_id = e
+        }else{
+          this.checkArr = []
+          this.form.catalog_id = ''
+        }
      },
      handleRemove(file, fileList) {
        this.filesList = fileList
      },
-      handlesuccess(response, file, fileList) {
+      handlesuccess(response, file, fileList) {
+        console.log("response",response)
+        if(response && response.hasOwnProperty('errcode')){
+          this.$Message.warning(response.errmsg||'')
+          this.filesList = []
+          return
+        }
        this.filesList = fileList
      },
      saveContent(e) {
--- a/src/views/record/components/showRecord.vue
+++ b/src/views/record/components/showRecord.vue
@ -31,7 +31,7 @@
            <div v-for="(item,index) in form.files_details">
              附件{{index+1}}：
              <a :href="item.url" target="_blank">{{item.original_name}}</a>
-              <el-link target="_blank" style="margin:0 10px;" @click="toshowFile(item.url)" type="primary">
+              <el-link target="_blank" style="margin:0 10px;" @click="toshowFile(item.view_url)" type="primary">
                预览
              </el-link>
            </div>
@ -104,7 +104,7 @@
 <style scoped lang="scss">
  .article {
    &>div {
-      margin: 10px;
+      margin:10px 30px;
    }

    &-title {
@ -130,7 +130,7 @@
      color: blue;
      cursor: pointer;
      text-decoration: underline;
-      text-indent: 2em;
+      // text-indent: 2em;
    }

    &-html {
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@ -189,6 +189,8 @@
      editIndex(type, id) {
        if (type == 'editor') {
          this.$refs.addRecord.id = id
+        }else{
+          this.$refs.addRecord.setCheck(this.select.catalog_id)
        }
        // if(this.select.catalog_id){
        //   this.$refs.addRecord.setCatalogId(this.select.catalog_id)
--- a/vue.config.js
+++ b/vue.config.js
@ -25,7 +25,7 @@ module.exports = {
   * Detail: https://cli.vuejs.org/config/#publicpath
   */
  publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin_test',
+  outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin',
  assetsDir: 'static',
  css: {
    loaderOptions: { // 向 CSS 相关的 loader 传递选项