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

src/views/market/index/business.vue

@@ -76,7 +76,7 @@ export default {
     height: 450px;
     position: relative;
     .list {
-      padding: 11px 0;
+      padding: 10px 0;
       border-bottom: 1px dashed #044b79;
       .name {
         font-size: 18px;
@@ -91,8 +91,8 @@ export default {
       }
       .info {
         padding: 5px 0 0 0;
-        height: 45px;
-        font-size: 14px;
+        // height: 44px;
+        font-size: 16px;
         overflow: hidden;
         text-overflow: ellipsis;
         -webkit-line-clamp: 2;

src/views/questionnaire/detail.vue

@@ -5,37 +5,47 @@
         <div class="w_1200">
           <el-col :span="24" class="one">
             <el-row>
-              <el-col :span="24">{{ question.title }}</el-col>
-              <el-form :model="answer" label-position="top" ref="form">
-                <!-- 0单选,1多选,2简答 -->
-                <template v-for="(i, index) in question.questions">
-                  <el-form-item
-                    v-if="i.type === '0'"
-                    :prop="`${index}`"
-                    :key="`question${index}`"
-                    :label="`${index + 1}.${i.title}`"
-                    :rules="[{ required: true, message: '请选择一个选项', trigger: 'blur' }]"
-                  >
-                    <el-radio-group v-model="answer[index]" :disabled="disabled">
-                      <el-radio v-for="(s, si) in i.selects" :key="`s_${index}_${si}`" :label="s.name">{{ s.num }}.{{ s.name }}</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                  <el-form-item
-                    v-else-if="i.type === '1'"
-                    :prop="`${index}`"
-                    :key="`question${index}`"
-                    :label="`${index + 1}.${i.title}`"
-                    :rules="[{ required: true, message: '请至少选择一个选项', trigger: 'blur' }]"
-                  >
-                    <el-checkbox-group :value="answer[index]" @input="data => toCheck(data, index)" :disabled="disabled">
-                      <el-checkbox v-for="(s, si) in i.selects" :key="`c_${index}_${si}`" :label="s.name">{{ s.num }}.{{ s.name }}</el-checkbox>
-                    </el-checkbox-group>
-                  </el-form-item>
-                  <el-form-item v-else :key="`question${index}`" :label="`${index + 1}.${i.title}`">
-                    <el-input v-model="answer[index]" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }" :readonly="disabled"></el-input>
-                  </el-form-item>
-                </template>
-              </el-form>
+              <el-col :span="24" class="info">
+                <el-col :span="24" class="title">
+                  {{ question.title }}
+                </el-col>
+                <el-col :span="24" class="brief">
+                  {{ question.brief }}
+                </el-col>
+              </el-col>
+              <el-col :span="24" class="form">
+                <el-form :model="answer" label-position="top" ref="form">
+                  <!-- 0单选,1多选,2简答 -->
+                  <template v-for="(i, index) in question.questions">
+                    <el-form-item
+                      v-if="i.type === '0'"
+                      :prop="`${index}`"
+                      :key="`question${index}`"
+                      :label="`${index + 1}.${i.title}`"
+                      :rules="[{ required: true, message: '请选择一个选项', trigger: 'blur' }]"
+                    >
+                      <el-radio-group v-model="answer[index]" :disabled="disabled">
+                        <el-radio v-for="(s, si) in i.selects" :key="`s_${index}_${si}`" :label="s.name">{{ s.num }}.{{ s.name }}</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                    <el-form-item
+                      v-else-if="i.type === '1'"
+                      :prop="`${index}`"
+                      :key="`question${index}`"
+                      :label="`${index + 1}.${i.title}`"
+                      :rules="[{ required: true, message: '请至少选择一个选项', trigger: 'blur' }]"
+                    >
+                      <el-checkbox-group :value="answer[index]" @input="data => toCheck(data, index)" :disabled="disabled">
+                        <el-checkbox v-for="(s, si) in i.selects" :key="`c_${index}_${si}`" :label="s.name">{{ s.num }}.{{ s.name }}</el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                    <el-form-item v-else :key="`question${index}`" :label="`${index + 1}.${i.title}`">
+                      <el-input v-model="answer[index]" type="textarea" :autosize="{ minRows: 4, maxRows: 6 }" :readonly="disabled"></el-input>
+                    </el-form-item>
+                  </template>
+                </el-form>
+              </el-col>
+
               <el-col :span="24" style="text-align:center">
                 <el-button type="primary" @click="toSubmit" v-if="!disabled">提交</el-button>
               </el-col>
@@ -163,6 +173,32 @@ export default {
   padding: 15px 0;
   .one {
     margin: 0 0 10px 0;
+    .info {
+      border-bottom: 1px dashed #ccc;
+      padding: 0 20px;
+      .title {
+        font-size: 30px;
+        font-weight: bold;
+        margin: 20px 0;
+        text-align: center;
+      }
+      .brief {
+        font-size: 16px;
+        padding: 0 0 20px 0;
+      }
+    }
+    .form {
+      padding: 20px 0;
+      /deep/.el-form-item {
+        margin-bottom: 5px;
+      }
+      /deep/.el-form-item__label {
+        padding: 0 0;
+        font-weight: bold;
+        color: #000;
+        font-size: 16px;
+      }
+    }
   }
 }
 </style>

src/views/questionnaire/index.vue

@@ -39,7 +39,7 @@ export default {
     return {
       list: [],
       total: 0,
-      pageSize: 1,
+      pageSize: 5,
     };
   },
   created() {
@@ -47,7 +47,7 @@ export default {
   },
   methods: {
     ...questionnaire(['query']),
-    async search({ skip = 0, limit = 10 } = {}) {
+    async search({ skip = 0, limit = 5 } = {}) {
       const res = await this.query({ skip, limit });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);

src/views/techolchat/gzcy/cgpj.vue

@@ -20,6 +20,9 @@
             <el-col :span="3" class="login">发行证书</el-col>
           </el-col>
         </el-col>
+        <el-col :span="24" class="btn">
+          <el-button type="primary" size="" @click="addBtn">成果评价申报</el-button>
+        </el-col>
       </el-col>
     </el-row>
   </div>
@@ -38,7 +41,11 @@ export default {
     return {};
   },
   created() {},
-  methods: {},
+  methods: {
+    addBtn() {
+      window.location.href = 'http://broadcast.waityou24.cn/liveAchieve/userDeclare';
+    },
+  },
   computed: {
     ...mapState(['user']),
   },
@@ -85,5 +92,9 @@ export default {
   .process {
     margin-top: 40px;
   }
+  .btn {
+    text-align: center;
+    padding: 30px 0 0 0;
+  }
 }
 </style>

src/views/techolchat/index.vue

@@ -29,7 +29,7 @@
     <el-dialog title="建言献策" :visible.sync="jyxcdialog" width="30%" :before-close="handleClose">
       <jyxc @handleClose="handleClose"></jyxc>
     </el-dialog>
-    <el-dialog title="网上调查" :visible.sync="wsdcdialog" width="30%" :before-close="handleClose">
+    <el-dialog title="问卷调查" :visible.sync="wsdcdialog" width="30%" :before-close="handleClose">
       <wsdc @handleClose="handleClose"></wsdc>
     </el-dialog>
     <el-dialog title="举报邮箱" :visible.sync="jbyxdialog" width="30%" :before-close="handleClose">
@@ -91,7 +91,7 @@ export default {
         },
         {
           url: require('@p/techolchat/wsdc.png'),
-          title: '网上调查',
+          title: '问卷调查',
         },
         {
           url: require('@p/techolchat/lbyx.png'),
@@ -168,7 +168,7 @@ export default {
         this.jyxcdialog = true;
       } else if (data.title == '成果评价') {
         this.zxzxdialog = true;
-      } else if (data.title == '网上调查') {
+      } else if (data.title == '问卷调查') {
         // this.wsdcdialog = true;
         // TODO跳转至问卷列表页
         if (this.user && this.user.id) this.$router.push('/questionnaire/index');