diff --git a/index.html b/index.html index 7df0336..945d0cc 100644 --- a/index.html +++ b/index.html @@ -2,218 +2,224 @@ - - - - - - - - - 中科云 - - + #loader-wrapper .load_title span { + font-weight: normal; + font-style: italic; + font-size: 13px; + color: #FFF; + opacity: 0.5; + } + -
+
-
-
-
-
正在加载系统资源，请耐心等待
+
+
+
+
正在加载系统资源，请耐心等待
-
- +
+ \ No newline at end of file diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index e169dc6..50f0623 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -188,8 +188,8 @@ function listToString(list, separator) { separator = separator || ","; for (let i in list) { if (undefined !== list[i].url && list[i].url.indexOf("blob:") !== 0) { - strs += list[i].url.replace(baseUrl, "") + separator; - // strs += list[i].url + separator; + // strs += list[i].url.replace(baseUrl, "") + separator; + strs += list[i].url + separator; } } return strs != "" ? strs.substr(0, strs.length - 1) : ""; diff --git a/src/components/WebsiteHeader/index.vue b/src/components/WebsiteHeader/index.vue index e4bc81f..6087d76 100644 --- a/src/components/WebsiteHeader/index.vue +++ b/src/components/WebsiteHeader/index.vue @@ -212,8 +212,8 @@ function handlePage() { function handlePath(path) { pagePath.value = path; - // router.push(path); - window.open(path, "_blank"); + router.push(path); + // window.open(path, "_blank"); } function logout() { ElMessageBox.confirm("确定注销并退出系统吗？", "提示", { diff --git a/src/constant/dict.js b/src/constant/dict.js index bbc51bc..8ef8300 100644 --- a/src/constant/dict.js +++ b/src/constant/dict.js @@ -3,26 +3,26 @@ * @type {[{label: string, value: string, elTagType: string},{label: string, value: string, elTagType: string},{label: string, value: string, elTagType: string},{label: string, value: string, elTagType: string}]} */ export const serviceDemandStatusDict = [ - { - value: "0", - label: "待受理", - elTagType: "primary", - }, - { - value: "1", - label: "已受理", - elTagType: "success", - }, - { - value: "2", - label: "已驳回", - elTagType: "danger", - }, - { - value: "4", - label: "已结束", - elTagType: "warning", - }, + { + value: "0", + label: "待受理", + elTagType: "primary", + }, + { + value: "1", + label: "已受理", + elTagType: "success", + }, + { + value: "2", + label: "已驳回", + elTagType: "danger", + }, + { + value: "4", + label: "已结束", + elTagType: "warning", + }, ]; /** @@ -30,97 +30,112 @@ export const serviceDemandStatusDict = [ * @type {[{label: string, value: string, elTagType: string},{label: string, value: string, elTagType: string},{label: string, value: string, elTagType: string},{label: string, value: string, elTagType: string},{label: string, value: string, elTagType: string}]} */ export const technologyDemandStatusDict = [ - { - value: "0", - label: "待受理", - elTagType: "primary", - }, - { - value: "1", - label: "已发布", - elTagType: "success", - }, - { - value: "2", - label: "已驳回", - elTagType: "danger", - }, - { - value: "3", - label: "草稿箱", - elTagType: "primary", - }, - { - value: "4", - label: "已结束", - elTagType: "warning", - }, + { + value: "0", + label: "待受理", + elTagType: "primary", + }, + { + value: "1", + label: "已发布", + elTagType: "success", + }, + { + value: "2", + label: "已驳回", + elTagType: "danger", + }, + { + value: "3", + label: "草稿箱", + elTagType: "primary", + }, + { + value: "4", + label: "已结束", + elTagType: "warning", + }, ]; // 1->专利|2->成果|3->服务需求|4->专家|5->科研项目|6->论文 export const seeLogTypeDict = [ - { - value: "1", - label: "专利", - elTagType: "primary", - }, - { - value: "2", - label: "成果", - elTagType: "success", - }, + { + value: "1", + label: "专利", + elTagType: "primary", + }, + { + value: "2", + label: "成果", + elTagType: "success", + }, - { - value: "3", - label: "服务需求", - elTagType: "danger", - }, - { - value: "4", - label: "专家", - elTagType: "warning", - }, - { - value: "5", - label: "科研项目", - elTagType: "warning", - }, - { - value: "6", - label: "论文", - elTagType: "warning", - }, + { + value: "3", + label: "服务需求", + elTagType: "danger", + }, + { + value: "4", + label: "专家", + elTagType: "warning", + }, + { + value: "5", + label: "科研项目", + elTagType: "warning", + }, + { + value: "6", + label: "论文", + elTagType: "warning", + }, ]; // 订单类型(1创新币充值2活动报名) export const orderTypeDict = [ - { - value: "1", - label: "创新币充值", - elTagType: "primary", - }, - { - value: "2", - label: "活动报名", - elTagType: "success", - }, + { + value: "1", + label: "创新币充值", + elTagType: "primary", + }, + { + value: "2", + label: "活动报名", + elTagType: "success", + }, ]; // 发票申请状态(0->未申请1->已申请2->已处理) export const invoiceStatusDict = [ - { - value: "0", - label: "未申请", - elTagType: "warning", - }, - { - value: "1", - label: "已申请", - elTagType: "primary", - }, - { - value: "2", - label: "已处理", - elTagType: "success", - }, + { + value: "0", + label: "未申请", + elTagType: "warning", + }, + { + value: "1", + label: "已申请", + elTagType: "primary", + }, + { + value: "2", + label: "已处理", + elTagType: "success", + }, ]; + +// 课题角色（1：承担单位，2：参与单位） +export const subjectRoleDict = [ + { + value: "1", + label: "承担单位", + elTagType: "primary", + } + , + { + value: "2", + label: "参与单位", + elTagType: "success", + } +]; \ No newline at end of file diff --git a/src/utils/view_history.js b/src/utils/view_history.js index 93ca0f3..30625ae 100644 --- a/src/utils/view_history.js +++ b/src/utils/view_history.js @@ -9,7 +9,7 @@ export function addViewHistory(type, itemId, itemName) { } const enterpriseId = enterprise.id; const enterpriseName = enterprise.name; - const nickname = enterprise.userName; + const nickname = enterprise.username; const phone = enterprise.phone; addViewRecord({ type: type, diff --git a/src/views/admin/agent/bill/commission/withdraw-record.vue b/src/views/admin/agent/bill/commission/withdraw-record.vue index b15d1e3..ce578d8 100644 --- a/src/views/admin/agent/bill/commission/withdraw-record.vue +++ b/src/views/admin/agent/bill/commission/withdraw-record.vue @@ -1,5 +1,5 @@