3.17

dist/static/css/chunk-2aeab4ca.563587c5.css → dist/static/css/chunk-0f712b84.f926d207.css

@@ -1 +1 @@
-[data-v-407465b1]:export{color_0:#000;color_3:#333;color_6:#666;color_9:#999;color_b:#bbb;color_d:#ddd;color_e:#eee;color_f2:#f2f2f2;color_f5:#f5f5f5;color_fa:#fafafa;color_fc:#fcfcfc;color_f:#fff;color_on:#fd5a57;pad:120px}.user[data-v-407465b1]{width:100%;height:100%}.user .container[data-v-407465b1]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:100%}.user .container .user-slider[data-v-407465b1]{width:180px;height:100%;padding-top:20px}.user .container .user-main[data-v-407465b1]{width:calc(100% - 190px);height:100%}.user-slider .el-menu{border:none}.user-slider .el-menu-item{height:36px;line-height:36px;font-size:14px;text-align:center;color:#b6b6b6}.user-slider .el-menu-item.is-active{color:#fff;background:#fd5a57}
+[data-v-e6344012]:export{color_0:#000;color_3:#333;color_6:#666;color_9:#999;color_b:#bbb;color_d:#ddd;color_e:#eee;color_f2:#f2f2f2;color_f5:#f5f5f5;color_fa:#fafafa;color_fc:#fcfcfc;color_f:#fff;color_on:#fd5a57;pad:120px}.user[data-v-e6344012]{width:100%;height:100%}.user .container[data-v-e6344012]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:100%}.user .container .user-slider[data-v-e6344012]{width:180px;height:100%;padding-top:20px}.user .container .user-main[data-v-e6344012]{width:calc(100% - 190px);height:100%}.user-slider .el-menu{border:none}.user-slider .el-menu-item{height:36px;line-height:36px;font-size:14px;text-align:center;color:#b6b6b6}.user-slider .el-menu-item.is-active{color:#fff;background:#fd5a57}.border .el-menu{border:none}

dist/static/js/chunk-0f712b84.b860532a.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0f712b84"],{2073:function(e,t,o){},3590:function(e,t,o){"use strict";var a=o("2073"),c=o.n(a);c.a},5841:function(e,t,o){e.exports={color_0:"#000",color_3:"#333",color_6:"#666",color_9:"#999",color_b:"#bbb",color_d:"#ddd",color_e:"#eee",color_f2:"#f2f2f2",color_f5:"#f5f5f5",color_fa:"#fafafa",color_fc:"#fcfcfc",color_f:"#fff",color_on:"#FD5A57",pad:"120px"}},"7abe":function(e,t,o){"use strict";o.r(t);var a=function(){var e=this,t=e.$createElement,o=e._self._c||t;return o("div",{staticClass:"user lbg_color2"},[o("div",{staticClass:"container border"},[o("div",{staticClass:"user-slider lbg_color3 el-menu"},[o("el-menu",{staticClass:"lbg_color3",attrs:{"default-active":e.activeIndex},on:{select:e.Select}},[o("el-menu-item",{attrs:{index:"/home/myproject"}},[e._v("我的项目")]),e._v(" "),o("el-menu-item",{attrs:{index:"/home/openproject"}},[e._v("公开项目")])],1)],1),e._v(" "),o("section",{staticClass:"user-main "},[o("transition",{attrs:{name:"fade-transform",mode:"out-in"}},[o("router-view",{key:e.dateKey})],1)],1)])])},c=[],r=(o("a481"),o("b775"),{name:"User",data:function(){return{dateKey:(new Date).getTime(),defaultPage:"/myproject"}},computed:{activeIndex:function(){var e=this.$route.path;return"/home"===e&&(this.$router.replace({path:e+this.defaultPage}),console.log(e+this.defaultPage),console.log(111)),e}},created:function(){},methods:{Select:function(e){this.$router.replace({path:e})}}}),n=r,l=(o("3590"),o("fca8"),o("2877")),s=Object(l["a"])(n,a,c,!1,null,"e6344012",null);t["default"]=s.exports},fca8:function(e,t,o){"use strict";var a=o("5841"),c=o.n(a);c.a}}]);

dist/static/js/chunk-2aeab4ca.6104ed0f.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2aeab4ca"],{"29a5":function(e,t,o){},5841:function(e,t,o){e.exports={color_0:"#000",color_3:"#333",color_6:"#666",color_9:"#999",color_b:"#bbb",color_d:"#ddd",color_e:"#eee",color_f2:"#f2f2f2",color_f5:"#f5f5f5",color_fa:"#fafafa",color_fc:"#fcfcfc",color_f:"#fff",color_on:"#FD5A57",pad:"120px"}},7965:function(e,t,o){"use strict";var a=o("29a5"),c=o.n(a);c.a},"7abe":function(e,t,o){"use strict";o.r(t);var a=function(){var e=this,t=e.$createElement,o=e._self._c||t;return o("div",{staticClass:"user lbg_color2"},[o("div",{staticClass:"container"},[o("div",{staticClass:"user-slider lbg_color3"},[o("el-menu",{staticClass:"lbg_color3",attrs:{"default-active":e.activeIndex},on:{select:e.Select}},[o("el-menu-item",{attrs:{index:"/home/myproject"}},[e._v("我的项目")]),e._v(" "),o("el-menu-item",{attrs:{index:"/home/openproject"}},[e._v("公开项目")])],1)],1),e._v(" "),o("section",{staticClass:"user-main "},[o("transition",{attrs:{name:"fade-transform",mode:"out-in"}},[o("router-view",{key:e.dateKey})],1)],1)])])},c=[],r=(o("a481"),o("b775"),{name:"User",data:function(){return{dateKey:(new Date).getTime(),defaultPage:"/myproject"}},computed:{activeIndex:function(){var e=this.$route.path;return"/home"===e&&(this.$router.replace({path:e+this.defaultPage}),console.log(e+this.defaultPage),console.log(111)),e}},created:function(){},methods:{Select:function(e){this.$router.replace({path:e})}}}),n=r,s=(o("7965"),o("fca8"),o("2877")),l=Object(s["a"])(n,a,c,!1,null,"407465b1",null);t["default"]=l.exports},fca8:function(e,t,o){"use strict";var a=o("5841"),c=o.n(a);c.a}}]);

src/views/index/HCFDLab/fileupload.vue

@@ -2,8 +2,10 @@
     <div class="webuploader-container">
         <div :id="'uploader'+upId">
                 <el-row>
-                    <el-col :span="6"> {{name}}  </el-col>                   
-                    <el-col :span="6"> <div :id="'picker'+upId" class="text_color" >选择文件</div>  </el-col>
+                    <!-- <el-col :span="6"> {{name}}  </el-col>                   
+                    <el-col :span="6"> <div :id="'picker'+upId" class="text_color" >选择文件</div>  </el-col> -->
+                    <!-- <el-button :id="'picker'+upId"> {{name}} </el-button> -->
+                    <div class="btntext" :id="'picker'+upId">{{name}}</div>
                 </el-row>
 
                 <el-row v-for="(fileObj,key) in files" :key="key" class="disflex">

src/views/index/HCFDLab/index.vue

@@ -8,7 +8,17 @@
           <el-tabs   v-model="activeName" type="card" @tab-click="handleClick">
 
             <el-tab-pane label="几何建模" name="one"><geometry></geometry></el-tab-pane>
-          <el-tab-pane label="网格划分" name="twos"> <meshindex></meshindex></el-tab-pane>
+            <!-- 网格划分 -->
+          <el-tab-pane label="网格划分" name="twos"> 
+               <div class="imgzong">
+                <div class="listitem lbg_color3 bkcolor3"  v-for="(item,index) in meshlist"  :key="'one-'+ index" :class="{activeOrange:active=='one-'+ index}" @click="clickgeometry($event,index,'one-'+ index)" >
+             <div class="item2 "   >
+                 <el-image :src="item.icon" fit="cover" />  
+                   <span >{{item.titlie}}</span>
+            </div>
+            </div>
+               </div>
+          </el-tab-pane>
           <!-- 通用设置 -->
           <el-tab-pane :label="$t('HCFD.geneal.geneal')" name="two">
               <div class="imgzong">
@@ -132,16 +142,38 @@
             </div>
         
           </el-tab-pane>
-          
+          <!-- 结果显示 -->
            <el-tab-pane :label=" $t('HCFD.results.results')" name="five">
-              <div class="imgzong" v-if="lsolverState=='2'">
-               <div class="listitem lbg_color3 bkcolor3" v-for="(item,index) in  resultslist"  :key="'five-'+ index" :class="{activeOrange:active=='five-'+ index}" @click="clickgeometry($event,index,'five-'+ index)" >
-             <div class="item2 "   >
+              <div class="imgzong" v-if="lsolverState=='2'" >
+               <div class="listitem lbg_color3 bkcolor3" >
+             <div class="item1 " v-for="(item,index) in  resultslist"  :key="'five-'+ index" :class="{activeOrange:active=='five-'+ index}" @click="clickgeometry($event,index,'five-'+ index)"  >
+                 <el-image :src="item.icon" fit="cover" />  
+                   <span >{{item.titlie}}</span>
+            </div>
+            
+            </div>
+             <!-- <div class="listitem lbg_color3 bkcolor3" style=" display: flex" >
+               <div>
+             <div class="item1 " v-for="(item,index) in plotslsit"  :key="'five1-'+ index" :class="{activeOrange:active=='five1-'+ index}" @click="clickgeometry($event,index,'five1-'+ index)"  >
                  <el-image :src="item.icon" fit="cover" />  
                    <span >{{item.titlie}}</span>
             </div>
             </div>
+              <div>
+            <div class="item1 " v-for="(item,index) in  plotslsit1"  :key="'five2-'+ index" :class="{activeOrange:active=='five2-'+ index}" @click="clickgeometry($event,index,'five2-'+ index)"  >
+                 <el-image :src="item.icon" fit="cover" />  
+                   <span >{{item.titlie}}</span>
+            </div>
+             </div>
+              <div>
+            <div class="item1 " v-for="(item,index) in  plotslsit2"  :key="'five3-'+ index" :class="{activeOrange:active=='five3-'+ index}" @click="clickgeometry($event,index,'five3-'+ index)"  >
+                 <el-image :src="item.icon" fit="cover" />  
+                   <span >{{item.titlie}}</span>
+            </div>
+             </div>
+            </div> -->
                </div>
+              
            </el-tab-pane>
            <!-- 工具 -->
           <el-tab-pane :label="$t('HCFD.tool.unitConversion')" name="six"> 
@@ -156,6 +188,61 @@
         </el-tabs>
          </div> 
           </div> 
+          <!-- 文件上传 -->
+             <el-dialog
+     v-if="active=='one-0'"
+      :visible.sync="dialog.upload_visiable"
+      :close-on-click-modal="false"
+      @close='activecleer()'
+      class="dialog"
+    :modal='false'
+    custom-class='dialoglocation dialog_color'
+     width="385px"
+     :style="styX"
+    >
+      <div slot="title" class=dialog_header>
+     <el-image class="imge" :src="q4" fit="cover" />
+     <span class="text-color">文件上传</span>
+  </div>
+      <el-form>
+            <!-- <el-form-item  >
+          <span>{{ $t("HCFD.file.name") }}:</span>
+          <p class="text">{{project.projectName}}</p>
+          <span>{{ $t("HCFD.file.desc") }}:</span>
+           <p class="text">{{project.projectDesc}}</p>
+        </el-form-item> -->
+  
+       
+        <el-form-item label="File Type">
+          <el-radio disabled v-model="project.fileType" label="binary"
+            >{{ $t("HCFD.file.binary") }}</el-radio
+          >
+          <el-radio v-model="project.fileType" label="ascii">{{ $t("HCFD.file.ascii")}}</el-radio>
+        </el-form-item>
+        <vue-uploader
+          ref="ugrid"
+          :projectId="project.projectId"
+          :solverType="'hcfd'"
+          :accept="'.ugrid'"
+          :name="'Load Grid File'"
+          :upId="'2'"
+        ></vue-uploader>
+        <!-- <vue-uploader
+          ref="mapbc"
+          :projectId="project.projectId"
+          :solverType="'hcfd'"
+          :accept="'.mapbc,.dat'"
+          :name="'Load BC File'"
+          :upId="'1'"
+        ></vue-uploader> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button  @click="dialog.upload_visiable = false">{{ $t("HCFD.file.cancel")}}</el-button>
+        <el-button type="primary" @click="dialog.upload_visiable = false"
+          >{{ $t("HCFD.file.ok")}}</el-button
+        >
+      </div>
+    </el-dialog>
 <!-- 缩放 -->
    <el-dialog
      v-if="active=='two-0'"
@@ -928,6 +1015,16 @@
   </div>
       <el-form >
            <div class="selecr">
+             <div>
+               <vue-uploader
+              ref="mapbc"
+              :projectId="project.projectId"
+              :solverType="'hcfd'"
+              :accept="'.mapbc,.dat'"
+              :name="'Load BC File'"
+              :upId="'1'"
+            ></vue-uploader>
+             </div>
                 <el-form-item >
             <el-input type="textarea" v-model="form.desc"></el-input>
           </el-form-item>
@@ -1877,6 +1974,15 @@ import q4 from '@/assets/icon/u3868.png'
 import q5 from '@/assets/icon/u10048.png'
 import q6 from '@/assets/icon/u10068.png'
 
+
+import p1 from '@/assets/icon/7.png'
+import p2 from '@/assets/icon/zoomtowindow.png'
+import p3 from '@/assets/icon/1.png'
+import p4 from '@/assets/icon/3.png'
+import p5 from '@/assets/icon/13.png'
+import p6 from '@/assets/icon/14.png'
+import p7 from '@/assets/icon/19.png'
+
 import adilog from "@/assets/hcfd_images/adilog.png";
 import Pagination from '@/components/Pagination'
 import { Message, MessageBox } from "element-ui";
@@ -1954,6 +2060,13 @@ export default {
        q4,
        q5,
        q6,
+       p1,
+       p2,
+       p3,
+       p4,
+       p5,
+       p6,
+       p7,
       visibles:false,
       restime:'',
       numzhexian:'',
@@ -2013,6 +2126,10 @@ export default {
             // {icon:t4, titlie:'分析类型'},  
             // {icon:t5, titlie:'并行类型'}, 
         ],
+        meshlist:[
+           { icon:q4, titlie:'文件上传'},
+          
+        ],
         physicslist:[
             { icon:w1, titlie:'控制方程'},
         ],
@@ -2052,6 +2169,21 @@ export default {
             { icon:j1, titlie:'物面数据'},
             { icon:j2, titlie:'流场数据'},
         ],
+        plotslsit:[
+            { icon:p1, titlie:'Model plot'},
+            { icon:p2, titlie:'path plot'},
+            { icon:p3, titlie:'Global variables'},
+        ],
+         plotslsit1:[
+            { icon:p4, titlie:'Design plot'},
+            { icon:p5, titlie:'Gentralized Y Plot'},
+            { icon:p6, titlie:'Import'},
+        ],
+           plotslsit2:[
+             { icon:p6, titlie:'Length Unit'},
+            { icon:p7, titlie:'History rlot'},
+            { icon:p6, titlie:'Import IYPlot'},
+        ],
         unitlist:[
             { icon:d1, titlie:'单位换算'},
             { icon:d2, titlie:'Y+计算器'},
@@ -2729,6 +2861,9 @@ this.styX.left=e.clientX+'px';
            this.name="amend"
           this.clickNew();
       break; 
+       case 'one-0':
+       this.dialog.upload_visiable = true;
+       break; 
      case 'two-0':
        this.dialog.scale_visiable = true;
        break; 
@@ -3639,10 +3774,6 @@ html,body{
     padding: 15px;
     position: relative;
     height: 88vh;
-  //  box-shadow:   2px 0 15px 0 rgb(232, 232, 232);
-  //   -webkit-box-shadow:   2px 0 15px 0 rgb(232, 232, 232);
-  //   -moz-box-shadow:  2px 0 15px 0 rgb(232, 232, 232);
-             
     }
      .part-panel-collapse-handle {
     position: absolute;
@@ -3672,7 +3803,7 @@ html,body{
         
     }
 .imgcontent img{
-    font-size: 16px;
+    font-size: 16px; 
 }
     .slide-fade-enter-active {
   transition: all .3s ease;
@@ -3746,10 +3877,10 @@ html,body{
     align-items: center;
     }
       .listitem{
-            width: 100px;
+            width: auto;
             height:92px;
             margin: 5px;
-            padding: 2px;
+            padding: 2px 6px 2px 2px;
             overflow: hidden;
    
   .el-image{