Merge branch 'master' of http://8.136.199.33:3000/eta_front/eta_front

src/lang/modules/ETATables/commonLang.js

@@ -4,6 +4,10 @@ export default {
       zh: "刷新",
       en: "Refresh",
     },
+    refreshing_btn: {
+      zh: "刷新中...",
+      en: "Refreshing...",
+    },
     download_btn: {
       zh: "下载",
       en: "Download",
@@ -44,6 +48,10 @@ export default {
       en: "Renew",
       zh: "更新",
     },
+    renewing_btn: {
+      en: "Renewing",
+      zh: "更新中...",
+    },
   },
   Msg: {
     is_del_table_msg: {

src/views/Home.vue

@@ -773,6 +773,21 @@ export default {
             return item.name === "数据报表";
           });
           this.$store.commit("SET_DATA_AUTH", bool_data);
+
+          // 需要确认是否有权限的路由 
+          /**
+           * Sysdatauth-手工数据权限
+           */
+          let shouldVerificationRoute=["Sysdatauth"]
+          shouldVerificationRoute.map(sMenu =>{
+            this.navlists.forEach(item =>{
+              if(item.children.some(menu => menu.path === sMenu || '/'+menu.path === sMenu)){
+                // 添加有权限的路由
+                this.$store.commit("ADD_PERMISSION_ROUTE", sMenu);
+                return
+              }
+            })
+          })
         }
       });
     },

src/views/dataEntry_manage/components/addTarget.vue

@@ -416,6 +416,9 @@ import {dataInterence} from 'api/api.js';
 			},
 			// 手工数据权限页面跳转
 			dataAuthorityJump(){
+				if(!this.$store.state.permissionRoute.includes('Sysdatauth')){
+					return this.$message.warning("暂无权限，请联系管理员开通“手工数据权限”菜单！")
+				}
 				this.$router.push('Sysdatauth')
 			}
 		},

src/views/datasheet_manage/mixedSheetEdit.vue

@@ -42,7 +42,7 @@
       </ul>
       <div>
         <span v-if="updateTime" style="color:#999999 ;">{{$t('OnlineExcelPage.recent_save_time_info')}}{{updateTime}}</span>
-        <el-button type="primary" size="medium" @click="()=>{ sheetInit=false;getDetail('refresh')}" style="margin-left:10px" icon="el-icon-refresh-right">{{$t('ETable.Btn.renew_btn')}}</el-button>
+        <el-button type="primary" size="medium" :loading="updating" @click="updateHandle" style="margin-left:10px" icon="el-icon-refresh-right">{{updating?$t('ETable.Btn.renewing_btn'):$t('ETable.Btn.renew_btn')}}</el-button>
         <el-button type="primary" size="medium" @click="saveSheetHandle" style="margin-left:10px" v-if="hasPermission">{{$t('ETable.Btn.save_btn')}}</el-button>
         <el-button type="primary" size="medium" plain @click="backHandle">{{$t('ETable.Btn.back_btn')}}</el-button>
       </div>
