Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

.env

@@ -0,0 +1,11 @@
+VITE_BASE=/manage
+VITE_BASE_API=/
+VITE_PROXY_URL=http://111.231.196.214:30001/
+VITE_LOGIN_URL=https://u-pre.boe.com/web
+
+
+VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u-pre.boe.com

.env.boe

@@ -0,0 +1,9 @@
+VITE_BASE=/manage
+VITE_BASE_API=/manageApi
+
+
+VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u-pre.boe.com

.env.prod

@@ -0,0 +1,8 @@
+VITE_BASE=/fe-student-release
+VITE_BASE_API=/manageApi-release
+
+VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u.boe.com

.env.release

@@ -0,0 +1,10 @@
+VITE_BASE=/fe-student-release
+VITE_BASE_API=/manageApi-release
+VITE_LOGIN_URL=https://u.boe.com/web
+
+
+VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u.boe.com

.env.test

@@ -0,0 +1,9 @@
+VITE_BASE=/fe-student
+VITE_BASE_API=/manageApi
+
+
+VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u-pre.boe.com

package.json

@@ -5,7 +5,10 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
-		"lint": "vue-cli-service lint"
+    "build:boe": "vue-cli-service build --mode boe",
+    "build:release": "vue-cli-service build --mode release",
+    "build:prod": "vue-cli-service build --mode prod",
+    "build:test": "vue-cli-service build --mode test"
   },
   "dependencies": {
     "@wangeditor/editor": "^5.1.23",

src/App.vue

@@ -44,7 +44,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.9.13------------");
+    console.log("版本0.9.14------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });

src/api/config.js

@@ -2,12 +2,13 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-14 09:04:31
+ * @LastEditTime: 2022-12-14 20:56:10
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 import { message } from "ant-design-vue";
 import axios from "axios";
+import router from "@/router";
 // import { getCookie } from '../api/method'
 // const Qs = require("qs");
 
@@ -16,7 +17,7 @@ import axios from "axios";
 
 axios.defaults.withCredentials = true;
 const http = axios.create({
-  baseURL: "/manageApi",
+  baseURL: process.env.VITE_BASE_API,
   timeout: 1000 * 15,
   // headers: { "Content-Type": "multipart/form-data" },
   headers: { "Content-Type": "application/json" },
@@ -56,8 +57,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        // window.open("https://u-pre.boe.com/web/", '_self');
-        // window.open("http://111.231.196.214:12013/manage/login", '_self');
+        process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VITE_LOGIN_URL)
       }
       console.log("api %o", msg);
     }

src/api/method.js

@@ -277,6 +277,9 @@ const organizationalTree = []
 
 //嵌套页面
 const iframeUrl = "https://u-pre.boe.com/pc/iframe"
+//学员端路由
+const studentUrl = 'https://u-pre.boe.com/pc/loading'
+
 //二维码
 const codeUrl = "https://u-pre.boe.com"
 export {
@@ -292,5 +295,6 @@ export {
     commonData,
     organizationalTree,
     iframeUrl,
+    studentUrl,
     codeUrl,
 }

src/components/NavTop.vue

@@ -61,7 +61,7 @@
 import { reactive, toRefs } from "vue";
 import DownLoad from "../components/drawers/DownLoad";
 import * as api from "../api/index1";
-
+import { studentUrl } from "../api/method";
 export default {
   name: "NavTop",
   components: {
@@ -81,7 +81,7 @@ export default {
         {
           id: 2,
           name: "学员",
-          go: "https://u.boe.com/pc/uc/study/courses",
+          go: studentUrl,
         },
       ],
 

src/components/drawers/AddProject.vue

@@ -54,7 +54,7 @@
               </div>
             </div>
           </div>
-          <div class="mi_btns" style="margin-left:0px;">
+          <div class="mi_btns" style="margin-left: 0px">
             <div class="btn btn1">
               <div class="search"></div>
               <div class="btnText" @click="searchProjectList()">搜索</div>
@@ -225,8 +225,9 @@
 import { reactive, toRefs } from "vue";
 import { RouterEditTask } from "@/api/indexTask";
 import { message } from "ant-design-vue";
-import * as apiProj from "../../api/index.js";
+// import * as apiProj from "../../api/index.js";
 import dayjs from "dayjs";
+import * as indexAudit from "../../api/indexAudit";
 
 export default {
   name: "AddProject",
@@ -400,8 +401,8 @@ export default {
     // TODO 这里后续需要给接口或者改动
     // 获取所有，确定分页位置
     const getCurrentPage = () => {
-      apiProj
-        .getProjectList({
+      indexAudit
+        .auditlist({
           createName: state.inputV1,
           manager: state.inputV2,
           name: state.inputV3,
@@ -450,8 +451,8 @@ export default {
         status: 3,
       });
 
-      apiProj
-        .getProjectList({
+      indexAudit
+        .auditlist({
           createName: state.inputV3,
           manager: state.inputV2,
           name: state.inputV1,
@@ -991,7 +992,6 @@ export default {
         color: #fff;
       }
     }
-    
   }
 }
 </style>

src/components/project/OrgClass.vue

@@ -23,7 +23,7 @@
   </a-tree-select>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import {computed, defineEmits, defineProps} from "vue";
 import {useStore} from "vuex";
 
 const store = useStore();
@@ -33,16 +33,12 @@ const props = defineProps({
 })
 const emit = defineEmits({})
 
-const options = ref([])
+const options = computed(() => store.state.orgtreeList)
 
 const id = computed(() => {
   return props.value
 })
 
-onMounted(() => {
-  options.value = [...store.state.orgtreeList]
-})
-
 function change(key, obj) {
   emit('update:name', obj[0])
   emit('update:value', key)

src/router/index.js

@@ -17,7 +17,7 @@ const routes = [
 	...routesConfig
 ]
 const router = createRouter({
-	history: createWebHistory("/manage/"),
+	history: createWebHistory(process.env.VITE_BASE),
 	routes,
 
 })

src/views/projectcenter/ProjectAdd.vue

@@ -36,12 +36,19 @@
               class="nameimg"
               src="../../assets/images/basicinfo/asterisk.png"
             />
-            <div class="inname">项目名称</div>
+            <div class="inname">
+              {{ ptojectType == 3 ? "班级名称" : "项目名称" }}
+            </div>
           </div>
           <div class="in">
-            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name"
-                       v-model:validate="projectInfo.validate" :maxlength="30" show-count
-                       :id="projectInfo.projectId"></NameInput>
+            <NameInput
+              placeholder="请输入项目名称"
+              v-model:value="projectInfo.name"
+              v-model:validate="projectInfo.validate"
+              :maxlength="30"
+              show-count
+              :id="projectInfo.projectId"
+            ></NameInput>
           </div>
         </div>
         <div class="name flex-top">
@@ -256,8 +263,7 @@
           class="btn1"
           style="margin-left: 20px"
           >确定
-        </a-button
-        >
+        </a-button>
       </div>
     </div>
   </div>
@@ -324,6 +330,8 @@ export default {
       state.viewDetail = routers.query.viewDetail;
       getProjectInfo();
       getTemplate();
+      state.ptojectType = routers.query.ptojectType;
+      // console.log("routers.query.ptojectType", routers.query.ptojectType);
     });
 
     watch(routers.query, () => {
@@ -364,11 +372,12 @@ export default {
                   let res = d.data.data;
                   if (res.rows && res.rows.length > 0) {
                     let i = res.rows.length;
-                  state.auditDescription = res.rows[i - 1].description ? res.rows[i - 1].description : "-";
+                    state.auditDescription = res.rows[i - 1].description
+                      ? res.rows[i - 1].description
+                      : "-";
                   }
                 }
               });
-        
             }
           });
     }
@@ -457,7 +466,11 @@ export default {
         message.warning('项目名称重复，请修改名称！');
         return;
       }*/
-        const offName = await validateName({name:state.projectInfo.name, type:1, id:state.projectInfo.projectId}).then(res => {
+      const offName = await validateName({
+        name: state.projectInfo.name,
+        type: 1,
+        id: state.projectInfo.projectId,
+      }).then((res) => {
         return res.data.data == 1;
       });
       if (offName) {

src/views/projectcenter/ProjectManage.vue

@@ -1591,6 +1591,7 @@ export default {
                         parentId: value.record.projectId,
                         parentName:
                           value.record.parentName + "——" + value.record.name,
+                        ptojectType: 3,
                       },
                     });
                   }}

src/views/projectcenter/templateAdd.vue

@@ -210,7 +210,6 @@ import { ref, onMounted, watch } from "vue";
 import {message} from "ant-design-vue";
 import {useRouter, useRoute} from "vue-router";
 import * as api from "../../api/indexTemplate";
-// import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
@@ -221,7 +220,7 @@ const router = useRouter();
 const store = useStore();
 const projectInfo = ref({});
 const projectPic = ref([]);
-const courseSyncFlag = ref(false);
+const courseSyncFlag = ref(false)
 onMounted(() => {
   getDetail();
   projectPic.value = store.state.projectPic.map((e) => ({
@@ -245,7 +244,7 @@ const getDetail = () =>
         projectInfo.value.beginTime,
         projectInfo.value.endTime,
       ];
-    projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag;
+      projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
     });
 
 const backPage = () => {

vue.config.js

@@ -7,6 +7,7 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 const {defineConfig} = require("@vue/cli-service");
+
 module.exports = defineConfig({
     publicPath: "/manage",
     // transpileDependencies: true,
@@ -14,7 +15,7 @@ module.exports = defineConfig({
         port: 8080,
         proxy: {
             "/manageApi": {
-         target:"http://111.231.196.214:30001/",
+                target: process.env.VITE_PROXY_URL,
                 changeOrigin: true, //表示是否改变原域名
                 // secure: false,
                 // ws: false, //表示WebSocket协议