Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/zky-admin

src/style/home.scss

@@ -195,7 +195,7 @@ tbody{
 }
 
 .edit{
-	color: #FFB82F;
+	color: rgb(0, 128, 0);
 }
 .del{
 	color: #F01010;
@@ -242,7 +242,7 @@ tbody{
 }
 // 停用启用样式
 .open {
-	color: rgb(19, 206, 102);
+	color:#409eff;
 }
 .close {
 	color: red;

src/views/Home.vue

@@ -1,13 +1,17 @@
 <style lang="scss">
 @import '../style/home.scss';
+.siteTitle{
+	width:300px;
+	margin:0 auto;
+}
 </style>
 
 <template>
 	<el-container>
 		<el-header>
 			<div class="header">
-				<!-- <img class="logo" src="../assets/logo.png" alt=""> -->
-				期刊微信公众号管理系统
+				<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

@@ -30,7 +30,7 @@ a {
   top: 24px;
   left: 4px;
   // box-shadow: 0px 5px 10px 0px rgba(0, 0, 0, 0.13);
-  // border-radius: 20px;
+  border-radius: 5px;
   .el-form.over_y {
     max-height: calc(100vh - 340px);
     overflow: visible;
@@ -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" 
     >

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 = {};
@@ -526,7 +537,7 @@ export default {
       });
     },
     edit(row) {
-      this.$api.getNoticeInfo({ id: row.id }).then((res) => {
+      this.$api.getNoticeInfo({ id: row.id,type:"edit" }).then((res) => {
         this.form1 = res.data.data;
         this.fileList = res.data.data.fileurl
         this.dialogTitle = "编辑消息";

src/views/message/OutSurvey.vue

@@ -18,14 +18,22 @@ 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;
   }
   /deep/.el-form-item__label {
     float: none;
@@ -83,6 +91,17 @@ a {
     width: 100%;
   }
 }
+.survey_dialog{
+  .el-dialog{
+    // width:25%;
+    width: 400px;
+    height: 750px;
+    margin-top: 20px !important;
+    background: url("../../assets/survey_bg.png") no-repeat;
+    background-size:100% 100%;
+    border-radius: 60px;
+  }
+}
 </style>
 <template>
   <section>
@@ -243,9 +262,11 @@ 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" 
     >
       <div class="item-main">
         <img src="../../assets/survey_logo.png" alt="" class="survey_logo" />

src/views/message/modelForm.vue

@@ -117,7 +117,7 @@
                 // display: none;
                 // border: 1px solid #DDDDDD;
                 // box-shadow: 0px 5px 10px 0px rgba(0, 0, 0, 0.13);
-                // border-radius: 20px; 
+                border-radius: 5px; 
                 overflow: auto;
                 .el-form.over_y{
                    border: none;

vue.config.js

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