Merge branch 'master' of http://47.110.251.215:3000/web/saber

src/views/formula/edit.vue

@@ -39,7 +39,7 @@
       </div>
     </div>
     <div class="box-dashed">
-      <div class="mg-b-20">函数公式</div>
+      <div class="mg-b-20">函数公式1</div>
       <div class="edit-text">
         <span>
           <formula-item
@@ -316,7 +316,7 @@
 
     <div class="text-align-c" v-show="!operationVisible">
       <el-button type="warning" @click="$emit('hideDialog')">取消</el-button>
-      <el-button type="primary" @click="saveFormula">保存</el-button>
+      <el-button type="primary" @click="saveFormula">保存-</el-button>
     </div>
   </div>
 
@@ -602,7 +602,7 @@ export default {
     // this.wbsid = this.$route.query.wbsid;
     // this.eleid = this.$route.query.eleid;
     // this.nodeid = this.$route.query.nodeid;
-    // this.pid = this.$route.query.projectid;//项目id 私有树才有
+    this.pid = this.$route.query.pid;//项目id 私有树才有
     this.init();
   },
   methods: {
@@ -1167,8 +1167,8 @@ export default {
 
     //保存公式
     saveFormula(){
+      console.log('保存',this.pid);
       let obj = formulaArrayToString(this.processFormula,this.resultFormula);
-
       let deviationRangeText = rangeToString(this.deviationRange.datas,obj.eleMap);
       obj.eleMap.deviationRangeJson = JSON.stringify(this.deviationRange.datas);
       //console.log(obj.eleMap)
@@ -1205,7 +1205,6 @@ export default {
         }
       }
 
-      //console.log(obj)
       //console.log(text);
       if(this.formulaid){
         updateFormula({
@@ -1218,6 +1217,8 @@ export default {
           number:number,
           map:JSON.stringify(obj.eleMap),
           scope:this.globaltype,
+          // projectId:this.curProjiect.id||this.projectId,
+           projectId:this.curProjiect.id||this.pid,
           dev:deviationRangeText
         }).then(()=>{
           this.$message({
@@ -1235,8 +1236,9 @@ export default {
           number:number,
           map:JSON.stringify(obj.eleMap),
           scope:this.globaltype,
-          projectId:this.curProjiect.id,
           dev:deviationRangeText,
+          // projectId:this.curProjiect.id||this.projectId,
+           projectId:this.curProjiect.id||this.pid,
           ver:this.version
         }).then((res)=>{
           if(res.data.data){

src/views/formula/edit1.vue

@@ -39,7 +39,7 @@
       </div>
     </div>
     <div class="box-dashed">
-      <div class="mg-b-20">函数公式</div>
+      <div class="mg-b-20">函数公式2</div>
       <div class="edit-text">
         <span>
           <formula-item
@@ -348,7 +348,7 @@
 
     <div class="text-align-c" v-show="!operationVisible">
       <el-button type="warning" @click="$emit('hideDialog')">取消</el-button>
-      <el-button type="primary" @click="saveFormula">保存</el-button>
+      <el-button type="primary" @click="saveFormula">保存+</el-button>
     </div>
   </div>
 
@@ -692,7 +692,7 @@ export default {
     // this.wbsid = this.$route.query.wbsid;
     // this.eleid = this.$route.query.eleid;
     // this.nodeid = this.$route.query.nodeid;
-    // this.pid = this.$route.query.projectid;//项目id 私有树才有
+     this.pid = this.$route.query.pid;//项目id 私有树才有
     this.init();
   },
   methods: {
@@ -1419,6 +1419,7 @@ export default {
 
     //保存公式
     saveFormula(){
+      console.log('保存1',this.pid);
       let obj = formulaArrayToString(this.processFormula,this.resultFormula);
 
       let deviationRangeText = rangeToString(this.deviationRange.datas,obj.eleMap);
@@ -1470,6 +1471,8 @@ export default {
           number:number,
           map:JSON.stringify(obj.eleMap),
           scope:this.globaltype,
+          // projectId:this.curProjiect.id||this.projectId,
+            projectId:this.curProjiect.id||this.pid,
           dev:deviationRangeText
         }).then(()=>{
           this.$message({
@@ -1487,7 +1490,8 @@ export default {
           number:number,
           map:JSON.stringify(obj.eleMap),
           scope:this.globaltype,
-          projectId:this.curProjiect.id,
+          // projectId:this.curProjiect.id||this.projectId,
+            projectId:this.curProjiect.id||this.pid,
           dev:deviationRangeText,
           ver:this.version
         }).then((res)=>{

src/views/manager/projectinfo/independent.vue

@@ -142,7 +142,7 @@
     </div>
 <!-- 元素公式 -->
     <el-dialog
-      title="元素公式"
+      title="元素公式3"
       :visible.sync="editEleFormulaVisible"
       width="800px"
       append-to-body
@@ -192,7 +192,7 @@
     </el-dialog>
       <!-- 公式 -->
     <el-dialog
-      title="元素公式"
+      title="元素公式33"
       :visible.sync="formulaCompVisible"
       fullscreen
       append-to-body

src/views/manager/projectinfo/tree.vue

@@ -1172,7 +1172,7 @@
     </el-dialog>
 <!-- 元素公式 -->
     <el-dialog
-      title="元素公式"
+      title="元素公式22"
       :visible.sync="editEleFormulaVisible"
       width="800px"
       append-to-body
@@ -1208,7 +1208,7 @@
             <el-link
               class="mg-l-10"
               :type="scope.row.isSaveFormula == 1 ? 'warning' : 'primary'"
-              @click="toFormulaEdit(scope.row,10)"
+              @click="toFormulaEdit(scope.row,2)"
               >节点公式</el-link
             >
             <!-- <el-link
@@ -1422,7 +1422,7 @@
 
     <!-- 节点公式 -->
     <el-dialog
-      title="元素公式"
+      title="元素公式2"
       :visible.sync="formulaCompVisible"
       fullscreen
       append-to-body
@@ -1431,12 +1431,12 @@
     >
       <FormulaEdit
         :fromcurNode="curTreeData"
-       
+        :projectid="projectid" 
         :wbsid="id"
         :nodeid="curTreeData.id"
         :eleid="formulaCurRow.id"
         :globaltype="formulaCurRow.globaltype"
-        :projectid="projectid"
+      
         @hideDialog="formulaCompVisible = false"
         v-if="formulaCompVisible"
       ></FormulaEdit>
@@ -2288,7 +2288,8 @@ export default {
       return arr ? arr.join() : "";
     },
     TestTreeCheckChange(_, { checkedKeys, halfCheckedKeys }) {
-      const newarr = [...checkedKeys, ...halfCheckedKeys];
+      // const newarr = [...checkedKeys, ...halfCheckedKeys];
+       const newarr = [...checkedKeys]
       this.nodeDetail.mixRatioTestIds = this.toJoin(newarr);
     },
     filterChange() {
@@ -3111,9 +3112,8 @@ export default {
         this.editElementFormTag = false;
         this.updateNodeTable();
         this.editeditElementFormMFLoading=false
-      }else{
-         this.editeditElementFormMFLoading=false
       }
+      this.editeditElementFormMFLoading=false
     },
     //#endregion
 

src/views/manager/wbsinfo/edit.vue

@@ -1225,7 +1225,7 @@
     </el-dialog>
 
     <el-dialog
-      title="元素公式"
+      title="元素公式55"
       :visible.sync="editEleFormulaVisible"
       width="800px"
       append-to-body
@@ -1264,7 +1264,7 @@
             <el-link
               class="mg-l-10"
               :type="scope.row.isSaveFormula == 1?'warning':'primary'"
-              @click="toFormulaEdit(scope.row,10)"
+              @click="toFormulaEdit(scope.row,2)"
             >节点公式</el-link>
             <el-link
               class="mg-l-10"
@@ -2372,8 +2372,10 @@ export default {
       return arr ? arr.join() : '';
     },
     TestTreeCheckChange(_, {checkedKeys, halfCheckedKeys}) {
-      const newarr = [...checkedKeys, ...halfCheckedKeys]
+      // const newarr = [...checkedKeys, ...halfCheckedKeys]
+      const newarr = [...checkedKeys]
       this.nodeDetail.mixRatioTestIds = this.toJoin(newarr)
+      
     },
     filterChange () {
       if (this.treeData.length > 0) {

src/views/manager/wbsinfo/element.vue

@@ -210,7 +210,7 @@
     </el-dialog>
     <!-- 公式配置 -->
     <el-dialog
-      title="元素公式"
+      title="元素公式6"
       :visible.sync="editEleFormulaVisible"
       width="800px"
       append-to-body
@@ -256,7 +256,7 @@
     </el-dialog>
      <!-- 公式 -->
     <el-dialog
-      title="元素公式"
+      title="元素公式66"
       :visible.sync="formulaCompVisible"
       fullscreen
       append-to-body

vue.config.js

@@ -27,11 +27,11 @@ module.exports = {
             '/api': {
                 //本地服务接口地址
                 // target: 'http://192.168.3.64',
-                // target: 'http://localhost:8090',
-                // target: 'http://192.168.1.179',
+                target: 'http://localhost:8090',
+                // target: 'http://192.168.1.179:8090',
                 // target: 'http://192.168.31.96',
                 //远程演示服务地址,可用于直接启动项目
-                target: 'http://47.110.251.215:8090',
+                // target: 'http://47.110.251.215:8090',
                 ws: true,
                 pathRewrite: {
                     '^/api': '/'