checkout branch

src/lang/modules/Slides/commonLang.js

@@ -46,7 +46,7 @@ export const operationsZh = {
   operations_share: "设置共享",
   operations_unshare: "取消共享",
   operations_english: "转英文PPT",
-  operations_preview: "预览发布",
+  operations_preview: "去发布",
   operations_presentation: "演示",
   go_to_publish: "去发布",
   operations_save: "保存",

src/lang/modules/Slides/pptList.js

@@ -245,7 +245,7 @@ export const listZh = {
   last_save_time: "最近保存时间",
 
   //列表页操作栏
-  list_ppt_item_publish:'预览发布',
+  list_ppt_item_publish:'去发布',
   list_ppt_item_preview:'演示',
   list_ppt_item_download:'下载',
   list_ppt_item_edit:'编辑'

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -96,30 +96,7 @@
                 <span
                   style="display: flex; align-items: center"
                 >
-                <el-dropdown @command="handleShareCommand" v-if="data.PptVersion&&permissionBtn.isShowBtn('pptPermission','ppt_visible')">
-                  <img
-                    :src="data.isShare===1?require('@/assets/img/chart_m/User.png'):require('@/assets/img/chart_m/Group.png')"
-                    style="width: 14px; height: 14px; margin-right: 8px"
-                  />
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="{key:'cancel',item:data}"
-                      class="treenode-dropdown-item"
-                      :class="data.isShare===0?'treenode-dropdown-item-act':''" 
-                    >
-                      <img src="~@/assets/img/chart_m/Group.png"
-                        style="width: 14px; height: 14px; margin-right: 8px"
-                      />{{$t('Slides.visible_to_self_only')}}
-                    </el-dropdown-item>
-                    <el-dropdown-item :command="{key:'share',item:data}"
-                      class="treenode-dropdown-item"
-                      :class="data.isShare===1?'treenode-dropdown-item-act':''" 
-                    >
-                      <img src="~@/assets/img/chart_m/User.png"
-                        style="width: 14px; height: 14px; margin-right: 8px"
-                      />{{$t('Slides.visible_to_everyone')}}
-                    </el-dropdown-item>
-                  </el-dropdown-menu>
-                </el-dropdown>
+               
                 <el-dropdown @command="handleOperateCommand" trigger="click" v-if="checkDropDownShow(data.PptVersion===2?'ppt':'catalog')">
                   <span class="el-dropdown-link"> 
                     <i class="el-icon-more" style="font-size: 16px;transform: rotate(90deg);cursor: pointer"/>
@@ -131,7 +108,7 @@
                         :command="{key:'edit',item:data}" v-if="data.GroupId">{{$t('Slides.operations_rename')}}</el-dropdown-item>
                     <el-dropdown-item v-permission="permissionBtn.pptPermission.ppt_del"
                         :command="{key:'del',item:data}">{{$t('Slides.operations_delete')}}</el-dropdown-item>
-                    <el-dropdown-item :command="{key:'openShare',item:data}" v-if="data.PptVersion && !data.IsGrant && permissionBtn.isShowBtn('pptPermission','ppt_setShare')">{{$t('Slides.operations_share')}}</el-dropdown-item>
+                    <!-- <el-dropdown-item :command="{key:'openShare',item:data}" v-if="data.PptVersion && !data.IsGrant && permissionBtn.isShowBtn('pptPermission','ppt_setShare')">{{$t('Slides.operations_share')}}</el-dropdown-item> -->
                     <el-dropdown-item :command="{key:'cancelShare',item:data}" v-if="data.PptVersion && data.IsGrant && permissionBtn.isShowBtn('pptPermission','ppt_setShare')">{{$t('Slides.operations_unshare')}}</el-dropdown-item>
                     <el-dropdown-item v-permission="permissionBtn.pptPermission.ppt_toEn"
                         :command="{key:'transform',item:data}">{{$t('Slides.operations_english')}}</el-dropdown-item>
@@ -174,14 +151,14 @@
           </div>
         </div>
 
-        <div class="add-ppt" @click="handleCatalogChange({})" v-if="permissionBtn.isShowBtn('pptPermission','ppt_addCatalog')">
+        <!-- <div class="add-ppt" @click="handleCatalogChange({})" v-if="permissionBtn.isShowBtn('pptPermission','ppt_addCatalog')">
           <img
             src="~@/assets/img/set_m/add_ico.png"
             alt=""
             style="width: 16px; height: 16px; margin-right: 10px"
           />
           <span>{{$t('Slides.add_my_directory')}}</span>
-        </div>
+        </div> -->
       </div>
       <span class="slide-icon slide-left" @click="slideHandle">
           <i class="el-icon-d-arrow-left"></i>
@@ -213,6 +190,7 @@
                 <div class="item-image" 
                     :style="{'background-image':`url(${require('@/assets/img/ppt_m/list_bg.png')})`}">
                         <span>{{item.Title}}</span>
+                        <div class="status">{{getReportStatus(1)}}</div>
                 </div>
                 <div class="item-opt">
                     <span v-for="optItem in setListTool(item)" :key="optItem.key" @click.stop="handleListToolClick(optItem,item)">
@@ -248,10 +226,17 @@
         </div>
         <div class="tool-side ppt-page-wrap">
           <div class="ppt-info">
-            <div> {{$t('Slides.author_info')}}：{{pptItem.AdminRealName}}</div>
+            <div> 创建人：{{pptItem.AdminRealName}}</div>
             <div>
-              {{pptItem.PptxUrl? $t('Slides.publish_ab'):$t('Slides.save_info')}}
-              {{$t('Slides.time_info')}}：{{$moment(pptItem.PptxUrl?pptItem.PublishTime || undefined:pptItem.PptModifyTime || undefined).format('YYYY-MM-DD')}}
+              更新时间：<br/>
+              {{$moment(pptItem.PptModifyTime).format('YYYY-MM-DD HH:mm:ss')}}
+            </div>
+            <div>
+              发布时间：<br/>
+              {{$moment(pptItem.PublishTime).format('YYYY-MM-DD HH:mm:ss')}}
+            </div>
+            <div>
+              报告状态：{{getReportStatus(1)}}
             </div>
           </div>
           <div class="tool-list-operation">
@@ -438,6 +423,20 @@ export default {
     },
   },
   methods: {
+    //ppt状态
+    getReportStatus(state) {
+      const statusMap = new Map([
+        [1,'未发布'],
+        [2,'已发布'],
+        [3,'待提交'],
+        [4,'待审批'],
+        [5,'已驳回'],
+        [6,'已通过'],
+      ])
+      
+      return statusMap.get(state)||""
+    },
+
     //ppt列表操作栏
     getListMenuOptText(e){
         if(e==='预览发布') return this.$t('Slides.list_ppt_item_publish')
@@ -1601,6 +1600,13 @@ export default {
               color: #FFFFFF;
               /* font-weight: bold; */
             }
+            .status {
+              position: absolute;
+              top: 0;
+              left: 0;
+              padding: 5px 15px;
+              background: #ECECEC;
+            }
           }
           .item-opt{
             display:flex;
@@ -1639,10 +1645,13 @@ export default {
         }
         .ppt-info{
           font-size: 14px;
-          color: rgba($color: #000000, $alpha: 0.54);
+          color: rgba($color: #000000, $alpha: 0.7);
           margin-bottom: 5px;
           padding: 16px 12px;
           border-bottom: 2px solid rgba($color: #333333, $alpha: 0.03);
+          >div {
+            margin: 5px 0;
+          }
         }
         .tool-list-operation{
           padding: 0 20px 20px;

src/views/ppt_manage/newVersion/utils/config.js

@@ -621,22 +621,22 @@ export const toolList = [
         label:'下载',
         key:'download'
     },
-    {
-        label:'',
-        key:'transform'
-    },
-    {
-      label:'转英文PPT',
-      key:'transEn'
-    },
+    // {
+    //     label:'',
+    //     key:'transform'
+    // },
+    // {
+    //   label:'转英文PPT',
+    //   key:'transEn'
+    // },
     {
         label:'编辑',
         key:'edit'
     },
-    {
-        label:'复制',
-        key:'copy'
-    },
+    // {
+    //     label:'复制',
+    //     key:'copy'
+    // },
     {
         label:'删除',
         key:'delete'

src/views/ppt_manage/newVersion/utils/untils.js

@@ -1,5 +1,6 @@
 import { modelMap,pptLayout,pptSlideMaster,pptSlideMasterEn } from "./config";
 import { parse } from "himalaya";
+import md5 from "@/utils/md5.js";
 //根据modelId返回组件名,用于component:is
 export const countComponentName = (modelId,type)=>{
     let componentName = type==='pre'?'formatPre':'format'
@@ -291,7 +292,8 @@ export const changeCatalogArr = (arr)=>{
     const randomIndex = Math.floor(Math.random() * maxLen)
     ret += charset[randomIndex]
   }
-  return ret
+  let timp = new Date().getTime()
+  return md5.hex_md5(`${ret}${timp}`)
 }
 //计算各个版式下,文本框占据的真实宽度
 //基准:编辑页ppt-item的最大宽高:w:900px;h:630