栏目详情样式图片等

package-lock.json

@@ -6905,6 +6905,11 @@
       "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
       "dev": true
     },
+    "image-conversion": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/image-conversion/-/image-conversion-2.1.1.tgz",
+      "integrity": "sha512-hnMOmP7q2jxA+52FZ+wHNhg3fdFRlgfngsQH2JQHEQkafY7tj/8F15e6Rv/RxDegc872jvyaRHwMbkTZK1Cjbg=="
+    },
     "import-cwd": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",

package.json

@@ -14,6 +14,7 @@
     "echarts": "^4.8.0",
     "element-theme": "^2.0.1",
     "element-ui": "^2.13.0",
+    "image-conversion": "^2.1.1",
     "js-cookie": "^2.2.1",
     "mavon-editor": "^2.6.17",
     "postcss-px2rem": "^0.3.0",

src/components/img-upload/Cropper.vue

@@ -45,7 +45,7 @@
           type="primary"
           :loading="isUpload"
           :disabled="isDisabled"
-          @click.prevent="uploadImg('base64')">
+          @click.prevent="uploadImg('blob')">
           上传
         </el-button>
       </div>
@@ -57,7 +57,7 @@
 import {
   VueCropper
 } from 'vue-cropper'
-// console.log(VueCropper);
+import {compress, compressAccurately} from 'image-conversion'
 export default {
   components: {
     VueCropper
@@ -79,7 +79,9 @@ export default {
     // 截图框比例
     fixedNumber: {
       type: Array,
-      default: [1, 0.26]
+      default: () => {
+        return [1, 0.26]
+      }
     },
     fixed: {
       type: Boolean,
@@ -138,7 +140,9 @@ export default {
       const that = this
       if (type === 'blob') {
         this.$refs.cropper.getCropBlob(data => {
-          that.$emit('upload', data)
+          compress(data, 0.6).then(res => {
+            that.$emit('upload', res)
+          })
         })
       } else {
         this.$refs.cropper.getCropData(data => {

src/components/modules/content.vue

@@ -123,9 +123,8 @@ export default {
     },
     // 图片裁剪上传事件
     customUpload(data) {
-      const blob = this.dataURItoBlob(data)
       const formData = new FormData()
-      formData.append('file', blob, this.file.name)
+      formData.append('file', data, this.file.name)
       this.imgUpload(formData)
     },
     // 压缩图片

src/layouts/header/index.vue

@@ -6,7 +6,7 @@
     </div>
     <div class="user-tool">
       <template v-if="inContent">
-        <div class="site cp">
+        <div class="site cp" @click="toIndex">
           <img src="@/assets/images/index.png">
           当前站点首页
         </div>
@@ -36,7 +36,8 @@
 <script>
 import { mapState, mapMutations, mapActions } from 'vuex'
 import breadcrumb from '@/components/breadcrumb'
-import util from '@/libs/util'
+import Setting from '@/setting'
+import Util from '@/libs/util'
 export default {
     data() {
       return {
@@ -86,7 +87,7 @@ export default {
           limit: 1000,
           siteName: ''
         }).then(({ data }) => {
-          this.sites = util.getSite(data.records)
+          this.sites = Util.getSite(data.records)
         }).catch(e => {})
       },
       // 显示隐藏站点切换
@@ -94,10 +95,14 @@ export default {
         const { path } = this.$route
         this.inContent = !!this.sitePath.find(e => path.includes(e))
       },
+      // 前往站点首页
+      toIndex() {
+        window.open((Setting.isDev ? `http://${location.hostname}:8095` : 'http://192.168.31.136/front') + `/#/column?siteId=${this.$store.state.content.site.id}`)
+      },
       // 站点切换回调
       siteCommand(e) {
         this.setSite(e)
-        this.$route.path === '/page/list' || this.$router.push('/page')
+        this.$route.path === '/column/list' || this.$router.push('/column')
         location.reload()
       },
       // 用户切换回调

src/pages/article/add/index.vue

@@ -522,6 +522,7 @@ export default {
         next()
       } else if (!this.pass) {
         const { updateTime } = this
+        console.log("🚀 ~ file: index.vue:525 ~ beforeRouteLeave ~ updateTime", updateTime)
         // 更改了信息才需要提示
         if (updateTime > 2) {
           this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
@@ -644,6 +645,9 @@ export default {
             this.rules.classificationId[0].required  = true
           }
           this.getClassification()
+          this.$nextTick(() => {
+            this.updateTime = 2
+          })
         }).catch(err => {})
       },
       // 获取站点列表
@@ -843,9 +847,8 @@ export default {
       },
       // 图片裁剪上传事件
       customUpload(data) {
-        const blob = this.dataURItoBlob(data)
         const formData = new FormData()
-        formData.append('file', blob, this.file.name)
+        formData.append('file', data, this.file.name)
         formData.append('quote', this.form.title)
         formData.append('site', this.site.siteName)
         formData.append('uploader', this.userName)

src/pages/column/add/index.vue

@@ -85,7 +85,7 @@
           <ul class="styles">
             <li v-for="(item, i) in listStyle" :key="i" @click="form.listStyleId = item.id">
               <div class="review">
-                <!-- <img :src="require('@/assets/images/list' + item.id + '.png')" alt=""> -->
+                <img :src="require('@/assets/images/style/' + item.id + '.png')" alt="">
               </div>
               <el-radio v-model="form.listStyleId" :label="item.id">{{ item.style }}</el-radio>
             </li>
@@ -95,7 +95,7 @@
           <ul class="styles">
             <li v-for="(item, i) in detailStyleId" :key="i" @click="form.detailStyleId = item.id">
               <div class="review">
-                <!-- <img :src="require('@/assets/images/article' + item.id + '.png')" alt=""> -->
+                <img :src="require('@/assets/images/style/' + item.id + '.png')" alt="">
               </div>
               <el-radio v-model="form.detailStyleId" :label="item.id">{{ item.style }}</el-radio>
             </li>
@@ -322,7 +322,8 @@ export default {
           route: '/site'
         },
         {
-          name: '内容管理'
+          name: '内容管理',
+          route: '/column'
         },
         {
           name: '栏目管理',
@@ -353,7 +354,7 @@ export default {
         const { id } = this.form
         const { updateTime } = this
         // 更改了信息才需要提示
-        if ((!id && updateTime) || (id && updateTime > 1)) {
+        if (updateTime > 1) {
           this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
             type: 'warning'
           }).then(() => {
@@ -525,9 +526,8 @@ export default {
       },
       // 图片裁剪上传事件
       customUpload(data) {
-        const blob = this.dataURItoBlob(data)
         const formData = new FormData()
-        formData.append('file', blob, this.file.name)
+        formData.append('file', data, this.file.name)
         formData.append('quote', this.form.columnName)
         formData.append('site', this.site.siteName)
         formData.append('uploader', this.userName)
@@ -537,6 +537,7 @@ export default {
       compress(img) {
         const canvas = document.createElement('canvas')
         const ctx = canvas.getContext('2d')
+        console.log("🚀 ~ file: index.vue:540 ~ compress ~ ctx", ctx,img.width)
         // let initSize = img.src.length;
         const width = img.width
         const height = img.height

src/pages/column/page/about.vue

@@ -211,7 +211,23 @@ export default {
     }
   },
   mounted() {
-    
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
+      },
+      {
+        name: '内容管理',
+        route: '/column'
+      },
+      {
+        name: '栏目管理',
+        route: '/column'
+      },
+      {
+        name: 'ABOUT'
+      }
+    ])
   },
   methods: {
 

src/pages/column/page/application.vue

@@ -149,7 +149,23 @@ export default {
     }
   },
   mounted() {
-    
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
+      },
+      {
+        name: '内容管理',
+        route: '/column'
+      },
+      {
+        name: '栏目管理',
+        route: '/column'
+      },
+      {
+        name: 'APPLICATION'
+      }
+    ])
   },
   methods: {
     

src/pages/column/page/careers.vue

@@ -127,7 +127,23 @@ export default {
     }
   },
   mounted() {
-    
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
+      },
+      {
+        name: '内容管理',
+        route: '/column'
+      },
+      {
+        name: '栏目管理',
+        route: '/column'
+      },
+      {
+        name: 'CAREERS'
+      }
+    ])
   },
   methods: {
     

src/pages/column/page/edu.vue

@@ -79,7 +79,23 @@ export default {
     }
   },
   mounted() {
-    
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
+      },
+      {
+        name: '内容管理',
+        route: '/column'
+      },
+      {
+        name: '栏目管理',
+        route: '/column'
+      },
+      {
+        name: 'EDUCATION & COLLABORATION'
+      }
+    ])
   },
   methods: {
     

src/pages/column/page/home.vue

@@ -203,7 +203,23 @@ export default {
     }
   },
   mounted() {
-    
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
+      },
+      {
+        name: '内容管理',
+        route: '/column'
+      },
+      {
+        name: '栏目管理',
+        route: '/column'
+      },
+      {
+        name: 'HOME'
+      }
+    ])
   },
   methods: {
     

src/pages/column/page/news.vue

@@ -267,7 +267,23 @@ export default {
     }
   },
   mounted() {
-    
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
+      },
+      {
+        name: '内容管理',
+        route: '/column'
+      },
+      {
+        name: '栏目管理',
+        route: '/column'
+      },
+      {
+        name: 'NEWS&EVENTS'
+      }
+    ])
   },
   methods: {
 

src/pages/column/page/newsPress.vue

@@ -57,7 +57,23 @@ export default {
     }
   },
   mounted() {
-    
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
+      },
+      {
+        name: '内容管理',
+        route: '/column'
+      },
+      {
+        name: '栏目管理',
+        route: '/column'
+      },
+      {
+        name: 'NEWS&EVENTS-PRESS ROOM'
+      }
+    ])
   },
   methods: {
     

src/pages/column/page/newsProcurement.vue

@@ -57,7 +57,23 @@ export default {
     }
   },
   mounted() {
-    
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
+      },
+      {
+        name: '内容管理',
+        route: '/column'
+      },
+      {
+        name: '栏目管理',
+        route: '/column'
+      },
+      {
+        name: 'NEWS&EVENTS-PROCUREMENT'
+      }
+    ])
   },
   methods: {
     

src/pages/column/page/research.vue

@@ -96,7 +96,23 @@ export default {
     }
   },
   mounted() {
-    
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
+      },
+      {
+        name: '内容管理',
+        route: '/column'
+      },
+      {
+        name: '栏目管理',
+        route: '/column'
+      },
+      {
+        name: 'RESEARCH'
+      }
+    ])
   },
   methods: {
     
@@ -178,6 +194,7 @@ export default {
     justify-content: center;
     align-items: center;
     height: 143px;
+    padding: 0 30px;
     font-size: 30px;
     font-family: SFProDisplay-Bold, SFProDisplay;
     font-weight: bold;

src/pages/user/list/index.vue

@@ -634,7 +634,7 @@ export default {
           }
           if (deptArchitectureId) {
             this.archId = []
-            this.handleArchId(this.orgs, deptArchitectureId.split(','))
+            this.handleArchId(this.orgs, deptArchitectureId.split(',').map(e => +e))
             data.deptArchitectureId = this.archId
           }
           data.groupId = +data.groupId