From c18624983ce7e6a6dfcaed1ef2abc7c17d2cb0c8 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 12 Dec 2022 03:08:51 +0800 Subject: [PATCH 1/8] =?UTF-8?q?--=20=E8=B5=84=E6=BA=90=E5=BD=92=E5=B1=9E?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/vue.config.js b/vue.config.js index 341e4b39..23d6b8f8 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,22 +6,27 @@ * @FilePath: /fe-manage/vue.config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -const { defineConfig } = require("@vue/cli-service"); +const {defineConfig} = require("@vue/cli-service"); + module.exports = defineConfig({ - publicPath: "/manage", - // transpileDependencies: true, - devServer: { - port: 8080, - proxy: { - "/manageApi": { - target:"http://111.231.196.214:30001/", - changeOrigin: true, //表示是否改变原域名 - // secure: false, - // ws: false, //表示WebSocket协议 - pathRewrite: { - "^/manageApi": "", - }, - }, - }, - }, + publicPath: "/manage", + // transpileDependencies: true, + // devServer: { + // port: 8080, + // proxy: { + // "/manageApi": { + // target: "http://localhost:30001/", + // changeOrigin: true, //表示是否改变原域名 + // // secure: false, + // // ws: false, //表示WebSocket协议 + // pathRewrite: { + // "^/manageApi": "", + // }, + // }, + // "/userbasic": { + // target: "https://u-pre.boe.com", + // changeOrigin: true, + // }, + // }, + // }, }); From 2e78827971c18a3863d15c15211382b3bfc6cae8 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 12 Dec 2022 23:17:13 +0800 Subject: [PATCH 2/8] =?UTF-8?q?--=20=E7=BB=84=E7=BB=87=E4=B8=8D=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjCheckPower.vue | 57 +++++++++++------------ 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue index 3f3779e6..2e4271e9 100644 --- a/src/components/drawers/ProjCheckPower.vue +++ b/src/components/drawers/ProjCheckPower.vue @@ -143,32 +143,32 @@ style="overflow-y: auto" >
-
-
组织：
- -
-
-
-
- -
-
搜索
-
-
-
- -
-
重置
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
评估设置 diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue index b5d214fc..9babe163 100644 --- a/src/views/examine/CourseReviewed.vue +++ b/src/views/examine/CourseReviewed.vue @@ -14,6 +14,7 @@
+ + + +
+
--> +
{ state.pathName = ""; state.pathBg = ""; - state.pathBgId = ""; + state.pathBgId =1; state.organizationSelectName = null; state.organizationSelectId = null; state.pathIntro = ""; @@ -1620,14 +1622,21 @@ export default { state.organizationSelectId = detail.organizationId; state.pathIntro = detail.remark; state.editPathId = id; - // console.log("state.imgData", state.imgData); - let arr = imgData; - for (let i = 0; i < arr.length; i++) { - // console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg); - if (arr[i].dictValue === state.pathBg) { - state.pathBgId = arr[i].dictCode; + let arr = imgData.value; + arr.forEach((item) => { + if (item.dictValue === state.pathBg) { + state.pathBgId = item.dictCode; + } - } + }); + + //for (let i = 0; i < arr.length; i++) { + // console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg); + // if (arr[i].dictValue === state.pathBg) { + // state.pathBgId = arr[i].dictCode; + + // } + // } } }) .catch((err) => { diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index f641a035..aaab9c1e 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -44,7 +44,7 @@ >
-
创建时间：
+
项目起止时间：
{value.state === "2" ? (
+ { /**
{ handleToManagepage(value, "/managepage"); @@ -433,6 +434,7 @@ export default { > 管理
+ */ }
{ From d9608d69e37f32bd53d60a8176c88784f6356716 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Tue, 13 Dec 2022 17:56:18 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + src/components/BreadCrumb.vue | 2 +- src/views/courselibrary/courseModal.vue | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5e297b87..92a8e40b 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ package-lock.json src/api/config.js src/api/config.js src/api/config.js +src/api/config.js diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 65dbfae8..b5e57c20 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -70,7 +70,7 @@ export default { href: "/leveladd", }, { - name: "管理", + name: "关卡", }, ]; } diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index 104673b8..adf79a38 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -426,7 +426,7 @@ export default defineComponent({ hideshow: true, ft_eidt: false, attach: "", - validate:false, + validate:true, ft_hs: false, addLoading: false, statusJuJue: 0,