3.21

src/views/home/myproject/index.vue

@@ -257,6 +257,10 @@ this.init();
 /deep/.el-dialog__title{
   color: #fff;
 }
+/deep/ .el-pagination__editor {
+    width: 50px;
+    border: none;
+}
 .btn{
   padding: 10px;
   display: flex;
@@ -273,17 +277,17 @@ this.init();
   display: inline-block;
   
 }
-// .newfile .el-form-item__label {
-//     text-align: right;
-//     vertical-align: middle;
-//     float: left;
-//     font-size: 14px;
-//     color: #606266;
-//     line-height: 40px;
-//     padding: 12px 12px 0 0;
-//     -webkit-box-sizing: border-box;
-//     box-sizing: border-box;
-// }
+.newfile .el-form-item__label {
+    text-align: right;
+    vertical-align: middle;
+    float: left;
+    font-size: 14px;
+    color: #606266;
+    line-height: 1px;
+    padding: 12px 12px 0 0;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+}
 .xuanzhogn{
   font-size: 16px;
      color: #b6b6b6;

src/views/index/HCFDLab/fileupload.vue

@@ -5,7 +5,7 @@
                     <!-- <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>
+                    <div class="btntext upname" :id="'picker'+upId">{{name}}</div>
                 </el-row>
 
                 <el-row v-for="(fileObj,key) in files" :key="key" class="disflex">
@@ -231,6 +231,9 @@ export default {
 .webuploader-container {
 	position: relative;
 }
+.webuploader-pick{
+    color: #fff !important;
+}
 .webuploader-element-invisible {
 	position: absolute !important;
 	clip: rect(1px 1px 1px 1px); /* IE6, IE7 */

src/views/index/HCFDLab/index.vue

@@ -118,7 +118,16 @@
                    <span >{{item.titlie}}</span>
             </div>
             </div>
-              <div class="listitem lbg_color3 bkcolor3"  v-for="(item,index) in  solutionlist2"  :key="'four2-'+ index" :class="{activeOrange:active=='four2-'+ index}" @click="clickgeometry($event,index,'four2-'+ index)" >
+              <div class="listitem lbg_color3 bkcolor3  imgsolution"  v-for="(item,index) in  solutionlist2"  :key="'four2-'+ index" :class="{activeOrange:active=='four2-'+ index}" @click="clickgeometry($event,index,'four2-'+ index)" >
+             <div class="item2 "   >
+               <div class="itemimg">
+                 <el-image :src="item.icon" fit="cover" />  
+                 </div>
+                   <span >{{item.titlie}}</span>
+            </div>
+            
+            </div>   
+              <div class="listitem lbg_color3 bkcolor3  imgsolution"  v-for="(item,index) in  solutionlist21"  :key="'four2-1'+ index" :class="{activeOrange:active=='four2-1'+ index}" @click="clickgeometry($event,index,'four2-1'+ index)" >
              <div class="item2 "   >
                  <el-image :src="item.icon" fit="cover" />  
                    <span >{{item.titlie}}</span>
@@ -130,15 +139,6 @@
                             <span >{{item.titlie}}</span>
             </div>
             </div>  
-                  <!-- <span class="shu">|</span>
-                      <div class="item1"  v-for="(item,index) in  solutionlist4"  :key="'four4-'+ index" :class="{activeOrange:active=='four4-'+ index}" @click="clickgeometry($event,index,'four4-'+ index)">
-                <el-tooltip class="item" effect="dark" :content="item.titlie" placement="bottom">
-                    <svg class="icon" aria-hidden="true">
-                    <use :xlink:href="`#${item.icon}`" />
-                  </svg>
-            </el-tooltip>
-             </div> -->
-              
             </div>
         
           </el-tab-pane>
@@ -150,9 +150,8 @@
                  <el-image :src="item.icon" fit="cover" />  
                    <span >{{item.titlie}}</span>
             </div>
-            
             </div>
-             <!-- <div class="listitem lbg_color3 bkcolor3" style=" display: flex" >
+             <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" />  
@@ -171,7 +170,55 @@
                    <span >{{item.titlie}}</span>
             </div>
              </div>
-            </div> -->
+            </div>
+               <div class="listitem lbg_color3 bkcolor3" >
+             <div class="item1 " v-for="(item,index) in  samplelist"  :key="'five4-'+ index" :class="{activeOrange:active=='five4-'+ index}" @click="clickgeometry($event,index,'five4-'+ 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 generatelist"  :key="'five5-'+ index" :class="{activeOrange:active=='five5-'+ index}" @click="clickgeometry($event,index,'five5-'+ index)"  >
+                 <el-image :src="item.icon" fit="cover" />  
+                   <span >{{item.titlie}}</span>
+            </div>
+            </div>
+              <div>
+            <div class="item1 " v-for="(item,index) in  generatelist2"  :key="'five6-'+ index" :class="{activeOrange:active=='five6-'+ index}" @click="clickgeometry($event,index,'five6-'+ index)"  >
+                 <el-image :src="item.icon" fit="cover" />  
+                   <span >{{item.titlie}}</span>
+            </div>
+             </div>
+           
+            </div>
+               <div class="listitem lbg_color3 bkcolor3" style=" display: flex" >
+               <div>
+             <div class="item1 " v-for="(item,index) in  displaylist"  :key="'five7-'+ index" :class="{activeOrange:active=='five7-'+ index}" @click="clickgeometry($event,index,'five7-'+ index)"  >
+                 <el-image :src="item.icon" fit="cover" />  
+                   <span >{{item.titlie}}</span>
+            </div>
+            </div>
+              <div>
+            <div class="item1 " v-for="(item,index) in  displaylist2"  :key="'five8-'+ index" :class="{activeOrange:active=='five8-'+ index}" @click="clickgeometry($event,index,'five8-'+ index)"  >
+                 <el-image :src="item.icon" fit="cover" />  
+                   <span >{{item.titlie}}</span>
+            </div>
+             </div>
+            </div>
+             <div class="listitem lbg_color3 bkcolor3" >
+             <div class="item1 " v-for="(item,index) in  animationlist"  :key="'five9-'+ index" :class="{activeOrange:active=='five9-'+ index}" @click="clickgeometry($event,index,'five9-'+ index)"  >
+                 <el-image :src="item.icon" fit="cover" />  
+                   <span >{{item.titlie}}</span>
+            </div>
+            </div>
+             <div class="listitem lbg_color3 bkcolor3" >
+             <div class="item1 " v-for="(item,index) in  Cuelist"  :key="'five9-'+ index" :class="{activeOrange:active=='five10-'+ index}" @click="clickgeometry($event,index,'five10-'+ index)"  >
+                 <el-image :src="item.icon" fit="cover" />  
+                   <span >{{item.titlie}}</span>
+            </div>
+            </div>
                </div>
               
            </el-tab-pane>
@@ -1253,7 +1300,7 @@
       :visible.sync="dialog.initialization_visiable "
       :close-on-click-modal="false"
       @close='activecleer()'
-     v-if="active=='four2-1'"
+     v-if="active=='four2-10'"
     :modal='false'
     custom-class='dialoglocation dialog_color'
      width="385px"
@@ -1982,6 +2029,13 @@ 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 p8 from '@/assets/icon/12.png'
+import p9 from '@/assets/icon/15.png'
+import p10 from '@/assets/icon/6.png'
+import p11 from '@/assets/icon/9.png'
+import p12 from '@/assets/icon/2.png'
+import p13 from '@/assets/icon/18.png'
+
 
 import adilog from "@/assets/hcfd_images/adilog.png";
 import Pagination from '@/components/Pagination'
@@ -2037,36 +2091,12 @@ export default {
       styX:{
         left:''
       },
-          t1,
-        t2,
-        t3,
-        t4,
-        t5,
-        w1,
-        w2,
-        w3,
-        w4,
-        w5,
-        w6,
-         d1,
-        d2,
-        d3,
-       d4,
-       j1,
-       j2,
-       q1,
-       q2,
-       q3,
-       q4,
-       q5,
-       q6,
-       p1,
-       p2,
-       p3,
-       p4,
-       p5,
-       p6,
-       p7,
+        t1,t2,t3,t4,t5,
+        w1,w2,w3,w4,w5,w6,
+        d1,d2,d3,d4,
+       j1,j2,
+       q1, q2,q3,q4,q5,q6,
+       p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,
       visibles:false,
       restime:'',
       numzhexian:'',
@@ -2151,8 +2181,11 @@ export default {
         ],
          solutionlist2:[
             { icon:q3, titlie:'线性方程组求解参数'},
+        ],
+         solutionlist21:[
              { icon:q4, titlie:'初始化'},
         ],
+        
         solutionlist3:[
             { icon:q5, titlie:'运行控制'},
             { icon:q6, titlie:'输出控制'},
@@ -2183,6 +2216,35 @@ export default {
              { icon:p6, titlie:'Length Unit'},
             { icon:p7, titlie:'History rlot'},
             { icon:p6, titlie:'Import IYPlot'},
+        ],
+          samplelist:[
+             { icon:p8, titlie:'采样点'},
+        ],
+        generatelist:[
+            { icon:p9, titlie:'工具'},
+            { icon:p10, titlie:'动画'},
+            { icon:p11, titlie:'Movies'},
+        ],
+          generatelist2:[
+            { icon:p3, titlie:'报告'},
+            { icon:p4, titlie:'几何距离'},
+        ],
+        displaylist:[
+            { icon:p3, titlie:'Contour Displsy'},
+            { icon:p9, titlie:'Line Displsy'},
+            { icon:p4, titlie:'Vector'},
+        ],
+        displaylist2:[
+           { icon:p9, titlie:'Solid Surface'},
+            { icon:p12, titlie:'Slice'},
+            { icon:p13, titlie:'Stream'},
+        ],
+        animationlist:[
+           { icon:p9, titlie:'Solid Surface'},
+        ],
+        Cuelist:[
+            { icon:p9, titlie:'Curve Select'},
+            { icon:p13, titlie:'Curve Display'},
         ],
         unitlist:[
             { icon:d1, titlie:'单位换算'},
@@ -2905,7 +2967,7 @@ this.styX.left=e.clientX+'px';
         case 'four2-0':
        this.dialog.xian_visiable = true;
        break;
-         case 'four2-1':
+         case 'four2-10':
        this.dialog.initialization_visiable = true;
        break;
          case 'four3-0':
@@ -3908,6 +3970,11 @@ html,body{
 }
 </style>
 <style>
+.itemimg{
+  display: flex;
+    justify-content: center;
+     padding: 8px; 
+}
 .el-input-number__decrease, .el-input-number__increase{
   position: absolute;
     z-index: 1;
@@ -4318,6 +4385,9 @@ body {
 .radiogroup label{
   flex: 1;
 }
+.el-radio+.el-radio{
+ margin-left:0;
+}
 /deep/ .radiogroup .el-radio-button--mini .el-radio-button__inner{
     border-radius: 5px;
 }