zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

This commit is contained in:
caoqianming 2022-02-25 17:00:42 +08:00
parent e44a3d7e4b b7f0828225
commit 22727d72fe
9 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hb_client/src/components/Gantt/components/dashLeftMenu.vue
View File

@ -19,7 +19,11 @@
@expand-change="handlerExpand"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column label="任务编号" prop="name" min-width="140" show-overflow-tooltip>
<el-table-column label="任务编号" min-width="140" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.name">{{scope.row.name}}</span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column label="产品名称" prop="productName" min-width="120" show-overflow-tooltip>
</el-table-column>

2
hb_client/src/components/Gantt/dashGantt.vue
View File

@ -827,7 +827,7 @@
Math.round(end / this.currentDaySize.value) *
this.currentDaySize.value -this.currentDaySize.value;
this.currentProjectMsg = {
name: this.computedList[index].name,
name: this.computedList[index].name?this.computedList[index].name:'',
allTime: (end - start) / this.currentDaySize.value + 1,
per: this.computedList[index].per,
per1: this.computedList[index].per1,

2
hb_client/src/components/customForm/index.vue
View File

@ -243,7 +243,7 @@
that.img = new Image();
that.img.crossOrigin = 'anonymous';
let value = imag[0].field_value?imag[0].field_value:imag[0].draw_template;
that.img = 'http://47.95.0.242:2222'+value;
that.img = 'http://49.232.14.174:2222'+value;
setTimeout(function(){
that.canvasInit();
},500);

4
hb_client/src/components/customForm/review.vue
View File

@ -327,8 +327,8 @@
});
that.img = new Image();
that.img.crossOrigin = '';
that.img = 'http://47.95.0.242:2222'+imag[0].field_value;
that.originImg = 'http://47.95.0.242:2222'+imag[0].origin_value;
that.img = 'http://49.232.14.174:2222'+imag[0].field_value;
that.originImg = 'http://49.232.14.174:2222'+imag[0].origin_value;
listJudge.forEach(item => {
let obj = new Object();
obj = item;

2
hb_client/src/views/pm/plandetails.vue
View File

@ -106,7 +106,7 @@
<el-col v-for="item in fieldList" :key="item.id" :span="24">
<div class="items" v-if="item.field_type==='draw'" style="height: 400px">
<span class="itemLabel">{{item.field_name}}：</span>
<img style="width: 45%;vertical-align: text-top;" :src="'http://47.95.0.242:2222'+item.field_value"/>
<img style="width: 45%;vertical-align: text-top;" :src="'http://49.232.14.174:2222'+item.field_value"/>
</div>
</el-col>
</el-row>

2
hb_client/src/views/qm/producttest.vue
View File

@ -145,7 +145,7 @@
<el-col v-for="item in fieldList" :key="item.id" :span="24">
<div class="items" v-if="item.field_type==='draw'" style="height: 400px">
<span class="itemLabel">{{item.field_name}}：</span>
<img style="width: 45%;vertical-align: text-top;" :src="'http://47.95.0.242:2222'+item.field_value"/>
<img style="width: 45%;vertical-align: text-top;" :src="'http://49.232.14.174:2222'+item.field_value"/>
</div>
</el-col>
</el-row>

2
hb_client/src/views/qm/taskrecordfrom.vue
View File

@ -79,7 +79,7 @@
<el-col v-for="item in fieldList" :key="item.id" :span="24">
<div class="items" v-if="item.field_type==='draw'" style="height: 400px">
<span class="itemLabel">{{item.field_name}}：</span>
<img style="width: 45%;vertical-align: text-top;" :src="'http://47.95.0.242:2222'+item.field_value"/>
<img style="width: 45%;vertical-align: text-top;" :src="'http://49.232.14.174:2222'+item.field_value"/>
</div>
</el-col>
</el-row>

4
hb_client/src/views/wpm/firstCheck.vue
View File

@ -186,10 +186,10 @@
<el-col v-for="item in fieldList" :key="item.id" :span="24">
<div class="items" v-if="item.field_type==='draw'" style="height: 400px">
<span class="itemLabel">{{item.field_name}}：</span>
<img style="width: 45%;vertical-align: text-top;" :src="'http://47.95.0.242:2222'+item.field_value"/>
<img style="width: 45%;vertical-align: text-top;" :src="'http://49.232.14.174:2222'+item.field_value"/>
</div>
</el-col>
<el-col :span="12" v-if="achieve">
<el-col :span="12">
<div class="items">
<span class="itemLabel">检验结果：</span>
<span v-if="is_testok">检验合格</span>

2
hb_client/src/views/wpm/need.vue
View File

@ -651,7 +651,7 @@
<el-col v-for="item in fieldList" :key="item.id" :span="24">
<div class="items" v-if="item.field_type==='draw'" style="height: 400px">
<span class="itemLabel">{{item.field_name}}：</span>
<img style="width: 45%;vertical-align: text-top;" :src="'http://47.95.0.242:2222'+item.field_value"/>
<img style="width: 45%;vertical-align: text-top;" :src="'http://49.232.14.174:2222'+item.field_value"/>
</div>
</el-col>
</el-row>