5.10改版

package.json

@@ -52,7 +52,7 @@
         "eslint-plugin-vue": "5.2.2",
         "html-webpack-plugin": "3.2.0",
         "mockjs": "1.0.1-beta3",
-        "node-sass": "^4.9.0",
+        "node-sass": "^4.14.1",
         "runjs": "^4.3.2",
         "sass-loader": "^7.1.0",
         "script-ext-html-webpack-plugin": "2.1.3",

src/layout/index.vue

@@ -3,8 +3,8 @@
   <div>
     <div :class="['header', fixedHeader ? 'fixed-header' : '']">
       <div class="logo">
-        <router-link to="/indexLayout"
-          ><el-image v-show="xglogo" :src="logo" fit="cover"
+        <router-link to="/indexLayout/workbench"
+          ><el-image v-show="xglogo" :src="qylogo" fit="cover"
         />
         </router-link>
          <el-image  v-show="qylogos"   :src="qylogo" fit="cover"
@@ -127,18 +127,18 @@
       ]"
     >
       <a href="https://www.xichain.com.cn/xichain/" target="_blank"
-        >重庆小犀智能科技有限公司</a
+        >Copyright ©2015-2018 西安前沿动力有限公司All Rights Reserved</a
       >
       <a href="http://www.beian.miit.gov.cn/" target="_blank"
-        >备案号：渝ICP备 17006571号-8</a
+        >版权所有：西安前沿动力科技有限公司 陕ICP备13000621号</a
       >
 
-      <img class="police" src="../assets/img/police.png" />
+      <!-- <img class="police" src="../assets/img/police.png" />
       <a
         href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=50010302003067"
         target="_blank"
         >渝公网安备 50010302003067号</a
-      >
+      > -->
 
      <!-- <span v-show="xglogo">服务热线：023-63410620</span>  -->
     </div>
