Merge remote-tracking branch 'origin/dev_4newlayout' into dev_4newlayout

dev_4newlayout
shiji 1 year ago
commit 024504c965
  1. 1
      ant-design-vue-jeecg/src/permission.js
  2. 62
      ant-design-vue-jeecg/src/views/newLayout/module/Main.vue
  3. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/functionx/service/impl/FunctionxServiceImpl.java

@ -30,6 +30,7 @@ const whiteList = [
'/cms/major',
'/cms/detail',
'/newLayout/dayu',
'/home/lnfo'
] // no redirect whitelist
router.beforeEach((to, from, next) => {

@ -73,6 +73,7 @@
<i
class="el-icon-office-building"
@click="dialogFormVisible = true"
@click.stop.prevent="openCollapse()"
style="background-color: #2147fb; margin-right: 15px; color: #ffffff"
></i>
<i class="el-icon-coin" style="background-color: #2147fb; margin-right: 15px; color: #ffffff"></i>
@ -81,10 +82,19 @@
<div class="toxiang" style="margin-right: 10px"></div>
<span class="zhangsan" style="margin-right: 15px">{{ item.managerUsers_dictText }}</span>
<span class="zhangsan">截止时间{{ item.submitTime }}</span>
<div class="top-right2">
<i class="el-icon-edit" style="margin-right: 5px"></i>
<i class="el-icon-circle-plus-outline" style="margin-right: 5px"></i>
<i
class="el-icon-edit"
@click.stop.prevent="openCollapse()"
@click="handleEdit1()"
style="margin-right: 5px"
></i>
<i
class="el-icon-circle-plus-outline"
@click.stop.prevent="openCollapse()"
@click="handleAdd1()"
style="margin-right: 5px"
></i>
<i class="el-icon-chat-dot-round" @click="dialogKuiVisible = true" style="margin-right: 15px"></i>
</div>
<img
@ -98,7 +108,7 @@
</div>
</div>
</template>
<!-- 这是二级模块 -->
<!-- 这是二级模块 -->
<!-- <div class="top">
<i class="el-icon-s-fold" style="margin-left: 15px"></i>
<span class="mkuai-text" style="margin-left: 15px">子模块2.1 账号管理</span>
@ -164,7 +174,6 @@
<i class="el-icon-circle-plus-outline" style="margin-right: 5px"></i>
<i class="el-icon-chat-dot-round" style="margin-right: 15px"></i>
</div>
<div class="wt-buttom">
<el-radio v-model="radio" style="margin-right: 15px; transform: scale(0.7)" label="1"
>已解决</el-radio
@ -202,7 +211,7 @@
</el-dialog>
<!-- 展示表单 原型 Dialog-->
<el-dialog title="上传/查看原型图" :visible.sync="dialogFormVisible">
<el-dialog title="查看原型图" :visible.sync="dialogFormVisible">
<div class="yuanxing">
<el-image :src="src"></el-image>
<div class="yuanxing-buttom">原型主图示意</div>
@ -224,16 +233,23 @@
</div>
</el-dialog>
<modulex-modal ref="modalForm"></modulex-modal>
<functionx-modal ref="modalForm1" @ok="modalFormOk"></functionx-modal>
<rulex-modal ref="modalForm2" @ok="modalFormOk"></rulex-modal>
</div>
</template>
<script>
import { getAction } from "@api/manage"
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ModulexModal from '@views/modulex/modules/ModulexModal.vue'
import FunctionxModal from '@views/functionx/modules/FunctionxModal.vue'
import RulexModal from '@views/rulex/modules/RulexModal.vue'
export default {
// eslint-disable-next-line vue/multi-word-component-names
name: 'Main',
mixins: [JeecgListMixin, mixinDevice],
data () {
return {
msg: [],
@ -424,12 +440,37 @@ export default {
this.getData1()
},
methods: {
handleAdd: function () {
openCollapse () {
console.log('阻止冒泡 @click.stop.prevent')
},
handleAdd () {
this.$refs.modalForm.add()
this.$refs.modalForm.title = "新增"
this.$refs.modalForm.disableSubmit = false
},
change: function (index) {
handleAdd1 () {
this.$refs.modalForm1.add()
this.$refs.modalForm1.title = "新增"
this.$refs.modalForm1.disableSubmit = false
},
handleEdit1 () {
this.$refs.modalForm1.edit()
this.$refs.modalForm1.title = "编辑"
this.$refs.modalForm1.disableSubmit = false
},
//
// handleAdd2 () {
// this.$refs.modalForm2.add()
// this.$refs.modalForm2.title = ""
// this.$refs.modalForm2.disableSubmit = false
// },
// handleEdit1 () {
// this.$refs.modalForm2.edit()
// this.$refs.modalForm2.title = ""
// this.$refs.modalForm2.disableSubmit = false
// },
change (index) {
this.number = index
},
handleClick (tab, event) {
@ -440,6 +481,7 @@ export default {
// console.log('wwwwwww', this.tabActiveName)
getAction('newprojectx/newprojectx/queryById', { id: this.tabActiveName }).then((res) => {
if (res.success) {
console.log(res)
this.detailList = res.result
this.companyList = res.result.moduleDtoList
res.result.moduleDtoList.forEach((element) => {
@ -478,7 +520,9 @@ export default {
components: {
// Msg
ModulexModal
ModulexModal,
FunctionxModal,
RulexModal
}
}

@ -28,7 +28,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Description: 功能管理
@ -284,8 +283,8 @@ public class FunctionxServiceImpl extends ServiceImpl<FunctionxMapper, Functionx
List<BugDto> bugDtoList =
bugxService.queryBugDtoListByFunctionId(functionDto);
// 功能对应的bug_type为2
bugDtoList = bugDtoList.stream().filter(bugDto ->
bugDto.getType().equals(2)).collect(Collectors.toList());
/* bugDtoList = bugDtoList.stream().filter(bugDto ->
bugDto.getType().equals(2)).collect(Collectors.toList());*/
functionDto.setBugDtoList(bugDtoList);
functionDtoList.add(functionDto);

Loading…
Cancel
Save