Merge branch 'edb_dev' into debug

src/views/dataEntry_manage/databaseComponents/operationDialog.vue

@@ -868,8 +868,10 @@ export default {
             if(this.tableData[0].EdbType===2){
                 this.$emit('lookHistory',this.select_target)
             }else{
-                const {ClassifyId,UniqueCode,EdbInfoId} = this.tableData[0]
-                let {href} = this.$router.resolve({path:`/database`,query:{code:UniqueCode,id:EdbInfoId,classifyId:ClassifyId}});
+                const {ClassifyId,UniqueCode,EdbInfoId,HaveOperaAuth} = this.tableData[0]
+								if(!HaveOperaAuth) return this.$message.warning('暂无指标权限')
+
+                let {href} = this.$router.resolve({path:'/edbBasicbase',query:{code:UniqueCode,id:EdbInfoId,classifyId:ClassifyId}});
                 window.open(href,'_blank');
             }
         },

src/views/dataEntry_manage/databaseComponents/smoothEdbDialog.vue

@@ -560,8 +560,10 @@ export default {
             if(this.tableData[0].EdbType===2){
                 this.$emit('lookHistory',this.select_target)
             }else{
-                const {ClassifyId,UniqueCode,EdbInfoId} = this.tableData[0]
-                let {href} = this.$router.resolve({path:`/database`,query:{code:UniqueCode,id:EdbInfoId,classifyId:ClassifyId}});
+                const {ClassifyId,UniqueCode,EdbInfoId,HaveOperaAuth} = this.tableData[0]
+                if(!HaveOperaAuth) return this.$message.warning('暂无指标权限')
+                
+                let {href} = this.$router.resolve({path:'/edbBasicbase',query:{code:UniqueCode,id:EdbInfoId,classifyId:ClassifyId}});
                 window.open(href,'_blank');
             }
         },