sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2023-08-14 10:50:09 +08:00
parent e1f524ef20
commit 58f9a98b3a
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
View File

@ -85,7 +85,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="培训标题" prop="trainTitle"> <el-form-item label="培训标题" prop="trainTitle">
<el-input type="number" v-model="form.trainTitle" placeholder="请输入培训标题" /> <el-input v-model="form.trainTitle" placeholder="请输入培训标题" />
</el-form-item> </el-form-item>
<el-form-item label="参与人数" prop="trainParticipants"> <el-form-item label="参与人数" prop="trainParticipants">
<el-input type="number" v-model="form.trainParticipants" placeholder="请输入参与人数" /> <el-input type="number" v-model="form.trainParticipants" placeholder="请输入参与人数" />

2
ruoyi-ui/src/views/work/emergencyDrill/index.vue
View File

@ -184,7 +184,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="培训标题"> <el-form-item label="培训标题">
<el-input placeholder="请输入培训标题" v-model="form.trainTitle" :disabled="true"></el-input> <el-input placeholder="请输入培训标题" v-model="form.trainTitle"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="参与人数" prop="trainParticipants"> <el-form-item label="参与人数" prop="trainParticipants">
<el-input type="number" v-model="form.trainParticipants" placeholder="请输入工作参与者" /> <el-input type="number" v-model="form.trainParticipants" placeholder="请输入工作参与者" />

2
ruoyi-ui/src/views/work/workTrain/index.vue
View File

@ -184,7 +184,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="培训标题"> <el-form-item label="培训标题">
<el-input placeholder="请输入培训标题" v-model="form.trainTitle" :disabled="true"></el-input> <el-input placeholder="请输入培训标题" v-model="form.trainTitle"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="参与人数" prop="trainParticipants"> <el-form-item label="参与人数" prop="trainParticipants">
<el-input type="number" v-model="form.trainParticipants" placeholder="请输入工作参与者" /> <el-input type="number" v-model="form.trainParticipants" placeholder="请输入工作参与者" />

2
ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
View File

@ -85,7 +85,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="培训标题" prop="trainTitle"> <el-form-item label="培训标题" prop="trainTitle">
<el-input type="number" v-model="form.trainTitle" placeholder="请输入培训标题" /> <el-input v-model="form.trainTitle" placeholder="请输入培训标题" />
</el-form-item> </el-form-item>
<el-form-item label="参与人数" prop="trainParticipants"> <el-form-item label="参与人数" prop="trainParticipants">
<el-input type="number" v-model="form.trainParticipants" placeholder="请输入参与人数" /> <el-input type="number" v-model="form.trainParticipants" placeholder="请输入参与人数" />

4
ruoyi-wechat/src/main/resources/templates/pshManage/myChanges.html
View File

@ -43,8 +43,8 @@
</div> </div>
<div class="my-gallery row"> <div class="my-gallery row">
<figure th:if="${queryChangeNicked.fileListImgState == 'OK'}" th:each="fileListImgObj:${queryChangeNicked.fileListImg}"> <figure th:if="${queryChangeNicked.fileListImgState == 'OK'}" th:each="fileListImgObj:${queryChangeNicked.fileListImg}">
<a th:href="@{${fileListImgObj.fileUrl}}"> <a th:if="${fileListImgObj!=null}" th:href="@{${fileListImgObj?.fileUrl}}">
<img th:src="${fileListImgObj.fileUrl}" class="img-border"/> <img th:src="${fileListImgObj?.fileUrl}" class="img-border"/>
</a> </a>
</figure> </figure>
</div> </div>

4
ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html
View File

@ -43,8 +43,8 @@
</div> </div>
<div class="my-gallery row"> <div class="my-gallery row">
<figure th:if="${queryChangeNicked.fileListImgState == 'OK'}" th:each="fileListImgObj:${queryChangeNicked.fileListImg}"> <figure th:if="${queryChangeNicked.fileListImgState == 'OK'}" th:each="fileListImgObj:${queryChangeNicked.fileListImg}">
<a th:href="@{${fileListImgObj.fileUrl}}"> <a th:if="${fileListImgObj!=null}" th:href="@{${fileListImgObj?.fileUrl}}">
<img th:src="${fileListImgObj.fileUrl}" class="img-border"/> <img th:src="${fileListImgObj?.fileUrl}" class="img-border"/>
</a> </a>
</figure> </figure>
</div> </div>

1
yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
View File

@ -110,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from work_train wt from work_train wt
left join work_train_dept wtd on wtd.train_id = wt.id left join work_train_dept wtd on wtd.train_id = wt.id
left join sys_dept sd on sd.dept_id = wtd.dept_id left join sys_dept sd on sd.dept_id = wtd.dept_id
left join sur_project sp on sp.id = wt.project_id
<if test='trainType != null and trainType == "0"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value</if> <if test='trainType != null and trainType == "0"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value</if>
<if test='trainType != null and trainType == "1"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value</if> <if test='trainType != null and trainType == "1"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value</if>
<where> <where>