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

src/views/formula/component/formulaTemplate.vue

@@ -67,7 +67,9 @@ export default {
 
     //选择当前元素
     setCurEle(index){
-      this.$set(this.formulainfo.arguments,index,this.curele);
+      let tmp = JSON.parse(JSON.stringify(this.curele));
+      //console.log(tmp)
+      this.$set(this.formulainfo.arguments,index,tmp);
     }
   }
 }

src/views/formula/edit.vue

@@ -515,6 +515,7 @@ export default {
       eleTableId:'',//选中的元素表id
       eleTableList:[],
       eleList:[],
+      eleChecks:[],//勾选的元素列表
       selectEleFormula:[],
       curSeleEleIndex:-1,//公式文字里面选中的元素索引
       inputVisible:false,//输入弹窗
@@ -931,13 +932,26 @@ export default {
     },
 
     //勾选元素
+    // eleCheckHandle(checked,item){
+    //   if(checked){
+    //     this.eleList.forEach((ele)=>{
+    //       this.$set(ele,'checked',false);
+    //       //ele.checked = false;
+    //     })
+    //     item.checked = true;
+    //   }
+    // },
+    //勾选元素多选
     eleCheckHandle(checked,item){
       if(checked){
-        this.eleList.forEach((ele)=>{
-          this.$set(ele,'checked',false);
-          //ele.checked = false;
-        })
-        item.checked = true;
+        this.eleChecks.push(item);
+      }else{
+        for (let i = 0; i < this.eleChecks.length; i++) {
+          if(this.eleChecks[i].id == item.id){
+            this.eleChecks.splice(i,1);
+            break;
+          }
+        }
       }
     },
 
@@ -1072,38 +1086,82 @@ export default {
     },
 
     //选择元素
+    // chooseEleHandle(){
+    //   for (let i = 0; i < this.eleList.length; i++) {
+    //     if (this.eleList[i].checked) {
+    //       let ele = this.eleList[i];
+    //       let obj = {};
+    //       if(ele.k){
+    //         obj = {
+    //           type:'ParamData',
+    //           name:ele.name,
+    //           id:ele.id,
+    //           selected:false,
+    //           v:ele.v,
+    //           k:ele.k,
+    //           children:[],
+    //         }
+    //       }else{
+    //         obj = {
+    //           type:'Element',
+    //           name:ele.eName,
+    //           id:ele.id,
+    //           selected:false,
+    //           tableElementKey:ele.tableElementKey,
+    //           children:[],
+    //         }
+    //       }
+
+
+    //       this.$set(this.argumenObj.arguments,this.argumenObj.index,obj);
+    //       this.chooseEleVisible = false;
+    //       break;
+    //     }
+    //   }
+    // },
+    //选择元素多选
     chooseEleHandle(){
-      for (let i = 0; i < this.eleList.length; i++) {
-        if (this.eleList[i].checked) {
-          let ele = this.eleList[i];
-          let obj = {};
-          if(ele.k){
-            obj = {
-              type:'ParamData',
-              name:ele.name,
-              id:ele.id,
-              selected:false,
-              v:ele.v,
-              k:ele.k,
-              children:[],
-            }
-          }else{
-            obj = {
-              type:'Element',
-              name:ele.eName,
-              id:ele.id,
-              selected:false,
-              tableElementKey:ele.tableElementKey,
-              children:[],
-            }
-          }
+      this.eleChecks.forEach((element,index) => {
+        this.setEleToArgumen(element,index+this.argumenObj.index);
+      });
 
+      this.chooseEleVisible = false;
 
-          this.$set(this.argumenObj.arguments,this.argumenObj.index,obj);
-          this.chooseEleVisible = false;
-          break;
+      this.clearEleListCheck();
+    },
+    //设置元素到指定位置参数
+    setEleToArgumen(ele,index){
+      let obj = {};
+      if(ele.k){
+        obj = {
+          type:'ParamData',
+          name:ele.name,
+          id:ele.id,
+          selected:false,
+          v:ele.v,
+          k:ele.k,
+          children:[],
+        }
+      }else{
+        obj = {
+          type:'Element',
+          name:ele.eName,
+          id:ele.id,
+          selected:false,
+          tableElementKey:ele.tableElementKey,
+          children:[],
         }
       }
+      if(index < this.argumenObj.arguments.length){
+        this.$set(this.argumenObj.arguments,index,obj);
+      }
+    },
+    //清理元素列表的勾选
+    clearEleListCheck(){
+      this.eleChecks = [];
+      this.eleList.forEach((item)=>{
+        item.checked = false;
+      })
     },
 
     //显示选择元素弹窗

src/views/manager/projectinfo/archivetreeconfig.vue

@@ -19,7 +19,7 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
        <template slot-scope="{type,size,row}" slot="menu">
-        <el-button icon="el-icon-setting" :size="size" :type="type" @click="configurationClick">配置规则</el-button>
+        <el-button icon="el-icon-setting" :size="size" :type="type" @click="configurationClick(row)">配置规则</el-button>
        
       </template>
     </avue-crud>
@@ -27,7 +27,8 @@
 </template>
 
 <script>
-import {getList, getDetail, add, update, remove} from "@/api/tentative/testcollect";
+// import {getList, getDetail, add, update, remove} from "@/api/tentative/testcollect";
+import { getProjectList } from "@/api/manager/projectinfo";
 import {mapGetters} from "vuex";
 
 export default {
@@ -63,7 +64,7 @@ export default {
         column: [
           {
             label: "项目名称",
-            prop: "name",
+            prop: "projectName",
             rules: [{
               required: true,
               message: "请输入分类名称",
@@ -110,23 +111,35 @@ export default {
     refreshChange() {
       this.onLoad(this.page, this.query);
     },
+    // onLoad(page, params = {}) {
+    //   this.loading = true;
+    //   getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+    //     const data = res.data.data;
+         
+    //     this.page.total = data.total;
+    //     // this.data = data.records;
+    //      this.data = [{name:'重庆乌江白马枢纽工程项目'}]
+    //     this.loading = false;
+    //     this.selectionClear();
+    //   });
+    // },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getProjectList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
          
         this.page.total = data.total;
-        // this.data = data.records;
-         this.data = [{name:'重庆乌江白马枢纽工程项目'}]
+        this.data = data.records;
         this.loading = false;
-        this.selectionClear();
       });
     },
-    configurationClick(){
+    configurationClick(row){
+      //console.log(row);
+      //return;
       this.$router.push({
         path: '/manager/projectinfo/archivetreeRule',
         query: {
-          projectId:'1578599210897772545',//暂时传参
+          projectId:row.id,
         }
       });
     },