update

src/views/Home.vue

@@ -10,8 +10,8 @@
 	<el-container>
 		<el-header>
 			<div class="header">
-				<!-- <img class="logo" src="../assets/logo.png" alt=""> -->
-				<!-- <div class="siteTitle">中科院期刊微信公众号集中管理平台</div> -->
+				<img class="logo" src="../assets/logo.png" alt="">
+				<div class="siteTitle">中科院期刊微信公众号集中管理平台</div>
 			</div>	
 			<div class="nav">
 				<!-- <router-link :class="act?'active':''" to="/index/index" @click.native='active(1)'>首页</router-link>

src/views/message/InnerSurvey.vue

@@ -59,7 +59,6 @@ a {
 }
 .tpl_title {
   font-size: 18px;
-  // margin: 20px 0;
   width: 80%;
   margin: 20px auto;
 }
@@ -80,6 +79,7 @@ a {
     text-align: left;
   }
   /deep/.el-form-item__content {
+    line-height: 20px!important;
     width: 100%;
     .el-radio-group,
     .el-checkbox-group {
@@ -178,11 +178,12 @@ a {
 .group_title {
   font-size: 16px;
   font-weight: bold;
-  padding: 10px 0px;
+  padding: 10px 20px;
 }
 .groupMain {
   border: 1px solid #ccc;
   border-radius: 5px;
+  margin:20px;
 }
 // .require::before {
 //   content: "*";
@@ -419,6 +420,7 @@ a {
               :prop="item.label"
               v-if="item.type != 'group'"
             >
+              <span style="color:#409eff;font-size:12px;">{{item.noteDesc}}</span>
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -509,25 +511,26 @@ a {
               </el-upload>
             </el-form-item>
             <!-- 域组件展示 -->
+            <section
+              class="groupMain"
+              v-if="item.type == 'group'"
+              :key="'review_gi' + index"
+            >
             <h6
               v-if="item.type == 'group'"
-              align="center"
+              align="left"
               class="group_title"
               :key="'revire_g' + index"
             >
               {{ item.label }}
             </h6>
-            <section
-              class="groupMain"
-              v-if="item.type == 'group'"
-              :key="'review_gi' + index"
-            >
               <template v-for="(iitem, index) in item.children">
                 <el-form-item
                   :prop="iitem.label + '(' + item.label + ')'"
                   :key="'review_gc' + index"
                   :label="iitem.label + iitem.cntype"
                 >
+                  <span style="color:#409eff;font-size:12px;">{{iitem.noteDesc}}</span>
                   <el-tooltip
                     class="item"
                     effect="dark"

src/views/message/MessageAnalyse.vue

@@ -160,6 +160,7 @@
         >
           <el-table-column label="序号" type="index" width="50" align="center">
           </el-table-column>
+
           <template v-for="(item, key) in this.headers">
             <el-table-column
               v-if="curItemType=='image'"
@@ -168,8 +169,14 @@
               :label="item"
             >
               <template slot-scope="scope">
-                  <img :src="url" alt="" v-for="(url,iindex) in scope.row[item]" :key="iindex" width="80" height="60">
+                  <span v-if="key==0">
+                  <img :src="url" alt="" v-for="(url,iindex) in scope.row[item]" :key="iindex" width="80" height="60" style="margin-right:5px;">
+                  </span>
+                  <span v-else>{{scope.row[item]}}</span>
               </template>
+              <!-- <template slot-scope="scope" v-if="key==1">
+                <span>{{scope.row[item]}}</span>
+              </template> -->
             </el-table-column>
             <el-table-column
               v-else
@@ -179,6 +186,12 @@
             >
             </el-table-column>
           </template>
+
+          <!-- <el-table-column :label="this.headers[0]" :prop="this.headers[0]">
+          </el-table-column>
+
+          <el-table-column :label="this.headers[1]" :prop="this.headers[1]">
+          </el-table-column> -->
         </el-table>
         <Page
           ref="pageButton"
@@ -297,6 +310,7 @@ export default {
       this.$api.showAnalyseItem(parm).then((res) => {
         let data = res.data.data;
         this.headers = Object.keys(data[0]);
+        console.log(this.headers,11111111)
         this.analyseDataList = data;
       });
       this.dialogVisible = true;

src/views/message/OutSurvey.vue

@@ -63,7 +63,6 @@ a {
 }
 .tpl_title {
   font-size: 18px;
-  // margin: 20px 0;
   width: 80%;
   margin: 20px auto;
 }
@@ -77,6 +76,7 @@ a {
   }
 
   /deep/.el-form-item__content {
+    line-height: 20px!important;
     width: 100%;
     .el-radio-group,
     .el-checkbox-group {
@@ -176,11 +176,12 @@ a {
 .group_title {
   font-size: 16px;
   font-weight: bold;
-  padding: 10px 0px;
+  padding: 10px 20px;
 }
 .groupMain {
   border: 1px solid #ccc;
   border-radius: 5px;
+  margin:20px;
 }
 </style>
 <template>
@@ -380,6 +381,7 @@ a {
               :prop="item.label"
               v-if="item.type != 'group'"
             >
+              <span style="color:#409eff;font-size:12px;">{{item.noteDesc}}</span>
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -470,25 +472,26 @@ a {
               </el-upload>
             </el-form-item>
             <!-- 域组件展示 -->
-            <h6
+            <section
+              class="groupMain"
+              v-if="item.type == 'group'"
+              :key="'review_gi' + index"
+            >
+              <h6
               v-if="item.type == 'group'"
-              align="center"
+              align="left"
               class="group_title"
               :key="'revire_g' + index"
             >
               {{ item.label }}
             </h6>
-            <section
-              class="groupMain"
-              v-if="item.type == 'group'"
-              :key="'review_gi' + index"
-            >
               <template v-for="(iitem, index) in item.children">
                 <el-form-item
                   :prop="iitem.label + '(' + item.label + ')'"
                   :key="'review_gc' + index"
                   :label="iitem.label + iitem.cntype"
                 >
+                  <span style="color:#409eff;font-size:12px;">{{iitem.noteDesc}}</span>
                   <el-tooltip
                     class="item"
                     effect="dark"
@@ -644,14 +647,28 @@ a {
           row-key="id"
           style="width: 100%"
         >
-          <el-table-column
-            v-for="(item, index) in analyseHeadList"
-            :key="index"
-            :label="item"
-            :prop="item"
-          >
-            <!-- <template slot-scope="scope">{{scope.row.item}}</template> -->
-          </el-table-column>
+          <template v-for="(item, index) in analyseHeadList">
+            <el-table-column
+              v-if="item.type=='image'"
+              :key="index"
+              :label="item.label"
+              :prop="item.label"
+            >
+              <template slot-scope="scope">
+                <img :src="url" alt="" v-for="(url,iindex) in scope.row[item.label]" :key="iindex" width="80" height="60" style="margin-right:5px;">
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-else
+              :key="index"
+              :label="item.label"
+              :prop="item.label"
+            >
+            </el-table-column>
+          </template>
+          <el-table-column prop="post_time" label="填报时间"> </el-table-column>
+          
+          <!-- <template slot-scope="scope">{{scope.row.item}}</template> -->
           <!-- <el-table-column prop="realname" label="姓名"> </el-table-column>
           <el-table-column prop="journal_name" label="所属期刊"></el-table-column>
           <el-table-column prop="cname" label="状态">
@@ -660,7 +677,6 @@ a {
               <span v-else>未填报</span>
             </template>
           </el-table-column> -->
-          <el-table-column prop="post_time" label="填报时间"> </el-table-column>
           <!-- <el-table-column prop="zip" width="80" label="操作">
           <template slot-scope="scope">
             <el-button class="edit" type="text" @click="showPostResult(scope.row)"

src/views/message/modelForm.vue

@@ -58,6 +58,7 @@
           text-align: left;
         }
         /deep/.el-form-item__content {
+          line-height: 20px!important;
           margin-right: 160px;
           position: relative;
           font,
@@ -168,7 +169,7 @@
     }
     .tpl_title {
       font-size: 18px;
-      // margin-bottom:20px;
+      margin:20px;
     }
     .tpl_form {
       margin: 0px;
@@ -329,11 +330,12 @@
 .group_title{
   font-size: 16px;
   font-weight: bold;
-  padding:10px 0px;
+  padding:10px 20px;
 }
 .groupMain{
   border:1px solid #ccc;
   border-radius: 5px;
+  margin: 20px;
 }
 </style>
 <template>
@@ -975,6 +977,7 @@
             <el-form ref="form" :model="form" class="tpl_form over_y">
               <template v-for="(item, index) in widgetList">
                 <el-form-item v-if="item.type!='group'" :key="'review'+index" :label="item.label + item.cntype">
+                  <span style="color:#409eff;font-size:12px;">{{item.noteDesc}}</span>
                   <el-tooltip
                     class="item"
                     effect="dark"
@@ -1068,20 +1071,22 @@
                   </el-upload>
                 </el-form-item>
                 <!-- 域组件展示 -->
-                <h6
+                
+                <section class="groupMain" v-if="item.type == 'group'" :key="'review_gi'+index">
+                  <h6
                   v-if="item.type == 'group'"
-                  align="center"
+                  align="left"
                   class="group_title"
                   :key="'revire_g'+index"
                 >
                   {{ item.label }}
                 </h6>
-                <section class="groupMain" v-if="item.type == 'group'" :key="'review_gi'+index">
                   <template v-for="(iitem, index) in item.children">
                     <el-form-item
                       :key="'review_gc'+index"
                       :label="iitem.label + iitem.cntype"
                     >
+                      <span style="color:#409eff;font-size:12px;">{{iitem.noteDesc}}</span>
                       <el-tooltip
                         class="item"
                         effect="dark"

src/views/message/survey/answer.html

@@ -123,7 +123,7 @@
   .group_title {
     font-size: 16px;
     font-weight: bold;
-    padding: 10px 0px;
+    padding: 10px 20px;
     margin:0px;
   }
 
@@ -131,6 +131,7 @@
     border: 1px solid #ccc;
     border-radius: 5px;
     margin-bottom:10px;
+    margin: 20px;
   }
   .groupMain .el-form-item{
     border:0px;
@@ -150,6 +151,7 @@
         <template v-for="(item, index) in widgetList">
           <el-form-item :key="index" :label="(index+1)+'、'+(item.label)+item.cntype" :prop="item.label"
             v-if="item.type != 'group'">
+            <span style="color:#409eff;font-size:12px;">{{item.noteDesc}}</span>
             <el-tooltip class="item" effect="dark" content="Left Bottom 提示文字" placement="bottom-end">
               <i v-if="item.noteDesc||item.noteImgs" class="el-icon-info"
                 style="position: absolute; top: -28px; right: 0px"></i>
@@ -190,13 +192,14 @@
             </el-upload>
           </el-form-item>
           <!-- 域组件展示 -->
-          <h6 v-if="item.type == 'group'" align="center" class="group_title" :key="'revire_g' + index">
-            {{ item.label }}
-          </h6>
           <section class="groupMain" v-if="item.type == 'group'" :key="'review_gi' + index">
+            <h6 v-if="item.type == 'group'" align="left" class="group_title" :key="'revire_g' + index">
+              {{ item.label }}
+            </h6>
             <template v-for="(iitem, index) in item.children">
               <el-form-item :prop="iitem.label + '(' + item.label + ')'" :key="'review_gc' + index"
                 :label="iitem.label + iitem.cntype">
+                <span style="color:#409eff;font-size:12px;">{{iitem.noteDesc}}</span>
                 <el-tooltip class="item" effect="dark" content="Left Bottom 提示文字" placement="bottom-end">
                   <i v-if="iitem.noteDesc || iitem.noteImgs" class="el-icon-info"
                     style="position: absolute; top: -28px; right: 0px"></i>

vue.config.js

@@ -2,8 +2,8 @@ module.exports={
     devServer:{
         proxy:{
             '/api':{
-                // target:'http://39.107.246.59:81',
-                target:'https://test.scxjc.club',
+                target:'http://39.107.246.59:81',
+                // target:'https://test.scxjc.club',
                 // target:'http://caos.tederen.com',
                 changeOrigin: true,
             }