From 9fbe838d97d87b87acfbbd6463084bcfda7de094 Mon Sep 17 00:00:00 2001
From: mors <3067699729@qq.com>
Date: Mon, 10 Apr 2023 17:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modulex/modules/ModulexForm.vue | 26 +++++++++++++------
 .../src/main/resources/application-dev.yml    |  9 +++----
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue
index fa0a282..875e32b 100644
--- a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue
+++ b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue
@@ -35,17 +35,20 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="责任人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="managerUsers">
-              <a-input v-model="model.managerUsers" placeholder="请输入责任人"  ></a-input>
+<!--              <a-input v-model="model.managerUsers" placeholder="请输入责任人"  ></a-input>-->
+              <j-select-user-by-dep v-model="model.managerUsers" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="任务等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workLevel">
-              <a-input-number v-model="model.workLevel" placeholder="请输入任务等级" style="width: 100%" />
+<!--              <a-input-number v-model="model.workLevel" placeholder="请输入任务等级" style="width: 100%" />-->
+              <j-dict-select-tag v-model="model.workLevel" placeholder="请输入版本状态" dict-code="work_level" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="任务状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workStatus">
-              <a-input-number v-model="model.workStatus" placeholder="请输入任务状态" style="width: 100%" />
+<!--              <a-input-number v-model="model.workStatus" placeholder="请输入任务状态" style="width: 100%" />-->
+              <j-dict-select-tag type="list" v-model="model.workStatus" dictCode="work_status" placeholder="请选择任务状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -75,7 +78,8 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="用户角色" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userRole">
-              <a-input v-model="model.userRole" placeholder="请输入用户角色"  ></a-input>
+<!--              <a-input v-model="model.userRole" placeholder="请输入用户角色"  ></a-input>-->
+              <j-multi-select-tag type="list_multi" v-model="model.userRole" dictCode="sys_role,role_name,id" placeholder="请选择用户角色" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -85,22 +89,26 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="原型图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="prototypes">
-              <a-input v-model="model.prototypes" placeholder="请输入原型图"  ></a-input>
+<!--              <a-input v-model="model.prototypes" placeholder="请输入原型图"  ></a-input>-->
+              <j-image-upload isMultiple  v-model="model.prototypes" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="分析图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diagrams">
-              <a-input v-model="model.diagrams" placeholder="请输入分析图"  ></a-input>
+<!--              <a-input v-model="model.diagrams" placeholder="请输入分析图"  ></a-input>-->
+              <j-image-upload isMultiple  v-model="model.diagrams" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="模块状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <a-input-number v-model="model.status" placeholder="请输入模块状态" style="width: 100%" />
+<!--              <a-input-number v-model="model.status" placeholder="请输入模块状态" style="width: 100%" />-->
+              <j-dict-select-tag type="list" v-model="model.status" placeholder="请输入模块状态" dict-code="a_status" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="版本状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verisonStatus">
-              <a-input-number v-model="model.verisonStatus" placeholder="请输入版本状态" style="width: 100%" />
+<!--              <a-input-number v-model="model.verisonStatus" placeholder="请输入版本状态" style="width: 100%" />-->
+              <j-dict-select-tag v-model="model.verisonStatus" placeholder="请输入版本状态" dict-code="verison_status" />
             </a-form-model-item>
           </a-col>
 <!--          <a-col :span="24">-->
@@ -134,6 +142,8 @@
     data () {
       return {
         model:{
+          status: 1,
+          verisonStatus: 1,
          },
         labelCol: {
           xs: { span: 24 },
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
index c858222..e919357 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
@@ -143,8 +143,8 @@ spring:
           driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
-    database: 3
-    host: 127.0.0.1
+    database: 2
+    host: 8.130.8.73
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
@@ -152,13 +152,12 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password: ''
+    password: yunredis
     port: 6379
 #    password: 'zy2021zy'
 #    port: 7480
 #mybatis plus 设置
 mybatis-plus:
-
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
   global-config:
     # 关闭MP3.0自带的banner
@@ -170,7 +169,7 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置