Merge remote-tracking branch 'origin/dev'

ant-design-vue-jeecg/src/views/py/PyAddProject.vue

@@ -1,21 +1,19 @@
 <template>
-  <a-card>
+  <a-spin :spinning="confirmLoading">
-    <el-page-header @back="goBack" cellpadding="30px" style="margin-bottom: 30px;"> </el-page-header>
+    <el-page-header @back="goBack" cellpadding="30px"> </el-page-header>
-    <a-spin :spinning="confirmLoading">
+    <a-form :form="form" cellpadding="30px">
-    <!-- <el-page-header @back="goBack" cellpadding="30px"> </el-page-header> -->
-    <a-form :form="form" cellpadding="30px" style="width: 80%; margin: 0 auto;">
       <a-row>
-        <a-col :span="8">
+        <a-col :span="24">
           <a-form-item label="专业代号" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input placeholder="专业代号"  readonly   v-model="code"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="8">
+        <a-col :span="24">
           <a-form-item label="所属学院" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-select-depart v-decorator="['collegeId', validatorRules.collegeId]"/>
           </a-form-item>
         </a-col>
-        <a-col :span="8">
+        <a-col :span="24">
           <a-form-item label="所属专业" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-dict-select-tag
               type="list"
@@ -27,12 +25,12 @@
             />
           </a-form-item>
         </a-col>
-        <a-col :span="8">
+        <a-col :span="24">
           <a-form-item label="版本" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input v-decorator="['version', validatorRules.version]" placeholder="请输入版本"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="8">
+        <a-col :span="24">
           <a-form-item label="主干学科" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input
               v-decorator="['mainSubject', validatorRules.mainSubject]"
@@ -40,7 +38,7 @@
             ></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="8">
+        <a-col :span="24">
           <a-form-item label="专业方向" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input
               v-decorator="['majorDirection', validatorRules.majorDirection]"
@@ -48,7 +46,7 @@
             ></a-input>
           </a-form-item>
         </a-col>
-        <!-- <a-col :span="24">
+        <a-col :span="24">
           <a-form-item label="核心课程" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-textarea
               v-decorator="['coreCourse', validatorRules.coreCourse]"
@@ -65,8 +63,8 @@
               placeholder="请输入实践性教学环节"
             />
           </a-form-item>
-        </a-col> -->
+        </a-col>
-        <a-col :span="8">
+        <a-col :span="24">
           <a-form-item label="学制" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-dict-select-tag type="list" v-decorator="['eduTime', validatorRules.eduTime]" dictCode="eduTime"
                                placeholder="请选择学制"/>
@@ -86,7 +84,7 @@
                           </a-select>-->
           </a-form-item>
         </a-col>
-        <a-col :span="8">
+        <a-col :span="24">
           <a-form-item label="学位" :labelCol="labelCol" :wrapperCol="wrapperCol" >
             <j-dict-select-tag
               type="list"
@@ -97,12 +95,12 @@
             />
           </a-form-item>
         </a-col>
-        <a-col :span="8">
+        <a-col :span="24">
           <a-form-item label="学分" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input v-decorator="['credit', {}]" placeholder="请输入学分" oninput="if (value.length>100){value=value.slice(0,100);alert('最大输入长度100位')}"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="8">
+        <a-col :span="24">
           <a-form-item label="修学年限" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-dict-select-tag
               type="list"
@@ -126,28 +124,8 @@
                           </a-select>-->
           </a-form-item>
         </a-col>
-        </a-row>
-        <a-row>
-        <a-col :span="24">
-          <a-form-item label="核心课程" :labelCol="labelCol1" :wrapperCol="wrapperCol1">
-            <a-textarea
-              v-decorator="['coreCourse', validatorRules.coreCourse]"
-              rows="4"
-              placeholder="请输入核心课程"
-            />
-          </a-form-item>
-        </a-col>
         <a-col :span="24">
-          <a-form-item label="实践教学" :labelCol="labelCol1" :wrapperCol="wrapperCol1">
+          <a-form-item label="教学进程安排表" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-textarea
-              v-decorator="['practiceTeach', validatorRules.practiceTeach]"
-              rows="4"
-              placeholder="请输入实践性教学环节"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="教学进程安排表" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
             <!--	            <j-markdown-editor v-decorator="['fulltt']" id="fulltt"></j-markdown-editor>-->
             <j-editor style="width: 100%" v-decorator="['fulltt',{trigger:'input'}]"/>
           </a-form-item>
@@ -157,13 +135,12 @@
     <!-- 修改 -->
 
     <!-- modify by zhc 10.27 -->
-    <div class="centerbox">
+    <div>
       <el-button type="primary" size="small" @click="handleOk"  class="el-right">确定</el-button>
       <el-button type="primary" size="small" @click="handleOk" class="el-right">暂存</el-button>
       <el-button type="danger" @click="open" size="small" class="el-right">关闭</el-button>
     </div>
   </a-spin>
-  </a-card>
 
 </template>
 
@@ -193,38 +170,15 @@ export default {
       width: 1200,
       visible: false,
       model: {},
-      // labelCol: {
-      //   xs: {span: 24},
-      //   sm: {span: 5}
-      // },
-      // wrapperCol: {
-      //   xs: {span: 24},
-      //   sm: {span: 16}
-      // },
       labelCol: {
         xs: {span: 24},
-        sm: {span: 6,offset:3 }
+        sm: {span: 5}
       },
       wrapperCol: {
         xs: {span: 24},
-        sm: {span: 15}
+        sm: {span: 16}
-      },
-      labelCol1: {
-        xs: {span: 24},
-        sm: {span: 2,offset:1 }
-      },
-      wrapperCol1: {
-        xs: {span: 24},
-        sm: {span: 21}
-      },
-      labelCol2: {
-        xs: {span: 24},
-        sm: {span: 3}
-      },
-      wrapperCol2: {
-        xs: {span: 24},
-        sm: {span: 21}
       },
+
       confirmLoading: false,
       validatorRules: {
         majorCode: {
@@ -480,15 +434,12 @@ export default {
 // .button-container {
 //   margin-left: 100px;
 // }
-// .el-left{
+.el-left{
-//   float: right;
+  float: right;
-//   margin:10px
+  margin:10px
-// }
+}
-// .el-right{
+.el-right{
-//   float: right;
+  float: right;
-//   margin:10px
+  margin:10px
-// }
-.centerbox{
-  text-align: center;
 }
 </style>