Merge branch 'gitlink_server' of http://106.75.45.236:3000/Gitlink/forgeplus-react into feature_IDE

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+  // 使用 IntelliSense 了解相关属性。 
+  // 悬停以查看现有属性的描述。
+  // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "pwa-chrome",
+      "request": "launch",
+      "name": "Launch Chrome against localhost",
+      "url": "http://localhost:8080",
+      "webRoot": "${workspaceFolder}"
+    }
+  ]
+}

src/forge/Component/Component.scss

@@ -276,36 +276,36 @@ li.ant-menu-item{
 .-task-sidebar {
   position: fixed;
   width: 40px;
-  right: 10px;
+  right: 30px;
   bottom: 80px;
   z-index: 10;
 }
 
-@media screen and (max-width: 1920px){
-  .-task-sidebar{
-    right:220px;
-  }
-}
-@media screen and (max-width: 1750px){
-  .-task-sidebar{
-    right:160px;
-  }
-}
-@media screen and (max-width: 1650px){
-  .-task-sidebar{
-    right:115px;
-  }
-}
-@media screen and (max-width: 1550px){
-  .-task-sidebar{
-    right:90px;
-  }
-}
-@media screen and (max-width: 1450px){
-  .-task-sidebar{
-    right:45px;
-  }
-}
+// @media screen and (max-width: 1920px){
+//   .-task-sidebar{
+//     right:220px;
+//   }
+// }
+// @media screen and (max-width: 1750px){
+//   .-task-sidebar{
+//     right:160px;
+//   }
+// }
+// @media screen and (max-width: 1650px){
+//   .-task-sidebar{
+//     right:115px;
+//   }
+// }
+// @media screen and (max-width: 1550px){
+//   .-task-sidebar{
+//     right:90px;
+//   }
+// }
+// @media screen and (max-width: 1450px){
+//   .-task-sidebar{
+//     right:45px;
+//   }
+// }
 @media screen and (max-width: 1200px){
   .-task-sidebar{
     right:0px;

src/forge/DevOps/About.jsx

@@ -136,7 +136,7 @@ function About(props, ref) {
       params:{password:authorityVal}
     }).then(result=>{
       setIsSpining(false);
-      if(result){
+      if(result && result.data.status === 0){
         setStep(result.data.step);
       }
     }).catch(error=>{setIsSpining(false)});
@@ -149,7 +149,10 @@ function About(props, ref) {
     axios.post(url).then(result=>{
       setIsSpining(false);
       if(result && result.data.status === 0){
-        props.history.push(`/${owner}/${projectsId}/devops`);
+        props.history.push({ 
+          pathname: `/${owner}/${projectsId}/devops`, 
+          state:{open_devops:true} 
+        });
         // 需要将顶部的open_devops修改
         let { changeOpenDevops } = props;
         changeOpenDevops && changeOpenDevops(true);

src/forge/DevOps/Index.jsx

@@ -1,4 +1,4 @@
-import React , { useEffect } from 'react';
+import React from 'react';
 import { WhiteBack } from '../Component/layout';
 import './ops.scss';
 

src/forge/Server/data.jsx

@@ -20,7 +20,7 @@ function Data(props){
 
 
   function onDetectionOk(){
-    props.showNotification("扫描成功！");
+    props.showNotification("新建分析成功，可在“检测状态”处查看扫描检测进度");
     setDetectionVisible(false);
     setSpining(true);
     Init();

src/glcc/home/index.jsx

@@ -14,7 +14,7 @@ import apply2 from "../img/apply2.png";
 import './index.scss';
 
 export default (props) => {
-  const { current_user, isGlccApplyDate, showNotification, studentApplyStart } = props;
+  const { current_user, isGlccApplyDate, showNotification, studentApplyStart,history } = props;
   function goToApply() {
     if (isGlccApplyDate) {
       if (current_user && current_user.login) {
@@ -33,7 +33,7 @@ export default (props) => {
     if(!studentApplyStart){
       showNotification("不在报名时间，报名开始时间为5月26日");
     }else{
-      window.location.href="/glcc/subjects";
+      history.push("/glcc/subjects");
     }
   }
 
@@ -50,14 +50,14 @@ export default (props) => {
       {/* 报名入口 */}
       <div className="applyBox">
         {/* 项目报名 */}
-        <div className="apply project">
+        <Link to="/glcc/projects" className="apply project" >
           <div>
             <img src={apply1} alt="" className="applyIcon"/>
-            <span className="hover-none"><span className="til">项目报名</span> </span>
-            <span className="hover-show">项目报名已截止</span>
+            <span className="hover-none"><span className="til">查看项目</span> </span>
+            {/* <span className="hover-show">项目报名已截止</span> */}
           </div>
-          <div className="pt6">项目报名开启，导师席位虚位以待</div>
-        </div>
+          <div className="pt6">查看夏令营各项目，掌握项目课题详细信息</div>
+        </Link>
         {/* 学生报名 */}
         <div className="apply" onClick={goToStudent}>
           <div>

src/glcc/home/index.scss

@@ -52,16 +52,16 @@
       &:hover, &:hover .til{
         color:#466aff;
       }
-      .hover-show{
-        display: none;
-      }
-      &:hover .hover-none, &:hover .pt6{
+      // .hover-show{
+      //   display: none;
+      // }
+       &:hover .pt6{
         display: none;
       }
       &:hover.project{
-        background-image:linear-gradient(45deg,#EBEFFF 0%, #E0E4F9 50.63%,#F1F1F1 100%);
-        box-shadow:0px 0px 6px #466aff;
-        cursor: default;
+        // background-image:linear-gradient(45deg,#EBEFFF 0%, #E0E4F9 50.63%,#F1F1F1 100%);
+        // box-shadow:0px 0px 6px #466aff;
+        // cursor: default;
         .hover-show{
           display: inline-block;
           margin-left: 10px;

src/glcc/home/partner/index.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import './index.scss';
 import ccf from '../../img/ccf_logo.png';
+import ccf1 from '../../img/ccf_logo1.png';
 import gitlink from '../../img/gitlink.png';
 import xjy from '../../img/xjy.png';
 import sponsor11 from '../../img/sponsor11.png';
@@ -9,6 +10,7 @@ import sponsor22 from '../../img/sponsor22.png';
 import sponsor23 from '../../img/sponsor23.png';
 import sponsor31 from '../../img/sponsor31.png';
 import sponsor32 from '../../img/sponsor32.png';
+import sponsor33 from '../../img/sponsor33.png';
 import sponsor41 from '../../img/sponsor41.png';
 
 
@@ -45,7 +47,7 @@ function Partner() {
         <div className='cont1 cont mb10'>
           <div>
             主办方
-            <div onClick={()=>{window.open("https://www.ccf.org.cn/")}} className='div8b9'><img src={ccf}/></div>
+            <div onClick={()=>{window.open("https://www.ccf.org.cn/")}} className='div8b9'><img src={ccf1}/></div>
           </div>
           <div>
             承办方
@@ -71,8 +73,8 @@ function Partner() {
           白金赞助商
           <div className='pt10'>
             <div className="sponsor" onClick={()=>{window.open("http://www.baidu.com/")}}><img src={sponsor21} className='gitlink' alt='百度'/></div>
-            <div className="sponsor" onClick={()=>{window.open("https://www.alibaba.com/")}}><img src={sponsor22} className='gitlink' alt='蚂蚁集团'/></div>
-            <div className="sponsor" onClick={()=>{window.open("https://www.antgroup.com/")}}><img src={sponsor23} className='gitlink' alt='阿里巴巴'/></div>
+            <div className="sponsor" onClick={()=>{window.open("https://www.antgroup.com/")}}><img src={sponsor22} className='gitlink' alt='蚂蚁集团'/></div>
+            <div className="sponsor" onClick={()=>{window.open("https://www.alibaba.com/")}}><img src={sponsor23} className='gitlink' alt='阿里巴巴'/></div>
           </div>
         </div>
 
@@ -81,13 +83,14 @@ function Partner() {
           <div className='pt10'>
             <div className="sponsor" onClick={()=>{window.open("https://aws.amazon.com/cn/")}}><img src={sponsor31} className='gitlink' alt='亚马逊云科技'/></div>
             <div className="sponsor" onClick={()=>{window.open("https://www.didiglobal.com/")}}><img src={sponsor32} className='gitlink' alt='滴滴出行'/></div>
+            <div className="sponsor" onClick={()=>{window.open("https://www.99cloud.net/")}}><img src={sponsor33} className='gitlink' alt='九州云'/></div>
           </div>
         </div>
 
         <div className='cont cont3 mt15'>
           白银赞助商
           <div className='pt10'>
-            <div className="sponsor" onClick={()=>{window.open("https://www.bytedance.com/")}}><img src={sponsor41} className='gitlink' alt='字节跳动'/></div>
+            <div className="sponsor" onClick={()=>{window.open(" https://www.cloudwego.io/")}}><img src={sponsor41} className='gitlink' alt='cloudwego'/></div>
           </div>
         </div>
 

src/glcc/index.jsx

@@ -102,7 +102,7 @@ const Glcc = (propsF) => {
           )}
         ></Route>
         <Route
-            path="/glcc/student/detail/:taskId"
+            path="/glcc/subjects/detail/:taskId"
             render={(props) => (
               <TaskDetail {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} studentApplyEnd={studentApplyEnd} applyTaskId={applyTaskId}/>
             )}

src/glcc/project/component/projectDetail.jsx

@@ -45,7 +45,7 @@ export default ({ detail, projectId, applyTaskId, current_user, showLoginDialog,
       {info.registrationTaskList && info.registrationTaskList.length > 0 ? info.registrationTaskList.map((item, index)=>{
         return <div className='taskItem mt20' key={index}>
           <div className="left">
-            <div className="taskTitle" onClick={()=>{window.location.href=`/glcc/student/detail/${item.id}`}}><Tooltip title={item.taskName}>{item.taskName}</Tooltip></div>
+            <div className="taskTitle" onClick={()=>{window.location.href=`/glcc/subjects/detail/${item.id}`}}><Tooltip title={item.taskName}>{item.taskName}</Tooltip></div>
             <div className='mt20 oneLine leftWidth'>导师姓名: &nbsp;&nbsp;{item.tutorName}</div>
             {item.tutorMail && <div className='mb20 email oneLine leftWidth'>邮箱地址: &nbsp;&nbsp;<span><Tooltip title={item.tutorMail}>{item.tutorMail}</Tooltip></span></div>}
           </div>
@@ -54,7 +54,7 @@ export default ({ detail, projectId, applyTaskId, current_user, showLoginDialog,
             {item.taskUrl && <div className="taskUrl oneLine">课题链接: &nbsp;&nbsp;<a href={item.taskUrl} target={"_blank"}>{item.taskUrl}</a></div>}
             <div>
               {(isStudentApplyDate || studentApplyEnd) && (applyTaskId && item.id && Object.keys(applyTaskId).includes(item.id.toString()) ? <Button onClick={()=>{window.location.href=`/glcc/student/apply/${item.id}`}} className='lookDetail mr10'>报名详情</Button> : isStudentApplyDate && <Button type='primary' className='applyBut mr10' onClick={()=>{applyTask(item.id)}}>申请课题</Button>)}
-              <Button onClick={()=>{window.open(`/glcc/student/detail/${item.id}`)}} className='lookDetail'>课题详情</Button>
+              <Button onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}`)}} className='lookDetail'>课题详情</Button>
             </div>
           </div>
           <div className="right oneLine taskUrl"><span className='taskReward'>￥{item.taskReward}</span></div>

src/glcc/project/projectList/index.scss

@@ -32,15 +32,16 @@
       width: 100px;
       height: 100px;
       border: 1px solid #fff;
-      background-color: #F5F7FF;
+      background-color: #fff;
       border-radius: 50%;
       text-align: center;
       overflow: hidden;
       margin: 25px auto 10px;
+      line-height: 95px;
       img{
         width: 100%;
-        height: 100%;
-        display: block;
+        // height: 100%;
+        // display: block;
       }
     }
     .title{

src/glcc/project/taskList/index.jsx

@@ -24,7 +24,7 @@ function TaskList({applyTaskId, setStudentInfoReset, current_user, showLoginDial
 
   const columns = [
     { title: '序号', dataIndex: 'index', align: 'center', className:"taskTableColumns", width: '6%', render: (text, item, index) => <span>{(current-1)*pageSize+index + 1}</span> },
-    { title: '课题名称', dataIndex: 'taskName', className:"taskTableColumns taskName", width: '28%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span onClick={()=>{window.location.href=`/glcc/student/detail/${item.id}`}}>{text}</span></Tooltip> },
+    { title: '课题名称', dataIndex: 'taskName', className:"taskTableColumns taskName", width: '28%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}`)}}>{text}</span></Tooltip> },
     { title: '项目名称', dataIndex: 'projectName', className:"taskTableColumns", width: '28%', ellipsis: true, render: (text) => <Tooltip title={text} placement="topLeft">{text}</Tooltip> },
     { title: '课题奖金', dataIndex: 'taskReward', className:"taskTableColumns", ellipsis: true, width: `${isStudentApplyDate || studentApplyEnd ? '15%' : ''}`, render: (text) => <Tooltip title={text} placement="topLeft"><span>{text}</span></Tooltip> },
     {

src/glcc/student/index.jsx

@@ -456,6 +456,7 @@ function Apply(props) {
                         [{ required: true, message: "请选择课题名称" }],
                         <Select
                           placeholder="请选择课题名称"
+                          dropdownClassName="glcc_select"
                           showSearch
                           disabled={editable ? false : true}
                           className={editable ? "" : "disabledInput"}

src/glcc/student/index.scss

@@ -155,18 +155,7 @@
       border: none;
       color: #202d40;
     }
-    .projectLogo {
-      width: 120px;
-      height: 120px;
-      border: 1px dashed #b3c3db;
-      border-radius: 4px;
-      line-height: 120px;
-      text-align: center;
-      img {
-        max-width: 100px;
-        max-height: 100px;
-      }
-    }
+    
   }
   .ant-cascader-picker {
     background: none;
@@ -319,6 +308,9 @@
     }
   }
 }
+.glcc_select .ant-select-dropdown-menu-item-active:not(.ant-select-dropdown-menu-item-disabled){
+  background: #e9efff;
+}
 .glcc_cascader{
   .ant-cascader-menu{
     width: 240px;

src/modules/login/LoginDialog.css

@@ -153,7 +153,7 @@
 }
 
 .zindextest {
-    z-index: 1000 !important;
+    z-index: 1300 !important;
 }
 
 .MuiModal-root-15 {