diff --git a/.env.development b/.env.development
index c0a38b2..7ab15e0 100644
--- a/.env.development
+++ b/.env.development
@@ -5,3 +5,4 @@ ENV = 'development'
VUE_APP_BASE_API = http://weiyuan-ziliao-test.ali251.langye.net
VUE_APP_UPLOAD_API = http://weiyuan-ziliao-test.ali251.langye.net/api/admin/upload-file
VUE_APP_AUTH_BASE_API = https://sso.szhct.edu.cn/cas/oauth2.0/authorize
+VUE_APP_VIEW_API=http://view.ali251.langye.net:8012/onlinePreview
diff --git a/.env.production b/.env.production
index 290ec08..13e9049 100644
--- a/.env.production
+++ b/.env.production
@@ -1,7 +1,11 @@
# just a flag
-ENV = 'production'
+ENV='production'
# base api
-VUE_APP_BASE_API = http://weiyuan-ziliao-test.ali251.langye.net
-VUE_APP_UPLOAD_API = http://weiyuan-ziliao-test.ali251.langye.net/api/admin/upload-file
-VUE_APP_AUTH_BASE_API = https://sso.szhct.edu.cn/cas/oauth2.0/authorize
+#VUE_APP_BASE_API=http://192.168.105.242
+VUE_APP_BASE_API = https://zlhb.szhct.edu.cn
+#VUE_APP_UPLOAD_API=http://192.168.105.242/api/admin/upload-file
+VUE_APP_UPLOAD_API = https://zlhb.szhct.edu.cn/api/admin/upload-file
+VUE_APP_AUTH_BASE_API=https://sso.szhct.edu.cn/cas/oauth2.0/authorize
+#VUE_APP_AUTH_BASE_API = https://zlhb.szhct.edu.cn/cas/oauth2.0/authorize
+VUE_APP_VIEW_API=https://zlhbview.szhct.edu.cn/onlinePreview
diff --git a/src/components/XyTinymce/index.vue b/src/components/XyTinymce/index.vue
index eb2dda5..d7b9cae 100644
--- a/src/components/XyTinymce/index.vue
+++ b/src/components/XyTinymce/index.vue
@@ -1,141 +1,141 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/permission.js b/src/permission.js
index bbb9385..484efb3 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,9 @@ router.beforeEach(async(to, from, next) => {
})
} else {
let redirectUri = encodeURIComponent(window.location.href)
- window.location.href = `${process.env.VUE_APP_AUTH_BASE_API}?client_id=d05e4c9d07f705ef&redirect_uri=${redirectUri}&response_type=code&scope=base_api&state=wyd`
+ let client_id = 'db85478e4dd36937'
+ //let client_id = 'd05e4c9d07f705ef' dev
+ window.location.href = `${process.env.VUE_APP_AUTH_BASE_API}?client_id=${client_id}&redirect_uri=${redirectUri}&response_type=code&scope=base_api&state=wyd`
}
}
diff --git a/src/views/component/dialog.vue b/src/views/component/dialog.vue
index e4c5c8e..7dc8f50 100644
--- a/src/views/component/dialog.vue
+++ b/src/views/component/dialog.vue
@@ -398,7 +398,7 @@ export default {
res[i._relations.link_with_name] instanceof Array
? res[i._relations.link_with_name].map((i) => {
return {
- name: i?.name,
+ name: i?.original_name,
url: i?.url,
response: i,
};
diff --git a/src/views/component/tableExamine.vue b/src/views/component/tableExamine.vue
index da330e6..1ef013c 100644
--- a/src/views/component/tableExamine.vue
+++ b/src/views/component/tableExamine.vue
@@ -620,7 +620,7 @@ export default {
prop: i.field,
label: i.name,
width: i.width,
- fixed: i.field === 'biaoti' ? 'left' : 'center',
+ align: i.field === 'biaoti' ? 'left' : 'center',
},
linkOb
);
diff --git a/src/views/flow/flow.vue b/src/views/flow/flow.vue
index 9e25f15..806403e 100644
--- a/src/views/flow/flow.vue
+++ b/src/views/flow/flow.vue
@@ -14,6 +14,7 @@
:before-upload="beforeUpload"
:on-success="onSuccess"
:on-remove="onRemove"
+ multiple
:on-error="onError">
选取文件
上传到服务器
@@ -83,7 +84,13 @@ export default {
watch: {
'form.id_material_fujian_uploads_material_id_relation': {
handler (newVal) {
- this.fileList = newVal
+ this.fileList = newVal.map(i => {
+ return {
+ name: i?.original_name,
+ url: i?.url,
+ response: i,
+ }
+ })
},
deep: true
}
diff --git a/src/views/reception/detail/index.vue b/src/views/reception/detail/index.vue
index 8fed1e0..3674ebe 100644
--- a/src/views/reception/detail/index.vue
+++ b/src/views/reception/detail/index.vue
@@ -97,7 +97,7 @@ export default {
}).catch(err => this.loading = false)
},
open(e) {
- this.codeUri = `http://view.ali251.langye.net:8012/onlinePreview?url=${encodeURIComponent(
+ this.codeUri = `${process.env.VUE_APP_VIEW_API}?url=${encodeURIComponent(
new Buffer(e.url).toString("base64")
)}`;
@@ -166,6 +166,9 @@ export default {
position: relative;
left: 50%;
}
+ .content {
+ overflow: scroll;
+ }
.file {
margin-top: 10px;
diff --git a/src/views/reception/home/index.vue b/src/views/reception/home/index.vue
index 1ac4734..2e5d55c 100644
--- a/src/views/reception/home/index.vue
+++ b/src/views/reception/home/index.vue
@@ -250,7 +250,7 @@ export default {
},
methods: {
open (e) {
- this.codeUri = `http://view.ali251.langye.net:8012/onlinePreview?url=${encodeURIComponent(new Buffer(e.url).toString('base64'))}`
+ this.codeUri = `${process.env.VUE_APP_VIEW_API}?url=${encodeURIComponent(new Buffer(e.url).toString('base64'))}`
this.showModal = true
//window.open(`http://view.ali251.langye.net:8012/onlinePreview?url=${codeUri}`)
diff --git a/src/views/reception/list1/index.vue b/src/views/reception/list1/index.vue
index 8f341b4..8ec2404 100644
--- a/src/views/reception/list1/index.vue
+++ b/src/views/reception/list1/index.vue
@@ -57,7 +57,7 @@
:command="item"
v-for="item in uploadsList"
>
- {{ item.name }}
+ {{ item.original_name }}
@@ -236,7 +236,7 @@ export default {
},
open(e) {
- this.codeUri = `http://view.ali251.langye.net:8012/onlinePreview?url=${encodeURIComponent(
+ this.codeUri = `${process.env.VUE_APP_VIEW_API}?url=${encodeURIComponent(
new Buffer(e.url).toString("base64")
)}`;