Merge branch 'dev_2307' of http://182.92.169.222:3000/zhc077/projectManagement into dev_2307

ant-design-vue-jeecg/src/views/rulex/modules/RulexForm.vue

@@ -42,7 +42,8 @@
           <!--          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="任务等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workLevel">
-              <j-dict-select-tag type="list" v-model="model.workLevel" dictCode="work_level" placeholder="请选择任务等级" />
+              <!-- 回去后台取对应数据-->
+              <j-dict-select-tag type="radio" v-model="model.workLevel" dictCode="work_level" placeholder="请选择任务等级" />
             </a-form-model-item>
           </a-col>
           <!--          <a-col :span="24">-->
@@ -52,7 +53,7 @@
           <!--          </a-col>-->
 
           <a-col :span="24">
-            <a-form-model-item label="任务时长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="duration">
+            <a-form-model-item label="任务时长"  labelAlign="right" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="duration">
               <a-input-number v-model="model.duration" placeholder="请输入任务时长" style="width: 100%" />
             </a-form-model-item>
           </a-col>
@@ -64,9 +65,10 @@
           </a-col>
         </a-row>
         <a-row>
-          <a-col :span="24">
+          <a-col >
-            <a-form-model-item label="规则描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pmDescribe">
+            <a-form-model-item label="规则描述"   :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="pmDescribe"   >
               <j-editor v-model="model.pmDescribe"/>
+              <!-- :labelCol="{ span: 2 }" :wrapperCol="{ span: 22 }" -->
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -98,14 +100,35 @@
         ruleNo: '',
         ruleCode: ''
       },
+      labelCol1: {
+        xs: { span: 24 },
+        sm: { span: 3 },
+      },
+      wrapperCol1: {
+        xs: { span: 24 },
+        sm: { span: 20 },
+      },
       labelCol: {
         xs: { span: 24 },
-          sm: { span: 5 },
+        sm: { span: 6 },
       },
       wrapperCol: {
         xs: { span: 24 },
         sm: { span: 16 },
       },
+
+
+      // labelCol: { // 24格栅格系统，label所占为 a
+      //   xxl: 5, // ≥1600px 响应式栅格
+      //   xl: 8, // ≥1200px 响应式栅格
+      //   lg: 10, // ≥992px 响应式栅格
+      //   md: 12 // ≥768px 响应式栅格
+      // },
+      // wrapperCol: { // 24格栅格系统，label后面内容所占为 24-a
+      //   xxl: 19,
+      //   xl: 16,
+      //   lg: 14,
+      //   md: 12},
       confirmLoading: false,
       validatorRules: {
         moduleId: [
@@ -169,6 +192,7 @@
     this.sort()
     this.shiti()
     this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    console.log(this.modelDefault,'2222');
   },
   methods: {
     sort() {
@@ -228,3 +252,8 @@
   }
 }
 </script>
+<style lang="less" scoped>
+/deep/.ant-col-24 .ant-form-item .ant-col-xs-24 {
+  text-align: center;
+}
+</style>