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

src/components/WbsTree/ManualSorting.vue

@@ -1,9 +1,9 @@
 <template>
   <div
     class="ManualSorting"
-    style="border: 1px solid #E8E8E8;border-radius: 3px;"
+    style="border: 1px solid #E8E8E8;border-radius: 3px"
   >
-    <draggable :list="sort" @change="listChange">
+    <draggable :list="sort" @change="listChange" style="max-height:640px;overflow-y: auto;">
       <div
         v-for="(item,key) in sort"
         :key="key"

src/views/manager/projectinfo/independent.vue

@@ -104,7 +104,7 @@
       </div>
     </div>
     <Qute ref="Qute" :projectid="projectid" :wbsid="wbsid" :onLoad1="onLoad1" :refreshTree="refreshTree"> </Qute>
-    <Relation ref="Relation" :GLExcelFrom="GLExcelFrom" :wbsid="wbsid"  :onLoad1="onLoad1"></Relation>
+    <Relation ref="Relation" :GLExcelFrom="GLExcelFrom" :wbsid="wbsid"  :onLoad1="onLoad1" :refreshTree="refreshTree"></Relation>
     <!-- 编辑元素 -->
        <!-- 编辑元素 -->
     <el-dialog
@@ -206,6 +206,7 @@
       title="调整排序"
       :visible.sync="sortTag"
       width="50%"
+    
       append-to-body
     >
       <ManualSorting v-if="sortTag2" @bianhua="bianhua()" :sort="sort" />
@@ -328,7 +329,7 @@ export default {
             ],
           },
           {
-            label: "所书方",
+            label: "所属方",
             prop: "tabOwner",
 
             editDisplay: false,
@@ -379,6 +380,9 @@ export default {
         nodeid: "",
       }, //
       excelHtml:false,//调整表单
+      
+      //#region 调整表单
+      adjustmentExcel: "",
       curEleTable: {},//编辑元素公式
       editEleFormulaVisible: false,//元素公式
       formulaInput: "",
@@ -678,8 +682,7 @@ export default {
     },
       //#region 调整表单
     adjustExcel(id,pkeyId) {
-      this.excelHtml=true
-      // console.log('调整表单');
+      this.excelHtml=false;
       // //调整表单
       this.GLExcelFrom.id = pkeyId;
       this.getExcelHtml(pkeyId);

src/views/manager/projectinfo/qutediaolog/qute1.vue

@@ -308,10 +308,6 @@ export default {
         
       },
       submitQute(){
-        console.log('确定');
-        console.log(this.ids,'ids');
-       
-       
         projecttabInfo(this.ids,this.projectid).then((res)=>{
           console.log(res,'res');
           if(res.data.code===200){

src/views/manager/projectinfo/qutediaolog/relation.vue

@@ -92,7 +92,8 @@ import {findNodeTableByCondition as selectByNodeTable} from "@/api/manager/wbspr
 export default {
     props:{
         GLExcelFrom:Object,
-        onLoad1:Function
+        onLoad1:Function,
+        refreshTree:Function
     },
     components:{EditElement},
     data(){
@@ -266,6 +267,7 @@ export default {
                     });
                     // selectByNodeTable刷新表单列表
                     this.onLoad1();
+                    this.refreshTree()
                     this.GLExcel = false;
                     this.rightClick(
                         this.GLExcelFrom.id,

src/views/manager/wbsinfo/element.vue

@@ -480,6 +480,7 @@
       :visible.sync="sortTag"
       width="50%"
       append-to-body
+    
     >
       <ManualSorting v-if="sortTag2" @bianhua="bianhua()" :sort="sort" />
       <span slot="footer" class="dialog-footer">

src/views/tentative/parameter.vue

@@ -1,9 +1,10 @@
 <template>
   <basic-container>
-      <div class="h-100p">
+     
             <el-tabs v-model="activeName" @tab-click="handleClick">
                 <el-tab-pane label="压实度评标参数" name="first">
-                    <avue-crud 
+                  <div style="height:100%;">
+                     <avue-crud 
                     :before-open="beforeOpen"
                     :table-loading="loading"
                     :data="tableData" 
@@ -37,14 +38,17 @@
                                 </el-button> 
                         </template>
                     </avue-crud>
+                  </div>
+                   
                 </el-tab-pane>
                 <el-tab-pane label="温度及密度参数" name="second">
                   <temperature/>
                 </el-tab-pane>
+                <!-- 导入参数弹窗 -->
+              <importDialog ref="importDialog" @paramLoad="onLoad"  :importDialogType="importDialogType" :parmpage="page" />
             </el-tabs>
-      </div>
- <!-- 导入参数弹窗 -->
-  <importDialog ref="importDialog" @paramLoad="onLoad"  :importDialogType="importDialogType" :parmpage="page" />
+     
+ 
   </basic-container>
   
 </template>
@@ -72,7 +76,7 @@ export default {
         query:{},
         form:{},
         option:{
-          height: 'auto',
+          height: 630,
           calcHeight: 30,
           tip: false,
           searchShow:false,
@@ -141,6 +145,11 @@ export default {
       },
       handleClick(tab, event) {
         console.log(tab, event);
+        setTimeout(() => {
+          this.$nextTick(() => {
+            this.$refs.crud.doLayout();
+          });
+        }, 1);
       },
       rowSave (row, done, loading) {
           console.log(row,'row');

src/views/tentative/temperature.vue

@@ -74,7 +74,7 @@ export default {
         query:{},
 
         option:{
-          height: 'auto',
+          height: 630,
           calcHeight: 30,
           tip: false,
           searchShow:false,