Home Explore
原型工具、Api管理、Bug管理等 更多工具
 团队协作  快速原型  自动标注  Bug管理  Api管理
Sign In
zhuliang
/
DocSys
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

新增网站各页面标题

zhuliang 7 years ago
parent
aefbef83c8
commit
0efd5825db
24 changed files with 93 additions and 22 deletions
Unified View Show Diff Stats
  1. 5 1
      server/Application/Api/Controller/ItemController.class.php
  2. 2 0
      server/Application/Api/Controller/PageController.class.php
  3. 1 1
      web/index.html
  4. 1 1
      web/static/css/app.1ea2e47f41add6e7b3eb3e401850d181.css
  5. 4 4
      web/static/diff/diffview.js
  6. 0 1
      web/static/js/app.7893cf0c4189a30e91da.js
  7. 1 0
      web/static/js/app.b45f6cce297fc6d2311d.js
  8. 1 0
      web_src/src/components/catalog/index.vue
  9. 1 0
      web_src/src/components/item/Add.vue
  10. 6 3
      web_src/src/components/item/Index.vue
  11. 1 0
      web_src/src/components/item/Password.vue
  12. 1 0
      web_src/src/components/item/export/Index.vue
  13. 1 0
      web_src/src/components/item/setting/Index.vue
  14. 1 1
      web_src/src/components/item/show/show_regular_item/Index.vue
  15. 1 0
      web_src/src/components/item/show/show_single_page_item/Index.vue
  16. 2 3
      web_src/src/components/page/Diff.vue
  17. 1 1
      web_src/src/components/page/Index.vue
  18. 1 1
      web_src/src/components/user/Login.vue
  19. 1 0
      web_src/src/components/user/Register.vue
  20. 1 0
      web_src/src/components/user/ResetPassword.vue
  21. 1 0
      web_src/src/components/user/ResetPasswordByUrl.vue
  22. 1 0
      web_src/src/components/user/Setting.vue
  23. 54 1
      web_src/src/router/index.js
  24. 4 4
      web_src/static/diff/diffview.js

+ 5 - 1
server/Application/Api/Controller/ItemController.class.php
View File 

@@ -201,7 +201,11 @@ class ItemController extends BaseController {
 
         }
 
         }
 
 
 
         $items = $items ? $items : array();
 
         $items = $items ? $items : array();
 
-        $this->sendResult($items);
 
+        $res = [
 
+            'data_list' => $items,
 
+            'username'  => $login_user['username']
 
+        ];
 
+        $this->sendResult($res);
 
 
 
     }
 
     }

+ 2 - 0
server/Application/Api/Controller/PageController.class.php
View File 

@@ -21,6 +21,8 @@ class PageController extends BaseController {
 
         if ($page) {
 
         if ($page) {
 
            //unset($page['page_content']);
 
            //unset($page['page_content']);
 
            $page['addtime'] = date("Y-m-d H:i:s",$page['addtime']);
 
            $page['addtime'] = date("Y-m-d H:i:s",$page['addtime']);
 
+           $item = D("Item")->where('id',$page['item_id'])->find();
 
+           $page['item_name'] = $item['item_name'];
 
         }
 
         }
 
         $this->sendResult($page);
 
         $this->sendResult($page);
 
     }
 
     }

+ 1 - 1
web/index.html
View File 

@@ -4,4 +4,4 @@
 
       "server": window.location.protocol +'//'+ window.location.host + window.location.pathname+ '../server/index.php?s=',
 
       "server": window.location.protocol +'//'+ window.location.host + window.location.pathname+ '../server/index.php?s=',
 
       //"lang" :'en'
 
       //"lang" :'en'
 
       "lang" :'zh-cn'
 
       "lang" :'zh-cn'
 
-  }</script><link href=./static/css/app.1ea2e47f41add6e7b3eb3e401850d181.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.c40e244d08e2558b4f27.js></script><script type=text/javascript src=./static/js/app.7893cf0c4189a30e91da.js></script></body></html>
 
