xjc 4 年之前
父节点
当前提交
b1a17c09a2
共有 4 个文件被更改,包括 32 次插入11 次删除
  1. 2 2
      src/views/Home.vue
  2. 3 1
      src/views/message/InnerSurvey.vue
  3. 12 1
      src/views/message/Notice.vue
  4. 15 7
      src/views/message/OutSurvey.vue

+ 2 - 2
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>

+ 3 - 1
src/views/message/InnerSurvey.vue

@@ -102,6 +102,7 @@ a {
     margin-top: 20px !important;
     background: url("../../assets/survey_bg.png") no-repeat;
     background-size:100% 100%;
+    border-radius: 60px;
   }
 }
 </style>
@@ -294,8 +295,9 @@ a {
     </el-dialog>
     <!-- 问卷调查表单 -->
     <el-dialog
+      close-on-click-modal
+      :show-close="false"
       :title="dialogTitle"
-      :close-on-click-modal="false"
       :visible.sync="dialogVisible1"
       class="survey_dialog" width="400px" 
     >

+ 12 - 1
src/views/message/Notice.vue

@@ -482,7 +482,18 @@ export default {
       this.getData();
     },
     search1() {
-      this.analyseData(this.cur_post_type, this.cur_message_id);
+      let parm = this.form1;
+      let type = this.cur_post_type;
+      let message_id = this.cur_message_id;
+      parm.type = type;
+      parm.id = message_id;
+      this.dialogTitle2 = "统计结果";
+      this.dialogVisible2 = true;
+      this.$api.getNoticeAnalyse(parm).then((res) => {
+        this.analyseDataList = res.data.data.list;
+        this.cur_message_id = message_id;
+        this.cur_post_type = type;
+      });
     },
     openDiag() {
       this.form1 = {};

+ 15 - 7
src/views/message/OutSurvey.vue

@@ -18,12 +18,19 @@ a {
 }
 // 右边
 .item-main {
-  // margin:34px;
-  // height:600px;
-  // background: #FFFFFF;
-  border: 1px solid #dddddd;
-  box-shadow: 0px 5px 10px 0px rgba(0, 0, 0, 0.13);
-  border-radius: 20px;
+    // margin:34px;
+    // height:600px;
+    background: #FFFFFF;
+    width: 356px;
+    height: 575px;
+    overflow: auto;
+    // border: 1px solid #ddd;
+    // display: none;
+    position: relative;
+    top: 24px;
+    left: 4px;
+    // box-shadow: 0px 5px 10px 0px rgba(0, 0, 0, 0.13);
+    border-radius: 5px;
   .el-form.over_y {
     max-height: calc(100vh - 340px);
     overflow: auto;
@@ -255,8 +262,9 @@ a {
     </el-dialog>
     <!-- 问卷调查表单 -->
     <el-dialog
+      close-on-click-modal
+      :show-close="false"
       :title="dialogTitle"
-      :close-on-click-modal="false"
       :visible.sync="dialogVisible1"
       class="survey_dialog" width="400px" 
     >