fix

public/styles/css/editor.css

@@ -6,6 +6,14 @@
     font-family: ProximaNova;
     src: url('./styles/font/ProximaNova-Regular.otf');
 }
+@font-face {
+    font-family: PingFang;
+    src: url('./styles/font/PingFang-Regular.otf');
+}
+@font-face {
+    font-family: PingFang SC;
+    src: url('./styles/font/PingFang-Regular.otf');
+}
 .mce-content-body:not([dir='rtl']) blockquote {
     padding: 8px 15px;
     border-left: 0;

src/libs/util.js

@@ -1,6 +1,7 @@
 import { _local } from "./util.db";
 import { Message } from "element-ui";
 import store from "@/store";
+import Setting from '@/setting'
 
 // 文件后缀集合
 const exts = {
@@ -13,12 +14,17 @@ const util = {
     local: _local,
     // 筛选出有权限的站点
     getSite(list) {
+			// 开启了动态路由的需要根据权限筛选站点
+			if (Setting.dynamicRoute) {
 				const result = []
 				const auth = store.state.auth.btns
 				list.map(e => {
 					auth.find(n => n.includes(e.siteName)) && result.push(e)
 				})
 				return result
+			} else {
+				return list
+			}
     },
     //返回格式化时间，传参例如："yyyy-MM-dd hh:mm:ss"
     formatDate(fmt, date) {

src/pages/article/list/index.vue

@@ -2,80 +2,174 @@
   <div class="flex page">
     <div style="width: 218px;border-right: 1px solid #EBEDF0">
       <p class="page-name mb">全部栏目</p>
-      <div style="height: calc(100% - 50px);overflow: auto">
+      <div style="height: calc(100vh - 190px);overflow: auto">
-        <el-tree ref="column" :data="columns" highlight-current :expand-on-click-node="false" default-expand-all :props="defaultProps" node-key="id" @node-click="initData">
+        <el-tree ref="column"
-          <span class="custom-tree-node" slot-scope="{ node, data }">
+                 :data="columns"
-            <span class="org-name" :title="node.label">{{ node.label }}</span>
+                 highlight-current
+                 :expand-on-click-node="false"
+                 default-expand-all
+                 :props="defaultProps"
+                 node-key="id"
+                 @node-click="initData">
+          <span class="custom-tree-node"
+                slot-scope="{ node, data }">
+            <span class="org-name"
+                  :title="node.label">{{ node.label }}</span>
           </span>
         </el-tree>
       </div>
     </div>
-    <div class="p-l-20" style="width: calc(100% - 219px);">
+    <div class="p-l-20"
+         style="width: calc(100% - 219px);">
       <div class="tool">
         <div class="search-wrap">
-          <el-select v-model="field" @change="initData">
+          <el-select v-model="field"
-            <el-option
+                     @change="initData">
-              v-for="(item, i) in keywords"
+            <el-option v-for="(item, i) in keywords"
                        :key="i"
                        :label="item.name"
                        :value="item.id">
             </el-option>
           </el-select>
-          <el-input class="keyword" :placeholder="'请输入' + keywords.find(e => e.id === field).name" v-model.trim="keyword" clearable></el-input>
+          <el-input class="keyword"
+                    :placeholder="'请输入' + keywords.find(e => e.id === field).name"
+                    v-model.trim="keyword"
+                    clearable></el-input>
         </div>
         <div class="actions">
-          <el-dropdown class="setting" trigger="click" :hide-on-click="false">
+          <el-dropdown class="setting"
-            <img class="icon" src="@/assets/images/setting.png" alt="">
+                       trigger="click"
+                       :hide-on-click="false">
+            <img class="icon"
+                 src="@/assets/images/setting.png"
+                 alt="">
             <el-dropdown-menu>
               <el-dropdown-item>
-                <el-button @click="resetColumns" type="text">列重置</el-button>
+                <el-button @click="resetColumns"
+                           type="text">列重置</el-button>
               </el-dropdown-item>
-              <el-dropdown-item v-for="(column, i) in settings" :key="i" :divided="i === 0">
+              <el-dropdown-item v-for="(column, i) in settings"
+                                :key="i"
+                                :divided="i === 0">
                 <el-checkbox v-model="column.show">{{ column.name }}</el-checkbox>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:新增'" type="primary" @click="add" >新增</el-button>
+          <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:新增'"
-          <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:删除'" @click="batchDel">删除</el-button>
+                     type="primary"
+                     @click="add">新增</el-button>
+          <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:删除'"
+                     @click="batchDel">删除</el-button>
         </div>
       </div>
-      <el-table :data="list" class="table" ref="table" header-align="center" @selection-change="handleSelectionChange" row-key="id" @sort-change="sortChange">
+      <el-table :data="list"
-        <el-table-column v-if="settings[0].show" type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
+                class="table"
-        <el-table-column type="index" width="60" label="序号" align="center">
+                ref="table"
+                header-align="center"
+                @selection-change="handleSelectionChange"
+                row-key="id"
+                @sort-change="sortChange">
+        <el-table-column v-if="settings[0].show"
+                         type="selection"
+                         width="55"
+                         align="center"
+                         :reserve-selection="true"></el-table-column>
+        <el-table-column type="index"
+                         width="60"
+                         label="序号"
+                         align="center">
           <template scope="scope">
             <span>{{(page - 1) * pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="settings[1].show" show-overflow-tooltip prop="title" label="标题" align="center" min-width="150"></el-table-column>
+        <el-table-column v-if="settings[1].show"
-        <el-table-column v-if="settings[2].show" prop="columnName" label="栏目" align="center" min-width="120"></el-table-column>
+                         show-overflow-tooltip
-        <el-table-column v-if="settings[3].show" prop="classificationName" label="所属分类" align="center" min-width="120"></el-table-column>
+                         prop="title"
-        <el-table-column v-if="settings[4].show" prop="typeId" label="栏目类型" align="center" min-width="100">
+                         label="标题"
+                         align="center"
+                         min-width="150"></el-table-column>
+        <el-table-column v-if="settings[2].show"
+                         prop="columnName"
+                         label="栏目"
+                         align="center"
+                         min-width="120"></el-table-column>
+        <el-table-column v-if="settings[3].show"
+                         prop="classificationName"
+                         label="所属分类"
+                         align="center"
+                         min-width="120"></el-table-column>
+        <el-table-column v-if="settings[4].show"
+                         prop="typeId"
+                         label="栏目类型"
+                         align="center"
+                         min-width="100">
           <template slot-scope="scope">
             {{ types.find(e => e.id === scope.row.typeId).name }}
           </template>
         </el-table-column>
-        <el-table-column v-if="settings[5].show" prop="founderName" label="录入人" align="center" min-width="80"></el-table-column>
+        <el-table-column v-if="settings[5].show"
-        <el-table-column v-if="settings[6].show" prop="editorName" label="修改人" align="center" min-width="80"></el-table-column>
+                         prop="founderName"
-        <el-table-column v-if="settings[7].show" prop="updateTime" label="修改日期" align="center" min-width="150" sortable="custom"></el-table-column>
+                         label="录入人"
-        <el-table-column v-if="settings[8].show" prop="releaseTime" label="发布日期" align="center" min-width="100" sortable="custom"></el-table-column>
+                         align="center"
-        <el-table-column v-if="settings[9].show" prop="totalBrowsing" label="总浏览" align="center" min-width="70"></el-table-column>
+                         min-width="80"></el-table-column>
-        <el-table-column v-if="settings[10].show" prop="workNumber" label="状态" align="center" min-width="80">
+        <el-table-column v-if="settings[6].show"
+                         prop="editorName"
+                         label="修改人"
+                         align="center"
+                         min-width="80"></el-table-column>
+        <el-table-column v-if="settings[7].show"
+                         prop="updateTime"
+                         label="修改日期"
+                         align="center"
+                         min-width="150"
+                         sortable="custom"></el-table-column>
+        <el-table-column v-if="settings[8].show"
+                         prop="releaseTime"
+                         label="发布日期"
+                         align="center"
+                         min-width="100"
+                         sortable="custom"></el-table-column>
+        <el-table-column v-if="settings[9].show"
+                         prop="totalBrowsing"
+                         label="总浏览"
+                         align="center"
+                         min-width="70"></el-table-column>
+        <el-table-column v-if="settings[10].show"
+                         prop="workNumber"
+                         label="状态"
+                         align="center"
+                         min-width="80">
           <template slot-scope="scope">
             {{ scope.row.isRelease ? '已发布' : '草稿' }}
           </template>
         </el-table-column>
-        <el-table-column v-auth="'/site/list:' + siteName + ':内容管理:文章管理:置顶'" prop="sequence" label="置顶" align="center" min-width="80" sortable="custom">
+        <el-table-column v-auth="'/site/list:' + siteName + ':内容管理:文章管理:置顶'"
+                         prop="sequence"
+                         label="置顶"
+                         align="center"
+                         min-width="80"
+                         sortable="custom">
           <template slot-scope="scope">
-            <i v-if="scope.row.isRelease" :class="['squ-icon', scope.row.isTop ? 'el-icon-check' : 'el-icon-close']" @click="sticky(scope.row)"></i>
+            <i v-if="scope.row.isRelease"
+               :class="['squ-icon', scope.row.isTop ? 'el-icon-check' : 'el-icon-close']"
+               @click="sticky(scope.row)"></i>
           </template>
         </el-table-column>
-        <el-table-column v-if="settings[11].show" label="操作" align="center" width="190">
+        <el-table-column v-if="settings[11].show"
+                         label="操作"
+                         align="center"
+                         width="190">
           <template slot-scope="scope">
-            <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:预览'" type="text" @click="preview(scope.row)">预览</el-button>
+            <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:预览'"
-            <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:编辑'" type="text" @click="edit(scope.row)">编辑</el-button>
+                       type="text"
-            <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:删除'" type="text" @click="handleDelete(scope.row)">删除</el-button>
+                       @click="preview(scope.row)">预览</el-button>
-            <el-switch
+            <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:编辑'"
-              v-if="scope.row.isRelease"
+                       type="text"
+                       @click="edit(scope.row)">编辑</el-button>
+            <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:删除'"
+                       type="text"
+                       @click="handleDelete(scope.row)">删除</el-button>
+            <el-switch v-if="scope.row.isRelease"
                        v-auth="'/site/list:' + siteName + ':内容管理:文章管理:禁用'"
                        class="m-l-10"
                        v-model="scope.row.isDisable"
@@ -87,7 +181,11 @@
         </el-table-column>
       </el-table>
       <div class="pagination">
-        <el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
+        <el-pagination background
+                       @current-change="currentChange"
+                       :current-page="page"
+                       layout="total, prev, pager, next"
+                       :total="total"></el-pagination>
       </div>
     </div>
   </div>

src/pages/column/page/deviceIntroBeam.vue

@@ -69,7 +69,8 @@
       </div>
 
       <div class="unit">
-        <h6>{{ modules[4].form.title }}</h6>
+        <div class="title"
+             v-html="modules[4].form.title"></div>
         <img class="pic"
              :src="modules[4].form.pic"
              alt="">
@@ -203,7 +204,7 @@ export default {
     width: 986px;
     padding-bottom: 60px;
     margin: 0 auto;
-    h6 {
+    .title {
         padding-left: 15px;
         margin-bottom: 15px;
         font-size: 20px;

src/pages/column/page/deviceIntroLayout.vue

@@ -71,7 +71,8 @@
       </div>
 
       <div class="unit c-wrap">
-        <h6>{{ modules[4].form.title }}</h6>
+        <div class="title"
+             v-html="modules[4].form.title"></div>
         <img class="pic"
              :src="modules[4].form.pic"
              alt="">
@@ -195,7 +196,7 @@ export default {
     width: 986px;
     padding-bottom: 60px;
     margin: 0 auto;
-    h6 {
+    .title {
         padding-left: 15px;
         margin-bottom: 15px;
         font-size: 20px;

src/pages/column/page/deviceIntroLinear.vue

@@ -59,14 +59,16 @@
       <div class="block intro">
         <div class="inner">
           <div class="left c-wrap">
-            <h5>{{ modules[3].form.title }}</h5>
+            <div class="title1"
+                 v-html="modules[3].form.title"></div>
             <img :src="modules[3].form.pic"
                  alt="">
             <div class="cover"
                  @click="toSet(3)">点击更改标题与图片</div>
           </div>
           <div class="right c-wrap">
-            <h6>{{ modules[4].form.title }}</h6>
+            <div class="title2"
+                 v-html="modules[4].form.title"></div>
             <img :src="modules[4].form.pic"
                  alt="">
             <div class="cover"
@@ -194,17 +196,18 @@ export default {
         width: 68%;
         margin-left: 2%;
     }
-    h5 {
+    .title1 {
-        margin-bottom: 15px;
+        margin-bottom: 0.93rem;
-        font-size: 20px;
+        font-size: 0.88rem;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         color: #2a2a2a;
     }
-    h6 {
+
-        padding-left: 15px;
+    .title2 {
-        margin-bottom: 15px;
+        padding-left: 0.93rem;
-        font-size: 20px;
+        margin-bottom: 0.93rem;
+        font-size: 0.88rem;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         color: #2a2a2a;

src/pages/site/list/index.vue

@@ -3,31 +3,58 @@
     <div class="tool">
       <p class="page-name">站点列表</p>
       <div class="search-wrap">
-        <el-input placeholder="请输入站点名称" v-model.trim="keyword" clearable @keyup.enter.native="getData"></el-input>
+        <el-input placeholder="请输入站点名称"
+                  v-model.trim="keyword"
+                  clearable
+                  @keyup.enter.native="getData"></el-input>
       </div>
     </div>
 
-    <el-table ref="table" :data="list" class="table" header-align="center" row-key="id">
+    <el-table ref="table"
-      <el-table-column type="index" width="60" label="序号" align="center">
+              :data="list"
+              class="table"
+              header-align="center"
+              row-key="id">
+      <el-table-column type="index"
+                       width="60"
+                       label="序号"
+                       align="center">
         <template slot-scope="scope">
           {{ scope.$index + (page - 1) * pageSize + 1 }}
         </template>
       </el-table-column>
-      <el-table-column prop="siteName" label="站点名称" align="center"></el-table-column>
+      <el-table-column prop="siteName"
-      <el-table-column prop="domainName" label="域名" width="400" align="center">
+                       label="站点名称"
+                       align="center"></el-table-column>
+      <el-table-column prop="domainName"
+                       label="域名"
+                       width="400"
+                       align="center">
         <template slot-scope="scope">
-          <el-input v-model.trim="scope.row.domainName" placeholder="请输入域名" @change="update(scope.row)"></el-input>
+          <el-input v-model.trim="scope.row.domainName"
+                    placeholder="请输入域名"
+                    @change="update(scope.row)"></el-input>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="170" align="center">
+      <el-table-column label="操作"
+                       width="170"
+                       align="center">
         <template slot-scope="scope">
-          <el-button v-auth="scope.row.siteName + ':前往网站首页'" type="text" @click="toIndex(scope.row)">前往网站首页</el-button>
+          <el-button v-auth="scope.row.siteName + ':前往网站首页'"
-          <el-button v-auth="scope.row.siteName + ':内容管理'" type="text" @click="content(scope.row)">内容管理</el-button>
+                     type="text"
+                     @click="toIndex(scope.row)">前往网站首页</el-button>
+          <el-button v-auth="scope.row.siteName + ':内容管理'"
+                     type="text"
+                     @click="content(scope.row)">内容管理</el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="pagination">
-      <el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
+      <el-pagination background
+                     layout="total, prev, pager, next"
+                     :total="total"
+                     @current-change="handleCurrentChange"
+                     :current-page="page"></el-pagination>
     </div>
   </div>
 </template>
@@ -66,11 +93,39 @@ export default {
         name: '站点管理'
       }
     ])
+    // this.updateSite()
   },
   methods: {
     ...mapMutations('content', [
       'setSite'
     ]),
+    // 更改域名
+    async updateSite () {
+      await this.$put(this.api.updateSite, {
+        id: 1,
+        siteName: 'IASF英文站点'
+      })
+      await this.$put(this.api.updateSite, {
+        id: 2,
+        siteName: 'IASF中文站点'
+      })
+      await this.$put(this.api.updateSite, {
+        id: 3,
+        siteName: 'S³FEL中文站点'
+      })
+      await this.$put(this.api.updateSite, {
+        id: 4,
+        siteName: 'S³FEL英文站点'
+      })
+      await this.$put(this.api.updateSite, {
+        id: 5,
+        siteName: 'SRF中文站点'
+      })
+      await this.$put(this.api.updateSite, {
+        id: 6,
+        siteName: 'SRF英文站点'
+      })
+    },
     getData () {
       this.$post(this.api.site, {
         page: this.page,
@@ -90,13 +145,11 @@ export default {
       this.page = val
     },
     // 更改域名
-      update(row) {
+    async update (row) {
-        this.$put(this.api.updateSite, {
+      await this.$put(this.api.updateSite, {
         id: row.id,
         domainName: row.domainName
-        }).then(res => {
+      })
-          
-        }).catch(e => {})
     },
     // 前往网站首页
     toIndex (row) {
@@ -112,5 +165,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 </style>

src/plugins/auth/index.js

@@ -4,9 +4,12 @@
  * 用例：<Tag v-auth>text</Tag> 或者：<Tag v-auth="'编辑'">text</Tag>
  * */
 import store from '@/store'
+import Setting from '@/setting'
 
 export default {
   inserted(el, binding, vnode) {
+		// 开启了动态路由的需要根据权限筛选
+		if (!Setting.dynamicRoute) return false
     const val = binding.value
     // 如果有传值,判断是否有/，有就说说明传的是完整的值，否则就拿路由拼接传的值；如果没传值,就取按钮名字
     const text = val && val.includes('/') ? val : vnode.context.$route.path + ':' + (val || el.innerText)

src/setting.js

@@ -59,7 +59,7 @@ const Setting = {
     // 相同路由，不同参数间进行切换，是否强力更新
     sameRouteForceUpdate: false,
     // 是否使用动态路由(即角色权限,开启了的话就会取后端返回的权限树来显示头部导肮和页面按钮)
-    dynamicRoute: true
+    dynamicRoute: false
 };
 
 export default Setting;