Merge branch 'master' of http://git.cc-lotus.info/live/web-live

src/views/techolchat/gzcy/cgpj.vue

@@ -0,0 +1,89 @@
+<template>
+  <div id="cgpj">
+    <el-row>
+      <el-col :span="24" class="zhfw">
+        <el-col :span="4" class="describe">服务描述:</el-col>
+        <el-col :span="24" class="text1">
+          <p>
+            这是科研成果管理的一项重要内容。这是一项政策性和技术性很强的工作。它直接关系到科研的发展方向和科研人员的积极性以及经济建设的发展。
+          </p>
+        </el-col>
+        <el-col :span="4" class="process">服务流程:</el-col>
+        <el-col :span="24" class="text1">
+          <el-col :span="24" class="con">
+            <el-col :span="3" class="login">基本信息</el-col>
+            <el-col :span="1" class="arrow"><i class="el-icon-right"></i></el-col>
+            <el-col :span="3" class="login">内容简介</el-col>
+            <el-col :span="1" class="arrow"><i class="el-icon-right"></i></el-col>
+            <el-col :span="5" class="login">委托方提供资料清单</el-col>
+            <el-col :span="1" class="arrow"><i class="el-icon-right"></i></el-col>
+            <el-col :span="3" class="login">发行证书</el-col>
+          </el-col>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  name: 'cgpj',
+  props: {},
+  components: {},
+  data: function() {
+    return {};
+  },
+  created() {},
+  methods: {},
+  computed: {
+    ...mapState(['user']),
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.zhfw {
+  .describe,
+  .process {
+    background-color: #22529a;
+    height: 45px;
+    border-radius: 10px;
+    line-height: 45px;
+    text-align: center;
+    font-size: 20px;
+    color: #fff;
+    font-weight: bolder;
+  }
+  .text1 {
+    height: 100px;
+    border: 1px solid #22529a;
+    border-radius: 5px;
+    margin-top: 15px;
+    padding: 20px 10px 0px 10px;
+    font-size: 16px;
+    .con {
+      padding-left: 10px;
+      .login {
+        border: 1px solid rgb(221, 219, 219);
+        height: 40px;
+        font-size: 15px;
+        color: #666;
+        line-height: 40px;
+        text-align: center;
+      }
+      .arrow {
+        text-align: center;
+        height: 40px;
+        line-height: 40px;
+      }
+    }
+  }
+  .process {
+    margin-top: 40px;
+  }
+}
+</style>

src/views/techolchat/index.vue

@@ -23,8 +23,8 @@
     <el-dialog title="展会服务" :visible.sync="zhfwdialog" width="50%" :before-close="handleClose">
       <zhfw></zhfw>
     </el-dialog>
-    <el-dialog title="在线咨询" :visible.sync="zxzxdialog" width="30%" :before-close="handleClose">
-      <zxzx></zxzx>
+    <el-dialog title="成果评价" :visible.sync="zxzxdialog" width="50%" :before-close="handleClose">
+      <cgpj></cgpj>
     </el-dialog>
     <el-dialog title="建言献策" :visible.sync="jyxcdialog" width="30%" :before-close="handleClose">
       <jyxc @handleClose="handleClose"></jyxc>
@@ -46,7 +46,9 @@ import gzcy from './parts/gzcy.vue';
 //展会服务
 import zhfw from './gzcy/zhfw.vue';
 //在线咨询
-import zxzx from './gzcy/zxzx.vue';
+// import zxzx from './gzcy/zxzx.vue';
+// 成果评价
+import cgpj from './gzcy/cgpj.vue';
 // 建言献策
 import jyxc from './gzcy/jyxc.vue';
 // 网上调查
@@ -63,7 +65,7 @@ export default {
   },
   name: 'index',
   props: {},
-  components: { question, work, gzcy, zhfw, zxzx, jyxc, wsdc, jbyx },
+  components: { question, work, gzcy, zhfw, cgpj, jyxc, wsdc, jbyx },
   data: function() {
     return {
       jlhd: require('@p/center/jlhd.png'),
@@ -74,13 +76,14 @@ export default {
           title: '展会服务',
         },
         {
-          url: require('@p/techolchat/fb.png'),
-          title: '我要发布',
+          url: require('@p/techolchat/zxzx.png'),
+          title: '成果评价',
         },
         {
-          url: require('@p/techolchat/zxzx.png'),
-          title: '在线咨询',
+          url: require('@p/techolchat/fb.png'),
+          title: '我要发布',
         },
+
         {
           url: require('@p/techolchat/jy.png'),
           title: '建言献策',
@@ -144,7 +147,7 @@ export default {
         this.$router.push({ path: '/techolchat/product' });
       } else if (data.title == '建言献策') {
         this.jyxcdialog = true;
-      } else if (data.title == '在线咨询') {
+      } else if (data.title == '成果评价') {
         this.zxzxdialog = true;
       } else if (data.title == '网上调查') {
         // this.wsdcdialog = true;

src/views/techolchat/list.vue

@@ -42,9 +42,9 @@ export default {
       menuList: [
         { name: '调研调查', component: 'question', options: { useTab: false, useSearch: false, listModel: 5 } },
         { name: '行业研究', component: 'work', options: { useTab: false, useSearch: false, listModel: 6 } },
-        { name: '科技服务', options: { useTab: false, useSearch: false, listModel: 2 } },
-        { name: '会展服务', component: 'serve', options: { useTab: false, useSearch: false, listModel: 2 }, indent: 1 },
-        { name: '成果评价', component: 'result', options: { useTab: false, useSearch: false, listModel: 2 }, indent: 1 },
+        // { name: '科技服务', options: { useTab: false, useSearch: false, listModel: 2 } },
+        // { name: '会展服务', component: 'serve', options: { useTab: false, useSearch: false, listModel: 2 }, indent: 1 },
+        // { name: '成果评价', component: 'result', options: { useTab: false, useSearch: false, listModel: 2 }, indent: 1 },
       ],
       squareImage: require('@p/live/square_big.png'),
       column_name: '',