+  }</script><link href=./static/css/app.4112e0dcad470b584e8753a18d99e53c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.c40e244d08e2558b4f27.js></script><script type=text/javascript src=./static/js/app.b45f6cce297fc6d2311d.js></script></body></html>

File diff suppressed because it is too large
+ 1 - 1
web/static/css/app.1ea2e47f41add6e7b3eb3e401850d181.css


+ 4 - 4
web/static/diff/diffview.js
View File 

@@ -182,10 +182,10 @@ diffview = {
 
 			for (var i = 0; i < botrows.length; i++) rows.push(botrows[i]);
 
 			for (var i = 0; i < botrows.length; i++) rows.push(botrows[i]);
 
 		}
 
 		}
 
 		
 		
-		rows.push(node = ctelt("th", "author", "diff view generated by "));
 
-		node.setAttribute("colspan", inline ? 3 : 4);
 
-		node.appendChild(node2 = telt("a", "jsdifflib"));
 
-		node2.setAttribute("href", "http://github.com/cemerick/jsdifflib");
 
+		// rows.push(node = ctelt("th", "author", "diff view generated by "));
 
+		// node.setAttribute("colspan", inline ? 3 : 4);
 
+		// node.appendChild(node2 = telt("a", "jsdifflib"));
 
+		// node2.setAttribute("href", "http://github.com/cemerick/jsdifflib");
 
 		
 		
 		tdata.push(node = document.createElement("tbody"));
 
 		tdata.push(node = document.createElement("tbody"));
 
 		for (var idx in rows) rows.hasOwnProperty(idx) && node.appendChild(rows[idx]);
 
 		for (var idx in rows) rows.hasOwnProperty(idx) && node.appendChild(rows[idx]);

File diff suppressed because it is too large
+ 0 - 1
web/static/js/app.7893cf0c4189a30e91da.js


File diff suppressed because it is too large
+ 1 - 0
web/static/js/app.b45f6cce297fc6d2311d.js


+ 1 - 0
web_src/src/components/catalog/index.vue
View File 

@@ -219,6 +219,7 @@ export default {
 
 
 
   mounted(){
 
   mounted(){
 
     this.get_catalog();
 
     this.get_catalog();
 
+    document.title = this.$route.meta.title;
 
   }
 
   }
 
 }
 
 }
 
 </script>
 
 </script>

+ 1 - 0
web_src/src/components/item/Add.vue
View File 

