wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
guoyue 2022-07-29 18:10:00 +08:00
parent 44d1aad7dd 5f0e5bb7ce
commit 1d5a81d091
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/src/views/modules/activiti/demo/putaway-process3.vue
View File

@ -4,7 +4,7 @@
<div class="Ability-to-take-off-the-shelf-approval-title">能力下架审批</div> <div class="Ability-to-take-off-the-shelf-approval-title">能力下架审批</div>
<div class="basic-information"> <div class="basic-information">
<div class="basic-information-title"> <div class="basic-information-title">
<span></span><span>基本1111信息</span> <span></span><span>基本信息</span>
</div> </div>
<div class="basic-information-content"> <div class="basic-information-content">
<p> <p>
@ -429,7 +429,7 @@ export default {
.data-list-left { .data-list-left {
width: 80px; width: 80px;
height: 110px; height: 110px;
background: url('~@/assets/img/Capabilitydiagram.png') no-repeat; background: url("~@/assets/img/Capabilitydiagram.png") no-repeat;
background-size: 80px 80px; background-size: 80px 80px;
background-position: center; background-position: center;
margin-left: 10px; margin-left: 10px;

4
back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
View File

@ -235,6 +235,10 @@ export default {
this.dataView.children[indexView].children[indexViewSon].children[ this.dataView.children[indexView].children[indexViewSon].children[
indexSon indexSon
].note1 = this.dataForm.type ].note1 = this.dataForm.type
} else if (itemSon.name.indexOf('共享条件') != -1) {
this.dataView.children[indexView].children[indexViewSon].children[
indexSon
].note1 = this.dataForm.shareCondition
} else if (itemSon.name === '部门联系人') { } else if (itemSon.name === '部门联系人') {
console.log('itemSon.name', itemSon.name) console.log('itemSon.name', itemSon.name)
this.dataView.children[indexView].children[indexViewSon].children[ this.dataView.children[indexView].children[indexViewSon].children[

10
back/src/views/modules/myAgent/demo/competency-application.vue
View File

@ -42,6 +42,12 @@
{{ dataForm.content.applicationSceneStr || '--' }}</span {{ dataForm.content.applicationSceneStr || '--' }}</span
></span> ></span>
</p> </p>
<p>
<span>
应用背景：<span>
{{ dataForm.content.applicationBackground || '--' }}</span
></span>
</p>
<p> <p>
<span> <span>
能力应用期望效果：<span> 能力应用期望效果：<span>
@ -573,7 +579,7 @@ export default {
} }
.clearfix:after { .clearfix:after {
display: block; display: block;
content: ''; content: "";
clear: both; clear: both;
} }
.title { .title {
@ -583,7 +589,7 @@ export default {
border-bottom: 0; border-bottom: 0;
} }
.title:before { .title:before {
content: ''; content: "";
width: 6px; width: 6px;
height: 6px; height: 6px;
display: inline-block; display: inline-block;