@@ -299,16 +299,17 @@ export default {
          let id= sessionStorage.getItem("id",id);
           let pretreatment= sessionStorage.getItem("pretreatment",pretreatment);
           let solver=  sessionStorage.getItem("pretreatment",solver);
-       if(path=="/indexLayout/design"){
              this.$router.replace({
                 path: '/indexLayout/workbench',
               query: {id, pretreatment, solver },
               })
-       }else{
-           this.$router.replace({
-                path: '/indexLayout',
-              })
-       }
+      //  if(path=="/indexLayout/design"){
+          
+      //  }else{
+      //      this.$router.replace({
+      //           path: '/indexLayout',
+      //         })
+      //  }
     },
     toLogin() {
       this.loginShow = true

src/settings.js

@@ -4,7 +4,7 @@ module.exports = {
      * @description page title
      * @desc 页面标题
      */
-  title: '犀工网',
+  title: '前端动力',
   /**
      * @type {boolean} true | false
      * @description Whether fix the header

src/views/index/components/guanyu/guanyuwe.vue

@@ -0,0 +1,152 @@
+/*Workench*/
+/*上传报告*/
+<template>
+
+  <el-dialog
+   ref="userForm"
+      class="user-form"
+      label-width="120px"
+      hide-required-asterisk
+    title="关于我们"
+  :visible.sync="gyisShow"
+    width="1200px"
+  >
+       <div class="gy_top">
+      <div class="bakga">
+        <el-image :src="bakga"></el-image>
+      </div>
+      <div class="container guanyu">
+        <div class="content" ref="obtain">
+          <div class="guanyutext main_con" id="anchor">
+            <h1>西安前沿动力</h1>
+            <h5 class="h5">公司理念</h5>
+            <p class="zctext">
+              为实现以顾客满意为目标，确保顾客的需求和期望得到满足，特制定本公司的质量方针为：
+              “诚信经营、不断创新、优质服务、持续发展。”
+            </p>
+            <h5 class="h5">公司理念的内涵:</h5>
+            <p class="zctext">
+              &nbsp;&nbsp;诚信经营：在公司的发展历程中，诚信一直与我们相伴。前沿动力不仅对客户讲诚信，而且员工之间、上下级之间都在讲诚信。我们要求每个员工都做诚实的人，在企业是好员工，在家庭是好成员，在社会上是守法、有道德的好公民。
+              <br />&nbsp;&nbsp;不断创新：不断创新使我们发展的根本。公司拥有经验丰富的开发队伍，产品技术与国际先进水平保持同步，技术创新是我们的追求及骄傲。
+              <br />&nbsp;&nbsp;优质服务：让客户满意是我们的企业的宗旨，在提供高质量软件产品的同时，我们要求所有员工为每个客户提供最好的售前、售中及售后服务，不断提高客户满意度。
+              <br />&nbsp;&nbsp;持续发展：持续改善是增强满足要求的能力的循环活动。为了改善企业的整体业绩，应不断改善软件产品和服务的质量，提高质量管理体系及过程的有效性和效率，以满足顾客和相关方日益增长和不断变化的需求和期望，实现公司的可持续发展
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+   
+    <span slot="footer" class="dialog-footer">
+   
+      <el-button size="small" type="primary" @click="cancel">取消</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+
+<script>
+import { getImage } from '@/utils/request'
+import bakga from "@/assets/match//beijin1.png"
+export default {
+  name: 'Workench',
+  data(){
+    return{
+      gyisShow:false,
+      bakga,
+
+    }
+
+  },
+  props: {
+    
+  },
+  methods: {
+    // 点击关闭
+    close() {
+      this.$emit('putWorkbench', false)
+    },
+  
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/variables.scss';
+@import '@/styles/mixin.scss';
+  /deep/ .el-dialog__body{
+   background: #2f2f2f;
+}
+.gy_top {
+  width: 100%;
+  background: #2f2f2f;
+  position: relative;
+  /* z-index: -2; */
+}
+.bakga {
+  position: absolute;
+  z-index: 0;
+    top: -24px;
+    right: -20px;
+}
+.guanyu h1 {
+  height: 100px;
+  font-size: 50px;
+  font-weight: bold;
+  color: #ffffff;
+  line-height: 100px;
+}
+.guanyutext {
+  padding: 50px 0;
+}
+.guanyu .zctext {
+  font-size: 16px;
+  font-weight: 500;
+  color: #ffffff;
+  line-height: 2;
+}
+.main_con .icon7 {
+  float: left;
+  margin-top: 42px;
+}
+.guanyupadding {
+  padding: 10px 0;
+}
+.zuzhi {
+  margin-bottom: 20px;
+}
+.typefacexz p {
+  color: #f45858;
+}
+.positionfixed {
+  position: fixed;
+  width: 58%;
+  z-index: 1000;
+  top: 0;
+  left: 21%;
+}
+.guanyu {
+  position: relative;
+}
+.main_con .gytitle {
+  height: 100px;
+  padding-left: 29px;
+  font-size: 20px;
+  font-weight: bold;
+  color: #333333;
+  margin-top: -4px;
+  line-height: 100px;
+}
+.h5 {
+  color: #fff;
+  font-size: 20px;
+  font-weight: bold;
+  margin-top: 40px;
+}
+@media (max-width: 768px) {
+ 
+  .guanyu h1 {
+    font-size: 40px;
+  }
+}
+
+</style>

src/views/index/indexLayout.vue

@@ -105,15 +105,15 @@
           
        </div>   
       </div>
-        <div class="tab-list qiany"   v-if="currentPage == 'design'"   id='z'    @click="selectTab('home')">
+        <!-- <div class="tab-list qiany"   v-if="currentPage == 'design'"   id='z'    @click="selectTab('home')">
           <div class='tab-listcontent'>
           <h1>聚合仿真</h1>
              
       </div>
-      </div>
-         <div class="tab-list qiany"  @click="selectTab('home')" id='b' >
+      </div> -->
+         <div class="tab-list qiany"  @click="selectTab('guanyuwe')" id='b' >
            <div class='tab-listcontent'>
-          <h1>聚合仿真</h1>
+          <h1>关于我们</h1>
              
       </div>
           
@@ -126,41 +126,6 @@
        </div>   
       </div>
       </div>
-        <!-- <div class="tab-list">
-          <img   v-if="
-              currentPage == 'workbench' ||
-              currentPage == 'cae'"
-            src="../../assets/index/qyz1.png"
-          />
-          <img v-else
-            src="../../assets/index/qy1.png"
-              @click="selectTab('workbench')"
-          />
-        </div>
-        <div class="tab-list">
-          <img   v-if="currentPage == 'design'"
-         
-            src="../../assets/index/qyz2.png"
-            @click="selectTab('design')"
-          />
-          <img
-            v-else
-            src="../../assets/index/qy2.png"
-            @click="selectTab('design')"
-          />
-        </div>
-
-        <div class="tab-list">
-          <img
-           v-if="currentPage == 'data'"
-            src="../../assets/index/qyz3.png"
-          />
-          <img
-            src="../../assets/index/qy3.png"
-          />
-        </div> -->
-      <!-- </div> -->
-      
       <div class="info">
        <img class="background" src="../../assets/index/background.png" />
       
@@ -171,15 +136,18 @@
       :workbench-config="workbenchConfig"
       @putWorkbench="getWorkbench"
     />
+        <guanyuwe ref="guanyuwe"></guanyuwe>
   </div>
+
 </template>
 
 <script>
  import Workbench from './components/Workbench'
 import { request } from '@/utils/request'
+import guanyuwe from './workbench/components/guanyuwe'
 export default {
   name: 'IndexLayout',
-  components: { Workbench },
+  components: { Workbench,guanyuwe },
   data() {
     return {
       currentPage: 'home',
@@ -232,6 +200,7 @@ export default {
     },
     // 切换tab
     selectTab(router) {
+   console.log(router);
       if (router == 'workbench') {
         const params = {
           transCode: 'C00038',
@@ -263,7 +232,11 @@ export default {
               }
           })
           .catch((err) => {})
-      } else {
+      }else if(router=='guanyuwe'){
+     this.$$refs.guanyuwe.gyisShow=true;
+
+      }
+       else {
         this.$router.replace({ path: '/indexLayout/' + router })
 
       }

src/views/index/workbench/components/guanyuwe.vue

@@ -0,0 +1,152 @@
+/*Workench*/
+/*上传报告*/
+<template>
+
+  <el-dialog
+   ref="userForm"
+      class="user-form"
+      label-width="120px"
+      hide-required-asterisk
+    title="关于我们"
+  :visible.sync="gyisShow"
+    width="1200px"
+  >
+       <div class="gy_top">
+      <div class="bakga">
+        <el-image :src="bakga"></el-image>
+      </div>
+      <div class="container guanyu">
+        <div class="content" ref="obtain">
+          <div class="guanyutext main_con" id="anchor">
+            <h1>西安前沿动力</h1>
+            <h5 class="h5">公司理念</h5>
+            <p class="zctext">
+              为实现以顾客满意为目标，确保顾客的需求和期望得到满足，特制定本公司的质量方针为：
+              “诚信经营、不断创新、优质服务、持续发展。”
+            </p>
+            <h5 class="h5">公司理念的内涵:</h5>
+            <p class="zctext">
+              &nbsp;&nbsp;诚信经营：在公司的发展历程中，诚信一直与我们相伴。前沿动力不仅对客户讲诚信，而且员工之间、上下级之间都在讲诚信。我们要求每个员工都做诚实的人，在企业是好员工，在家庭是好成员，在社会上是守法、有道德的好公民。
+              <br />&nbsp;&nbsp;不断创新：不断创新使我们发展的根本。公司拥有经验丰富的开发队伍，产品技术与国际先进水平保持同步，技术创新是我们的追求及骄傲。
+              <br />&nbsp;&nbsp;优质服务：让客户满意是我们的企业的宗旨，在提供高质量软件产品的同时，我们要求所有员工为每个客户提供最好的售前、售中及售后服务，不断提高客户满意度。
+              <br />&nbsp;&nbsp;持续发展：持续改善是增强满足要求的能力的循环活动。为了改善企业的整体业绩，应不断改善软件产品和服务的质量，提高质量管理体系及过程的有效性和效率，以满足顾客和相关方日益增长和不断变化的需求和期望，实现公司的可持续发展
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+   
+    <span slot="footer" class="dialog-footer">
+   
+      <el-button size="small" type="primary" @click="cancel">取消</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+
+<script>
+import { getImage } from '@/utils/request'
+import bakga from "@/assets/match//beijin1.png"
+export default {
+  name: 'Workench',
+  data(){
+    return{
+      gyisShow:true,
+      bakga,
+
+    }
+
+  },
+  props: {
+    
+  },
+  methods: {
+    // 点击关闭
+    close() {
+      this.$emit('putWorkbench', false)
+    },
+  
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/variables.scss';
+@import '@/styles/mixin.scss';
+  /deep/ .el-dialog__body{
+   background: #2f2f2f;
+}
+.gy_top {
+  width: 100%;
+  background: #2f2f2f;
+  position: relative;
+  /* z-index: -2; */
+}
+.bakga {
+  position: absolute;
+  z-index: 0;
+    top: -24px;
+    right: -20px;
+}
+.guanyu h1 {
+  height: 100px;
+  font-size: 50px;
+  font-weight: bold;
+  color: #ffffff;
+  line-height: 100px;
+}
+.guanyutext {
+  padding: 50px 0;
+}
+.guanyu .zctext {
+  font-size: 16px;
+  font-weight: 500;
+  color: #ffffff;
+  line-height: 2;
+}
+.main_con .icon7 {
+  float: left;
+  margin-top: 42px;
+}
+.guanyupadding {
+  padding: 10px 0;
+}
+.zuzhi {
+  margin-bottom: 20px;
+}
+.typefacexz p {
+  color: #f45858;
+}
+.positionfixed {
+  position: fixed;
+  width: 58%;
+  z-index: 1000;
+  top: 0;
+  left: 21%;
+}
+.guanyu {
+  position: relative;
+}
+.main_con .gytitle {
+  height: 100px;
+  padding-left: 29px;
+  font-size: 20px;
+  font-weight: bold;
+  color: #333333;
+  margin-top: -4px;
+  line-height: 100px;
+}
+.h5 {
+  color: #fff;
+  font-size: 20px;
+  font-weight: bold;
+  margin-top: 40px;
+}
+@media (max-width: 768px) {
+ 
+  .guanyu h1 {
+    font-size: 40px;
+  }
+}
+
+</style>

src/views/index/workbench/index.vue

@@ -100,7 +100,9 @@
         </div>
       </div>
     </div>
+    
   </div>
+
 </template>
 
 <script>
@@ -123,15 +125,14 @@ export default {
   watch: {
     $route: {
       handler: function (route) {
-        this.platformIds = this.$route.query.id
-        this.pretreatment = this.$route.query.pretreatment
-        this.solver = this.$route.query.solver
-        this.currentPage = this.solver != 0 ? 'solver' : 'pretreatment'
-
-        
-        if (this.platformIds) {
-          this.getData()
-        }
+        // this.platformIds = this.$route.query.id
+        // this.pretreatment = this.$route.query.pretreatment
+        // this.solver = this.$route.query.solver
+        // this.currentPage = this.solver != 0 ? 'solver' : 'pretreatment'
+        // if (this.platformIds) {
+      
+        //   this.getData()
+        // }
       },
       immediate: true,
     },
@@ -143,7 +144,28 @@ export default {
       value: '',
     })
   },
+  mounted(){
+this.jiazai();
+  },
   methods: {
+    // 获取id
+  jiazai(){
+        const params = {
+          transCode: 'C00038',
+        }
+        request(params)
+          .then((res) => {;
+            let id=res.rows[0].platformId;
+            let pretreatment=res.rows[0].preprocessDisplayStyle;
+            let solver=res.rows[0].cfdDisplayStyle;
+          this.platformIds = id;
+           this.pretreatment =pretreatment;
+           this.solver =solver;
+           this.currentPage = solver != 0 ? 'solver' : 'pretreatment';
+           this.getData();
+          })
+          .catch((err) => {})
+  },
        // 切换tab
   
     selectTab(index) {

src/views/megagame/matchLayout.vue

@@ -27,7 +27,6 @@
     
 </div>
 </template>
-
 <script>
 import { request, getImage } from '@/utils/request'
 import { parseTime } from '@/utils/index'

vue.config.js

@@ -25,6 +25,7 @@ module.exports = {
         disableHostCheck: true,
         proxy: {
             '/api': {
+               // target: 'http://192.168.0.43:8181/', // 测试服
                 // target: 'http://26t13m1315.wicp.vip:32471/cae/service/TransServlet/',//黄工接口调用地址
                 // target: 'http://192.168.0.42:8081/', // 亮哥
                 // target: 'http://192.168.0.15:8081/', // 喻泽