|
@@ -360,6 +360,10 @@ export default {
|
|
type:String,
|
|
type:String,
|
|
default:''
|
|
default:''
|
|
},
|
|
},
|
|
|
|
+ globaltype:{
|
|
|
|
+ type:Number,
|
|
|
|
+ default:10
|
|
|
|
+ },
|
|
nodeid:{
|
|
nodeid:{
|
|
type:String,
|
|
type:String,
|
|
default:''
|
|
default:''
|
|
@@ -485,7 +489,6 @@ export default {
|
|
this.getProjectList();
|
|
this.getProjectList();
|
|
this.geTreeData();
|
|
this.geTreeData();
|
|
await this.getTypeMap();
|
|
await this.getTypeMap();
|
|
-
|
|
|
|
this.formulaStringToArray();
|
|
this.formulaStringToArray();
|
|
},
|
|
},
|
|
|
|
|
|
@@ -1055,11 +1058,12 @@ export default {
|
|
id:this.formulaid,
|
|
id:this.formulaid,
|
|
formula:obj.text,
|
|
formula:obj.text,
|
|
remark:'',
|
|
remark:'',
|
|
- wbsId:this.wbsid,
|
|
|
|
|
|
+ nodeId:this.nodeid,
|
|
elementId:this.eleid,
|
|
elementId:this.eleid,
|
|
scale:this.isRetain?this.retainNum:'',
|
|
scale:this.isRetain?this.retainNum:'',
|
|
number:number,
|
|
number:number,
|
|
- map:JSON.stringify(obj.eleMap)
|
|
|
|
|
|
+ map:JSON.stringify(obj.eleMap),
|
|
|
|
+ scope:this.globaltype
|
|
}).then(()=>{
|
|
}).then(()=>{
|
|
this.$message({
|
|
this.$message({
|
|
type: "success",
|
|
type: "success",
|
|
@@ -1070,11 +1074,12 @@ export default {
|
|
saveFormula({
|
|
saveFormula({
|
|
formula:obj.text,
|
|
formula:obj.text,
|
|
remark:'',
|
|
remark:'',
|
|
- wbsId:this.wbsid,
|
|
|
|
|
|
+ nodeId:this.nodeid,
|
|
elementId:this.eleid,
|
|
elementId:this.eleid,
|
|
scale:this.isRetain?this.retainNum:'',
|
|
scale:this.isRetain?this.retainNum:'',
|
|
number:number,
|
|
number:number,
|
|
- map:JSON.stringify(obj.eleMap)
|
|
|
|
|
|
+ map:JSON.stringify(obj.eleMap),
|
|
|
|
+ scope:this.globaltype
|
|
}).then((res)=>{
|
|
}).then((res)=>{
|
|
if(res.data.data){
|
|
if(res.data.data){
|
|
this.formulaid = res.data.data;
|
|
this.formulaid = res.data.data;
|
|
@@ -1090,7 +1095,7 @@ export default {
|
|
|
|
|
|
//把公式文本还原数组
|
|
//把公式文本还原数组
|
|
async formulaStringToArray(){
|
|
async formulaStringToArray(){
|
|
- let detail = (await formulaDetail({elementId:this.eleid})).data.data;
|
|
|
|
|
|
+ let detail = (await formulaDetail({elementId:this.eleid,scope:this.globaltype,nodeId:this.wbsid})).data.data;
|
|
console.log(detail);
|
|
console.log(detail);
|
|
if(detail.id){
|
|
if(detail.id){
|
|
this.formulaid = detail.id;
|
|
this.formulaid = detail.id;
|