Merge branch 'qll' into dev

src/api/metadata/index.js

 import request from '@/utils/request'
-import { requestPath } from '@/utils/global.js'
+import { requestPath ,uploadUrl} from '@/utils/global.js'
 
 // export function getListAPI(params) { //元数据丰富化列表
 //     return request({
@@ -81,7 +81,7 @@ export function importTimerAPI(data) { //导入时间实体
     return request({
         url: `${requestPath.resource}/participle/save/time`,
         method: 'post',
-        data
+        data,
     })
 }
 export function addEntityAPI(data) { //新增实体
@@ -105,3 +105,9 @@ export function backDetialAPI(params) { //回显实体
         params
     })
 }
+export function changeAPI(params) { //转化文件类型是否成功了
+    return request({
+        url: `${uploadUrl}is-exist?fileName=${params}`,
+        method: 'get',
+    })
+}

src/utils/global.js

@@ -16,11 +16,6 @@ export const requestPath = {
         // ipPort:'http://192.168.2.7:8096',
 }
 
-// export const uploadUrl = `http://rsks.class.com.cn/file/`
-// export const uploadUrl = `http://122.14.50.6:8096/file/`
-// export const uploadUrl = `http://192.168.2.231/file/file/`
-// export const uploadUrl = `http://test16.zhongdianyun.com/file/file/`
-// export const uploadUrl = `http://192.168.2.235/file/file/`
 export const uploadUrl = `http://192.168.2.175:8808/file/file/`
 export const uploadEbook = `http://test16.zhongdianyun.com:8808/file/`
     // BASE_API: '"http://rsks.class.com.cn"'

src/views/draw/metadata/detail.vue

@@ -31,7 +31,10 @@
 							
 						</div>
 						<div style="width:80%;margin:0 auto;height:800px" v-else>
-							<iframe :src="`${domain}${pdf.pdfName}`" frameborder="0" width="100%" height="100%"></iframe>
+							<iframe :src="`${domain}${pdf.pdfName}`" frameborder="0" width="100%" height="100%" v-if="changeFleg"></iframe>
+							<div v-else style="text-align:center">
+									<img src="~@/assets/img/noChange_pic.png" alt="数据加载图">
+							</div>
 						</div>
 					</div>
 				</el-tab-pane>
@@ -494,7 +497,7 @@ import {
 	importOrganizationAPI,importTimerAPI,
 	addEntityAPI,
 	metadataAPI,
-	backDetialAPI} from '@/api/metadata/index'
+	backDetialAPI,changeAPI} from '@/api/metadata/index'
 export default {
 	name: 'metadataDetail',
 	components:{ Tinymce ,pagination},
@@ -639,7 +642,8 @@ export default {
 				Resourceid:'',
 				pageNum: 1,
         pageSize: 30,
-			}
+			},
+			changeFleg:false,//转换的开关
 		}
 	},
 	mounted() {
@@ -650,6 +654,7 @@ export default {
 		this.entityForm.resourceId=this.$route.query.id;
 		this.getDetail();
 		this.getPerson();
+		
 	},
 	methods: {
 		//window.open(`${this.domain}${requestPath.file}?fileName=${val}&isOnLine=true`)
@@ -670,8 +675,14 @@ export default {
 					let {createTime,createrName,fileName,name,text}=res.data.data;
 					this.pdf=res.data.data;
 					this.resourceForm.summary=text;
+					changeAPI(this.pdf.pdfName).then(res=>{
+						if(res.data.code==0){
+							this.changeFleg=res.data.data||false;
+						}else{
+							this.$message.error('文件转换失败');
+						}
+					})
 					//this.pdf.fileName=`${this.domain}${requestPath.file}?fileName=${fileName}&isOnLine=true`;
-					console.log(this.pdf.fileName,9999)
 				}else{
 					this.$message.error('获取失败')
 				}

src/views/layout/components/Navbar.vue

@@ -293,7 +293,7 @@ export default {
 .navbar {
   width: 100%;
   position: fixed;
-  z-index: 999;
+  z-index:2001;
   .logo-text{
     color:aliceblue;
     float: left;