@@ -117,7 +117,9 @@ export default {
       updateTime: '',
       isCanEdit:false,
       // 取消自动保存，比如返回的时候
-      cancelAutoSave:false
+      cancelAutoSave:false,
+
+      updating:false,//更新状态
     }
   },
   methods: {
@@ -134,6 +136,9 @@ export default {
       const res = await sheetInterface.sheetDetail({
 				ExcelInfoId: Number(this.sheetId)
 			})
+      if(type==='refresh'){
+        this.updating=false
+      }
 
       if(res.Ret !== 200)  return
       this.isCanEdit = res.Data.CanEdit
@@ -247,6 +252,15 @@ export default {
       isAdd && this.$router.replace({path:'/addMixedSheet',query:{id:this.sheetId}})
     },300),
 
+    //更新
+    updateHandle(){
+      if(this.updating) return
+      this.updating=true
+      this.sheetInit=false
+      this.getDetail('refresh')
+    },
+    
+
     // markFinishStatus(){
     //   if((!this.sheetId) || (!this.isCanEdit)) return
     //   sheetInterface.markSheetEditStatus({ExcelInfoId: +this.sheetId,Status:2}).then(res=>{

src/views/datasheet_manage/sheetList.vue

@@ -199,7 +199,7 @@
                     v-if="sheetDetailInfo.Button.RefreshButton&&isSheetBtnShow('refresh')"
                   >
                   <img src="~@/assets/img/icons/refresh_blue_new.png"/>
-                    <span>{{$t('ETable.Btn.refresh_btn')}}</span>
+                    <span>{{sheetRefreshing?$t('ETable.Btn.refreshing_btn'):$t('ETable.Btn.refresh_btn')}}</span>
                   </li>
                   <li
                     class="editsty"
@@ -445,7 +445,9 @@ export default {
       autoSaveType:'',//自动保存类型，有的自动保存后需要其他操作
       cancelAutoSave:false, //自动保存时延迟的
 
-      isShowMe: false//只看我的
+      isShowMe: false,//只看我的
+
+      sheetRefreshing:false,//表格刷新状态
     };
   },
   watch: {
@@ -934,9 +936,12 @@ export default {
 
     /* 刷新表格 */
     refreshSheetEdb: _.debounce(async function () {
+      if(this.sheetRefreshing) return
+      this.sheetRefreshing=true
       const res = await sheetInterface.refreshCustomSheet({
         ExcelInfoId: this.sheetDetailInfo.ExcelInfoId,
       });
+      this.sheetRefreshing=false
 
       if (res.Ret !== 200) return;
       this.$message.success(this.$t('ETable.Msg.refresh_success_msg') );

src/views/mychart_manage/components/chartDetailDia.vue

@@ -224,6 +224,7 @@
                             type="number"
                             placeholder="上限"
                             v-model="chartLimit.max"
+                            :disabled="!isAllowEditLimit"
                             @change="changeLimit"
                         />
                         <el-input
@@ -232,6 +233,7 @@
                             type="number"
                             placeholder="下限"
                             v-model="chartLimit.min"
+                            :disabled="!isAllowEditLimit"
                             @change="changeLimit"
                         />
                     </div>
@@ -242,6 +244,7 @@
                             type="number"
                             placeholder="上限"
                             v-model="chartLimit.rightMax"
+                            :disabled="!isAllowEditLimit"
                             @change="changeLimit"
                         />
                         <el-input
@@ -250,6 +253,7 @@
                             type="number"
                             placeholder="下限"
                             v-model="chartLimit.rightMin"
+                            :disabled="!isAllowEditLimit"
                             @change="changeLimit"
                         />
                     </div>
@@ -261,6 +265,7 @@
                             type="number"
                             placeholder="上限"
                             v-model="chartLimit.rightTwoMax"
+                            :disabled="!isAllowEditLimit"
                             @change="changeLimit"
                         />
                         <el-input
@@ -269,6 +274,7 @@
                             type="number"
                             placeholder="下限"
                             v-model="chartLimit.rightTwoMin"
+                            :disabled="!isAllowEditLimit"
                             @change="changeLimit"
                         />
                     </div>

src/views/ppt_manage/mixins/pptEditorMixins.js

@@ -17,6 +17,9 @@ export default{
       copyPagesMap:{},//选中的ppt页Id
       savePagesArr:[],//存储上一次选中的ppt页
       CoverContent:'',//自定义封面页内容
+      showLastSaveTime:false,//是否展示自动保存时间
+      lastSaveTime:'',//自动保存时间
+      isSaved:false,//是否已点击了保存/发布
     }
   },
   directives: {

src/views/ppt_manage/newVersion/components/formatEl/SheetEl.vue

@@ -103,4 +103,4 @@ export default {
 			}
   }
 }
-</style>
+</style>

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -109,6 +109,9 @@
             </template>
         </div>
         <div class="ppt-tool flex-column">
+            <div class="save-hint" v-show="showLastSaveTime" 
+                style="color: #666; margin-bottom: 15px"
+            >最近保存时间:{{lastSaveTime}}</div>
             <div class="tool-btn">
                 <el-button v-permission="permissionBtn.pptPermission.ppt_publish"
                  type="primary" @click="handlePublish">{{$t('Slides.go_to_publish')}}</el-button>
@@ -278,6 +281,7 @@
 <script>
 import {countComponentName,checkClipboardItems,createRandomCode,checkPPTpageElemant,getChartInfo} from './utils/untils';
 import {modelInfo,defaultPosition} from './utils/config'
+import http from '@/api/http.js';
 import { dataBaseInterface ,sandInterface } from "@/api/api.js";
 import futuresInterface from '@/api/modules/futuresBaseApi';
 import chartRelevanceApi from '@/api/modules/chartRelevanceApi';
@@ -996,7 +1000,7 @@ export default {
         this.$refs[`pptPage_${this.currentIndex}`][0].initPositionInfo()
     },
     //手动保存PPT
-    handleSave(type){
+    async handleSave(type){
      /*  const {result,hintText} = this.checkPPT()
       if(!result){
         this.$message.warning(hintText)
@@ -1022,19 +1026,21 @@ export default {
         ImgUrl:BackgroundImg,
         TemplateType:BackIndex+1
       }
+      this.isSaved = true
       if(this.$route.query.id||this.pptId){
-        this.editPPT(FirstPage,Content,type)
+        await this.editPPT(FirstPage,Content,type)
       }else{
-        this.addPPT(FirstPage,Content)
+        await this.addPPT(FirstPage,Content)
       }
     },
-    addPPT(FirstPage,Content){
-      pptInterface.addppt({
+    async addPPT(FirstPage,Content){
+      await pptInterface.addppt({
         FirstPage:FirstPage,
         Content:Content,
         GroupId:this.catalogId,
         CoverContent:this.CoverContent
       }).then(res=>{
+        this.isSaved = false
         if(res.Ret===200){
           this.$message.success(this.$t('MsgPrompt.add_msg'))
           //this.$router.push({path:'/pptlist'})
@@ -1046,15 +1052,16 @@ export default {
         }
       })
     },
-    editPPT(FirstPage,Content,type){
+    async editPPT(FirstPage,Content,type){
       //console.log(type)
       const ppt_id = this.$route.query.id||this.pptId
-      pptInterface.editppt({
+      await pptInterface.editppt({
         PptId:parseInt(ppt_id),
         FirstPage:FirstPage,
         Content:Content,
         CoverContent:this.CoverContent
       }).then(res=>{
+        this.isSaved = false
         if(res.Ret===200){
           if(type==='save'){
             this.$message.success(this.$t('MsgPrompt.edit_msg'))
@@ -1093,7 +1100,11 @@ export default {
           FirstPage:FirstPage,
           Content:Content,
           CoverContent:this.CoverContent
-        }).then((res)=>{})
+        }).then((res)=>{
+            if(res.Ret!==200) return 
+            this.showLastSaveTime = true
+            this.lastSaveTime = http.dateFormatter(new Date(), true);
+        })
       },10000)
     },
     //保存时的校验规则:封面信息,至少一页
@@ -1133,16 +1144,7 @@ export default {
       return {result:true,hintText:''}
     },
     async handlePublish(){
-      if(!this.isSave){
-        this.$message.warning(this.$t('Slides.please_save_first')+'!' )
-        return
-      }else{
-        const {result,hintText} = this.checkPPT()
-        if(!result){
-          this.$message.warning(hintText)
-          return
-        }
-      }
+      //ETA1.7.5更改发布逻辑,点击发布时,自动执行保存操作,若可保存,则跳转发布页
       await this.handleSave('pub')
       //ppt4.0后,合并后的PPT可能会超出页数or图表限制,在这里做个校验
       if(this.pageList.length>this.maxPageNum){

src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -106,6 +106,9 @@
             </template>
         </div>
         <div class="ppt-tool flex-column">
+            <div class="save-hint" v-show="showLastSaveTime" 
+                style="color: #666; margin-bottom: 15px"
+            >最近保存时间:{{lastSaveTime}}</div>
             <div class="tool-btn">
                 <el-button v-permission="permissionBtn.enPPTPermission.pptEn_publish"
                  type="primary" @click="handlePublish">{{$t('Slides.go_to_publish')}}</el-button>
@@ -290,6 +293,7 @@
 <script>
 import {countComponentName,checkClipboardItems,createRandomCode,checkPPTpageElemant,getChartInfo} from './utils/untils';
 import {modelInfo,defaultPosition} from './utils/config'
+import http from '@/api/http.js';
 import { dataBaseInterface ,sandInterface } from "@/api/api.js";
 import futuresInterface from '@/api/modules/futuresBaseApi';
 import chartRelevanceApi from '@/api/modules/chartRelevanceApi';
@@ -999,7 +1003,7 @@ export default {
         this.$refs[`pptPage_${this.currentIndex}`][0].initPositionInfo()
     },
     //手动保存PPT
-    handleSave(type){
+    async handleSave(type){
       //保存走save_checkPPT,发布走checkPPT
       let checkResult = null
       if(type==='save'){
@@ -1018,19 +1022,21 @@ export default {
         ImgUrl:BackgroundImg,
         TemplateType:BackIndex+1
       }
+      this.isSaved = true
       if(this.$route.query.id||this.pptId){
-        this.editPPT(FirstPage,Content,type)
+        await this.editPPT(FirstPage,Content,type)
       }else{
-        this.addPPT(FirstPage,Content)
+        await this.addPPT(FirstPage,Content)
       }
     },
-    addPPT(FirstPage,Content){
-      pptEnInterface.addppt({
+    async addPPT(FirstPage,Content){
+      await pptEnInterface.addppt({
         FirstPage:FirstPage,
         Content:Content,
         GroupId:this.catalogId,
         CoverContent:this.CoverContent
       }).then(res=>{
+        this.isSaved = false
         if(res.Ret===200){
           this.$message.success(this.$t('MsgPrompt.add_msg'))
           this.isSave = true
@@ -1041,14 +1047,15 @@ export default {
         }
       })
     },
-    editPPT(FirstPage,Content,type){
+    async editPPT(FirstPage,Content,type){
       const ppt_id = this.$route.query.id||this.pptId
-      pptEnInterface.editppt({
+      await pptEnInterface.editppt({
         PptId:parseInt(ppt_id),
         FirstPage:FirstPage,
         Content:Content,
         CoverContent:this.CoverContent
       }).then(res=>{
+        this.isSaved = false
         if(res.Ret===200){
           if(type==='save'){
             this.$message.success(this.$t('MsgPrompt.edit_msg'))
@@ -1080,7 +1087,11 @@ export default {
           FirstPage:FirstPage,
           Content:Content,
           CoverContent:this.CoverContent
-        }).then((res)=>{})
+        }).then((res)=>{
+            if(res.Ret!==200) return 
+            this.showLastSaveTime = true
+            this.lastSaveTime = http.dateFormatter(new Date(), true);
+        })
       },10000)
     },
     //保存时的校验规则:封面信息,至少一页
@@ -1119,16 +1130,7 @@ export default {
       return {result:true,hintText:''}
     },
     async handlePublish(){
-      if(!this.isSave){
-        this.$message.warning(this.$t('Slides.please_save_first') )
-        return
-      }else{
-        const {result,hintText} = this.checkPPT()
-        if(!result){
-          this.$message.warning(hintText)
-          return
-        }
-      }
+      //ETA1.7.5更改发布逻辑,点击发布时,自动执行保存操作,若可保存,则跳转发布页
       await this.handleSave('pub')
       //ppt4.0后,合并后的PPT可能会超出页数or图表限制,在这里做个校验
       if(this.pageList.length>this.maxPageNum){

src/views/system_manage/departManage.vue

@@ -80,9 +80,9 @@
 					width="200"
 					align="center">
 						<template slot-scope="scope">
-							<el-tag size="small" 
+							<!-- <el-tag size="small" 
 								v-if="scope.row.LabelVal&&permissionBtn.checkPermissionBtn(permissionBtn.sysDepartPermission.sysDepart_saveUser_LabelVal)" 
-								:style="scope.row.LabelVal==1||scope.row.LabelVal==2?'color:#fff;background:#409EFF':'color:#409EFF;background:#ECF5FF'" style="position:absolute;left:10px">{{scope.row.LabelVal==1?$t('SystemManage.DepartManage.use_tag01'):scope.row.LabelVal==2?$t('SystemManage.DepartManage.use_tag02'):scope.row.LabelVal==3?$t('SystemManage.DepartManage.use_tag03'):scope.row.LabelVal==4?$t('SystemManage.DepartManage.use_tag04'):$t('SystemManage.DepartManage.use_tag05')}}</el-tag>
+								:style="scope.row.LabelVal==1||scope.row.LabelVal==2?'color:#fff;background:#409EFF':'color:#409EFF;background:#ECF5FF'" style="position:absolute;left:10px">{{scope.row.LabelVal==1?$t('SystemManage.DepartManage.use_tag01'):scope.row.LabelVal==2?$t('SystemManage.DepartManage.use_tag02'):scope.row.LabelVal==3?$t('SystemManage.DepartManage.use_tag03'):scope.row.LabelVal==4?$t('SystemManage.DepartManage.use_tag04'):$t('SystemManage.DepartManage.use_tag05')}}</el-tag> -->
 							<span style="position: relative;">{{scope.row.RealName}}</span>
 						</template>
 					</el-table-column>

src/views/system_manage/enAuthManage.vue

@@ -46,7 +46,7 @@
               {{ row[item.key] === 0 ? $t('SystemManage.EnAuthSet.enable') : $t('SystemManage.EnAuthSet.opened')  }}
             </span>
             <div v-else-if="item.key === 'RealName'">
-              <el-tag
+              <!-- <el-tag
                 size="small"
                 v-if="row.LabelVal"
                 :style="
@@ -66,7 +66,7 @@
                     ? $t('SystemManage.DepartManage.use_tag04')
                     : $t('SystemManage.DepartManage.use_tag05')
                 }}</el-tag
-              >
+              > -->
               <span style="position: relative">{{ row.RealName }}</span>
             </div>
             <span v-else>{{ row[item.key] }}</span>

src/vuex/index.js

@@ -7,7 +7,6 @@ import edb from "./modules/edb";
 import permissionButton from "./modules/permissionButton";
 import sheet from "./modules/sheet";
 
-
 // 应用初始状态
 const state = {
   theme: "#409EFF",
@@ -33,6 +32,7 @@ const state = {
   hasDoPageListening:false,
   // 是否有 试用用户行为权限
   hasTrialUserPermisson:false,
+  permissionRoute:[], //用于需要验证是否有某个菜单的权限
 };
 
 export default {

src/vuex/mutations.js

@@ -73,6 +73,10 @@ const mutations = {
     state.publicConfigs = filterObj; 
     setting.publicConfigs = state.publicConfigs;
   },
+  // 添加需要校验且有权限的路由
+  ADD_PERMISSION_ROUTE(state,route){
+    state.permissionRoute.push(route)
+  }
 };
 
 export default mutations;