@@ -130,6 +130,7 @@ export default {
 
     this.get_item_list();
 
     this.get_item_list();
 
     /*给body添加类，设置背景色*/
 
     /*给body添加类，设置背景色*/
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
+    document.title = this.$route.meta.title;
 
   },
 
   },
 
   beforeDestroy(){
 
   beforeDestroy(){
 
     /*去掉添加的背景色*/
 
     /*去掉添加的背景色*/

+ 6 - 3
web_src/src/components/item/Index.vue
View File 

@@ -7,7 +7,7 @@
 
       <el-row class="masthead">
 
       <el-row class="masthead">
 
 
 
           <div class="logo-title ">
 
           <div class="logo-title ">
 
-              <h2 class="muted"><img src="static/logo/b_64.png" style="width:40px;height:40px;margin-bottom:-12px;margin-right: 10px;" alt="">文档管理</h2>
 
+              <h2 class="muted"><img src="static/logo/b_64.png" style="width:40px;height:40px;margin-bottom:-12px;margin-right: 10px;" alt="">文档管理 - {{username}}</h2>
 
           </div>
 
           </div>
 
           <div class="header-btn-group pull-right">
 
           <div class="header-btn-group pull-right">
 
             <!--<el-button type="text"  @click="feedback">{{$t("feedback")}}</el-button>-->
 
             <!--<el-button type="text"  @click="feedback">{{$t("feedback")}}</el-button>-->
 
@@ -168,7 +168,8 @@ export default {
 
   data() {
 
   data() {
 
     return {
 
     return {
 
       currentDate: new Date(),
 
       currentDate: new Date(),
 
-      itemList:{}
 
+      itemList:{},
 
+      username:''
 
     };
 
     };
 
   },
 
   },
 
   methods:{
 
   methods:{
 
@@ -182,9 +183,11 @@ export default {
 
           .then(function (response) {
 
           .then(function (response) {
 
             if (response.data.error_code === 0 ) {
 
             if (response.data.error_code === 0 ) {
 
               //that.$message.success("加载成功");
 
               //that.$message.success("加载成功");
 
-              var json = response.data.data ;
 
+              var json = response.data.data.data_list ;
 
               that.itemList = json ;
 
               that.itemList = json ;
 
               that.bind_item_even();
 
               that.bind_item_even();
 
+              that.username = response.data.data.username;
 
+              document.title = response.data.data.username + ' - 文档管理分享平台 | ZhuLiang\'s Shared';
 
             }else{
 
             }else{
 
               that.$alert(response.data.error_message);
 
               that.$alert(response.data.error_message);
 
             }
 
             }

+ 1 - 0
web_src/src/components/item/Password.vue
View File 

@@ -90,6 +90,7 @@ export default {
 
   mounted() {
 
   mounted() {
 
     /*给body添加类，设置背景色*/
 
     /*给body添加类，设置背景色*/
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
+    document.title = this.$route.meta.title;
 
   },
 
   },
 
   beforeDestroy(){
 
   beforeDestroy(){
 
     /*去掉添加的背景色*/
 
     /*去掉添加的背景色*/

+ 1 - 0
web_src/src/components/item/export/Index.vue
View File 

@@ -134,6 +134,7 @@ export default {
 
     this.item_id = this.$route.params.item_id ;
 
     this.item_id = this.$route.params.item_id ;
 
     /*给body添加类，设置背景色*/
 
     /*给body添加类，设置背景色*/
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
+    document.title = this.$route.meta.title;
 
   },
 
   },
 
   beforeDestroy(){
 
   beforeDestroy(){
 
     /*去掉添加的背景色*/
 
     /*去掉添加的背景色*/

+ 1 - 0
web_src/src/components/item/setting/Index.vue
View File 

@@ -99,6 +99,7 @@ export default {
 
   beforeCreate() {
 
   beforeCreate() {
 
     /*给body添加类，设置背景色*/
 
     /*给body添加类，设置背景色*/
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
+    document.title = this.$route.meta.title;
 
   },
 
   },
 
   beforeDestroy(){
 
   beforeDestroy(){
 
     /*去掉添加的背景色*/
 
     /*去掉添加的背景色*/

+ 1 - 1
web_src/src/components/item/show/show_regular_item/Index.vue
View File 

@@ -142,7 +142,7 @@
 
               that.$nextTick(() => {
 
               that.$nextTick(() => {
 
                 that.page_id = page_id ;
 
                 that.page_id = page_id ;
 
               });
 
               });
 
-              
+              document.title = response.data.data.page_title + ' - ' + response.data.data.item_name + ' | 文档管理分享平台 | ZhuLiang\'s Shared';
 
             }else{
 
             }else{
 
               //that.$alert(response.data.error_message);
 
               //that.$alert(response.data.error_message);
 
             }
 
             }

+ 1 - 0
web_src/src/components/item/show/show_single_page_item/Index.vue
View File 

@@ -167,6 +167,7 @@ export default {
 
               //that.$message.success("加载成功");
 
               //that.$message.success("加载成功");
 
               that.content = response.data.data.page_content ;
 
               that.content = response.data.data.page_content ;
 
               that.page_title = response.data.data.page_title ;
 
               that.page_title = response.data.data.page_title ;
 
+              document.title = response.data.data.page_title + ' - ' + response.data.data.item_name + ' | 文档管理分享平台 | ZhuLiang\'s Shared';
 
             }else{
 
             }else{
 
               that.$alert(response.data.error_message);
 
               that.$alert(response.data.error_message);
 
             }
 
             }

+ 2 - 3
web_src/src/components/page/Diff.vue
View File 

@@ -129,9 +129,8 @@ export default {
 
 
 
       this.get_content();
 
       this.get_content();
 
       
       
-    })
 
-
 
-
 
+    });
 
+    document.title = this.$route.meta.title;
 
   }
 
   }
 
 }
 
 }
 
 </script>
 
 </script>

+ 1 - 1
web_src/src/components/page/Index.vue
View File 

@@ -125,7 +125,7 @@ export default {
 
               //that.$message.success("加载成功");
 
               //that.$message.success("加载成功");
 
               that.content = response.data.data.page_content ;
 
               that.content = response.data.data.page_content ;
 
               that.page_title = response.data.data.page_title ;
 
               that.page_title = response.data.data.page_title ;
 
-
 
+              document.title = response.data.data.page_title + ' - ' + response.data.data.item_name + ' | 文档管理分享平台 | ZhuLiang\'s Shared';
 
             }
 
             }
 
             else if (response.data.error_code === 10307 || response.data.error_code === 10303 ) {
 
             else if (response.data.error_code === 10307 || response.data.error_code === 10303 ) {
 
               //需要输入密码
 
               //需要输入密码

+ 1 - 1
web_src/src/components/user/Login.vue
View File 

@@ -40,7 +40,6 @@
 
 
 
 <script>
 
 <script>
 
 
 
-
 
 export default {
 
 export default {
 
   name: 'Login',
 
   name: 'Login',
 
   components : {
 
   components : {
 
@@ -97,6 +96,7 @@ export default {
 
   mounted() {
 
   mounted() {
 
     /*给body添加类，设置背景色*/
 
     /*给body添加类，设置背景色*/
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
+    document.title = this.$route.meta.title;
 
   },
 
   },
 
   beforeDestroy(){
 
   beforeDestroy(){
 
     /*去掉添加的背景色*/
 
     /*去掉添加的背景色*/

+ 1 - 0
web_src/src/components/user/Register.vue
View File 

@@ -96,6 +96,7 @@ export default {
 
   mounted() {
 
   mounted() {
 
     /*给body添加类，设置背景色*/
 
     /*给body添加类，设置背景色*/
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
+    document.title = this.$route.meta.title;
 
   },
 
   },
 
   beforeDestroy(){
 
   beforeDestroy(){
 
     /*去掉添加的背景色*/
 
     /*去掉添加的背景色*/

+ 1 - 0
web_src/src/components/user/ResetPassword.vue
View File 

@@ -77,6 +77,7 @@ export default {
 
   mounted() {
 
   mounted() {
 
     /*给body添加类，设置背景色*/
 
     /*给body添加类，设置背景色*/
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
+    document.title = this.$route.meta.title;
 
   },
 
   },
 
   beforeDestroy(){
 
   beforeDestroy(){
 
     /*去掉添加的背景色*/
 
     /*去掉添加的背景色*/

+ 1 - 0
web_src/src/components/user/ResetPasswordByUrl.vue
View File 

@@ -71,6 +71,7 @@ export default {
 
   mounted() {
 
   mounted() {
 
     /*给body添加类，设置背景色*/
 
     /*给body添加类，设置背景色*/
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
+    document.title = this.$route.meta.title;
 
   },
 
   },
 
   beforeDestroy(){
 
   beforeDestroy(){
 
     /*去掉添加的背景色*/
 
     /*去掉添加的背景色*/

+ 1 - 0
web_src/src/components/user/Setting.vue
View File 

@@ -154,6 +154,7 @@ export default {
 
     this.get_user_info();
 
     this.get_user_info();
 
     /*给body添加类，设置背景色*/
 
     /*给body添加类，设置背景色*/
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
     document.getElementsByTagName("body")[0].className="grey-bg";
 
+    document.title = this.$route.meta.title;
 
   },
 
   },
 
 
 
   beforeDestroy(){
 
   beforeDestroy(){

+ 54 - 1
web_src/src/router/index.js
View File 

@@ -19,93 +19,146 @@ import Catalog from '@/components/catalog/Index'
 
 import Notice from '@/components/notice/Index'
 
 import Notice from '@/components/notice/Index'
 
 
 
 
 
-Vue.use(Router)
 
+Vue.use(Router);
 
+
 
+const TITLE_SUFFIX = '文档管理分享平台 | ZhuLiang\'s Shared';
 
 
 
 export default new Router({
 
 export default new Router({
 
   routes: [
 
   routes: [
 
     {
 
     {
 
       path: '/',
 
       path: '/',
 
       name: 'Index',
 
       name: 'Index',
 
+      meta: {
 
+        title: TITLE_SUFFIX
 
+      },
 
       component: Index
 
       component: Index
 
     },
 
     },
 
     {
 
     {
 
       path: '/user/login',
 
       path: '/user/login',
 
       name: 'UserLogin',
 
       name: 'UserLogin',
 
+      meta: {
 
+        title: '登录 - ' + TITLE_SUFFIX
 
+      },
 
       component: UserLogin
 
       component: UserLogin
 
     },
 
     },
 
     {
 
     {
 
       path: '/user/setting',
 
       path: '/user/setting',
 
       name: 'UserSetting',
 
       name: 'UserSetting',
 
+      meta: {
 
+        title: '个人设置 - ' + TITLE_SUFFIX
 
+      },
 
       component: UserSetting
 
       component: UserSetting
 
     },
 
     },
 
     {
 
     {
 
       path: '/user/register',
 
       path: '/user/register',
 
       name: 'UserRegister',
 
       name: 'UserRegister',
 
+      meta: {
 
+        title: '注册 - ' + TITLE_SUFFIX
 
+      },
 
       component: UserRegister
 
       component: UserRegister
 
     },
 
     },
 
     {
 
     {
 
       path: '/user/resetPassword',
 
       path: '/user/resetPassword',
 
       name: 'UserResetPassword',
 
       name: 'UserResetPassword',
 
+      meta: {
 
+        title: '修改密码 - ' + TITLE_SUFFIX
 
+      },
 
       component: UserResetPassword
 
       component: UserResetPassword
 
     },
 
     },
 
     {
 
     {
 
       path: '/user/ResetPasswordByUrl',
 
       path: '/user/ResetPasswordByUrl',
 
       name: 'ResetPasswordByUrl',
 
       name: 'ResetPasswordByUrl',
 
+      meta: {
 
+        title: TITLE_SUFFIX
 
+      },
 
       component: ResetPasswordByUrl
 
       component: ResetPasswordByUrl
 
     },
 
     },
 
     {
 
     {
 
       path: '/item/index',
 
       path: '/item/index',
 
       name: 'ItemIndex',
 
       name: 'ItemIndex',
 
+      meta: {
 
+        title: TITLE_SUFFIX
 
+      },
 
       component: ItemIndex
 
       component: ItemIndex
 
     },
 
     },
 
     {
 
     {
 
       path: '/item/add',
 
       path: '/item/add',
 
       name: 'ItemAdd',
 
       name: 'ItemAdd',
 
+      meta: {
 
+        title: '新建项目 - ' + TITLE_SUFFIX
 
+      },
 
       component: ItemAdd
 
       component: ItemAdd
 
     },
 
     },
 
     {
 
     {
 
       path: '/item/password/:item_id',
 
       path: '/item/password/:item_id',
 
       name: 'ItemPassword',
 
       name: 'ItemPassword',
 
+      meta: {
 
+        title: '输入密码访问 - ' + TITLE_SUFFIX
 
+      },
 
       component: ItemPassword
 
       component: ItemPassword
 
     },
 
     },
 
     {
 
     {
 
       path: '/:item_id',
 
       path: '/:item_id',
 
       name: 'ItemShow',
 
       name: 'ItemShow',
 
+      meta: {
 
+        title: TITLE_SUFFIX
 
+      },
 
       component: ItemShow
 
       component: ItemShow
 
     },
 
     },
 
     {
 
     {
 
       path: '/item/export/:item_id',
 
       path: '/item/export/:item_id',
 
       name: 'ItemExport',
 
       name: 'ItemExport',
 
+      meta: {
 
+        title: '导出 - ' + TITLE_SUFFIX
 
+      },
 
       component: ItemExport
 
       component: ItemExport
 
     },
 
     },
 
     {
 
     {
 
       path: '/item/setting/:item_id',
 
       path: '/item/setting/:item_id',
 
       name: 'ItemSetting',
 
       name: 'ItemSetting',
 
+      meta: {
 
+        title: '项目设置 - ' + TITLE_SUFFIX
 
+      },
 
       component: ItemSetting
 
       component: ItemSetting
 
     },
 
     },
 
     {
 
     {
 
       path: '/page/:page_id',
 
       path: '/page/:page_id',
 
       name: 'PageIndex',
 
       name: 'PageIndex',
 
+      meta: {
 
+        title: TITLE_SUFFIX
 
+      },
 
       component: PageIndex
 
       component: PageIndex
 
     },
 
     },
 
     {
 
     {
 
       path: '/page/edit/:item_id/:page_id',
 
       path: '/page/edit/:item_id/:page_id',
 
       name: 'PageEdit',
 
       name: 'PageEdit',
 
+      meta: {
 
+        title: '页面编辑 - ' + TITLE_SUFFIX
 
+      },
 
       component: PageEdit
 
       component: PageEdit
 
     },
 
     },
 
     {
 
     {
 
       path: '/page/diff/:page_id/:page_history_id',
 
       path: '/page/diff/:page_id/:page_history_id',
 
       name: 'PageDiff',
 
       name: 'PageDiff',
 
+      meta: {
 
+        title: '历史版本对比 - ' + TITLE_SUFFIX
 
+      },
 
       component: PageDiff
 
       component: PageDiff
 
     },
 
     },
 
     {
 
     {
 
       path: '/catalog/:item_id',
 
       path: '/catalog/:item_id',
 
       name: 'Catalog',
 
       name: 'Catalog',
 
+      meta: {
 
+        title: '目录管理 - ' + TITLE_SUFFIX
 
+      },
 
       component: Catalog
 
       component: Catalog
 
     },
 
     },
 
     {
 
     {
 
       path: '/notice/index',
 
       path: '/notice/index',
 
       name: 'Notice',
 
       name: 'Notice',
 
+      meta: {
 
+        title: TITLE_SUFFIX
 
+      },
 
       component: Notice
 
       component: Notice
 
     },
 
     },
 
   ]
 
   ]

+ 4 - 4
web_src/static/diff/diffview.js
View File 

@@ -182,10 +182,10 @@ diffview = {
 
 			for (var i = 0; i < botrows.length; i++) rows.push(botrows[i]);
 
 			for (var i = 0; i < botrows.length; i++) rows.push(botrows[i]);
 
 		}
 
 		}
 
 		
 		
-		rows.push(node = ctelt("th", "author", "diff view generated by "));
 
-		node.setAttribute("colspan", inline ? 3 : 4);
 
-		node.appendChild(node2 = telt("a", "jsdifflib"));
 
-		node2.setAttribute("href", "http://github.com/cemerick/jsdifflib");
 
+		// rows.push(node = ctelt("th", "author", "diff view generated by "));
 
+		// node.setAttribute("colspan", inline ? 3 : 4);
 
+		// node.appendChild(node2 = telt("a", "jsdifflib"));
 
+		// node2.setAttribute("href", "http://github.com/cemerick/jsdifflib");
 
 		
 		
 		tdata.push(node = document.createElement("tbody"));
 
 		tdata.push(node = document.createElement("tbody"));
 
 		for (var idx in rows) rows.hasOwnProperty(idx) && node.appendChild(rows[idx]);
 
 		for (var idx in rows) rows.hasOwnProperty(idx) && node.appendChild(rows[idx]);