修改添加资讯逻辑及样式

src/styles/global.less

@@ -1,130 +1,154 @@
 /*1.页面布局 start------------------------------------------------------------>*/
 //全局颜色
-@defaultBg:#fff;
-@defaultBorder:#E9EDF7;
-@defaultText:#999999;
+@defaultBg: #fff;
+@defaultBorder: #E9EDF7;
+@defaultText: #999999;
 //按钮颜色
-@deleteBg:#F7E5E5;
-@editBg:#E4E8FD;
-@mainBg:#E3EFE6;
-@linkBg:#F6EFE2;
-@upBg:#E2F5F6;
+@deleteBg: #F7E5E5;
+@editBg: #E4E8FD;
+@mainBg: #E3EFE6;
+@linkBg: #F6EFE2;
+@upBg: #E2F5F6;
 
 //页面布局样式
 .layerBox_search {
-  margin:30px 30px 10px 30px;
+  margin: 30px 30px 10px 30px;
   background: @defaultBg;
   border-radius: 20px;
-  border:1px solid @defaultBorder;
+  border: 1px solid @defaultBorder;
   padding: 20px 0;
   box-sizing: border-box;
+
   .searchTitle {
-    font-size:14px;
-    color:@defaultText;
-    margin-bottom:10px;
-    white-space:nowrap;
+    font-size: 14px;
+    color: @defaultText;
+    margin-bottom: 10px;
+    white-space: nowrap;
   }
+
   .searchBox {
     .el-cascader--medium {
-      width:100%;
+      width: 100%;
     }
+
     .el-select {
-      width:100%;
+      width: 100%;
     }
   }
+
   .el-row {
-    >div:nth-child(1){
-      padding-left:20px;
-      padding-right:20px;
+    >div:nth-child(1) {
+      padding-left: 20px;
+      padding-right: 20px;
     }
-    >div:nth-child(2){
-      padding-right:20px
+
+    >div:nth-child(2) {
+      padding-right: 20px
     }
-    >div:nth-child(3){
-      padding-right:20px
+
+    >div:nth-child(3) {
+      padding-right: 20px
     }
   }
 }
+
 .layerBox {
-  margin:30px;
+  margin: 30px;
   border-radius: 20px;
-  background:@defaultBg;
-  border:1px solid @defaultBorder;
+  background: @defaultBg;
+  border: 1px solid @defaultBorder;
   padding: 20px 20px 20px 20px;
   box-sizing: border-box;
 }
+
 .layerBoxNoBg {
-  margin:0 30px 0 30px;
+  margin: 0 30px 0 30px;
   text-align: right;
-  display:flex;
+  display: flex;
   align-items: center;
   justify-content: space-between;
 }
+
 //分页
 .alignBox {
-  text-align:right;
-  padding-right:30px;
-  padding-bottom:30px;
+  text-align: right;
+  padding-right: 30px;
+  padding-bottom: 30px;
 }
 
 //列表中的按钮样式
-.listBtnBox{
-  display:flex;
+.listBtnBox {
+  display: flex;
   align-items: center;
   justify-content: center;
 }
-.listDeleteBtn,.listEditBtn,.listMainBtn,.listUpBtn {
-  width:70px;
-  height:28px;
-  line-height:28px;
-  text-align:center;
+
+.listDeleteBtn,
+.listEditBtn,
+.listMainBtn,
+.listUpBtn {
+  width: 70px;
+  height: 28px;
+  line-height: 28px;
+  text-align: center;
   border-radius: 8px;
-  margin-left:10px;
-  cursor:pointer;
+  margin-left: 10px;
+  cursor: pointer;
+
   i {
-    margin-right:8px;
+    margin-right: 8px;
   }
 }
+
 .listLinkBtn {
-  width:120px;
-  height:28px;
-  line-height:28px;
-  text-align:center;
+  width: 120px;
+  height: 28px;
+  line-height: 28px;
+  text-align: center;
   border-radius: 8px;
-  margin-left:10px;
-  cursor:pointer;
+  margin-left: 10px;
+  cursor: pointer;
+
   i {
-    margin-right:8px;
+    margin-right: 8px;
   }
 }
-.listDeleteBtn{
-  color:#CC5F5F;
-  background:@deleteBg;
+
+.listDeleteBtn {
+  color: #CC5F5F;
+  background: @deleteBg;
 }
+
 .listDeleteBtn:hover {
-  background:#EFCFCF;
+  background: #EFCFCF;
 }
-.listEditBtn{
-  color:#5570F1;
-  background:@editBg;
+
+.listEditBtn {
+  color: #5570F1;
+  background: @editBg;
 }
+
 .listEditBtn:hover {
-  background:#CCD1F1;
+  background: #CCD1F1;
 }
-.listMainBtn{
-  color:#519C66;
-  background:@mainBg;
+
+.listMainBtn {
+  color: #519C66;
+  background: @mainBg;
 }
+
 .listMainBtn:hover {
-  background:#CAD9CB;
+  background: #CAD9CB;
 }
-.listLinkBtn{
-  color:#C59E4B;
-  background:@linkBg;
+
+.listLinkBtn {
+  color: #C59E4B;
+  background: @linkBg;
 }
+
 .listUpBtn {
-  color:#4BC1C5;
-  background:@upBg;
+  color: #4BC1C5;
+  background: @upBg;
 }
 
 
@@ -134,21 +158,24 @@
 .footerBtnbox {
   text-align: center;
 }
+
 .formDiv {
   .el-cascader {
-    width:100%;
+    width: 100%;
   }
+
   .treeBox {
     border: 1px solid #DCDFE6;
     border-radius: 4px;
     padding: 20px;
   }
 }
+
 .delete-button {
-  width:30px;
-  height:30px;
+  width: 30px;
+  height: 30px;
   line-height: 30px;
-  text-align:center;
+  text-align: center;
   border-radius: 50%;
   position: absolute;
   top: 60px;
@@ -157,50 +184,58 @@
   color: white;
   cursor: pointer;
   transition: background 0.3s ease;
-  z-index: 999; /* 确保删除按钮在图片上方 */
+  z-index: 999;
+  /* 确保删除按钮在图片上方 */
 }
+
 .delete-button:hover {
   background: rgba(255, 0, 0, 0.7);
 }
+
 .askBox {
   position: relative;
+
   i {
     position: absolute;
-    top:1px;
-    right:-5px;
-    width:10px;
-    height:10px;
-    color:#A9A9A9;
+    top: 1px;
+    right: -5px;
+    width: 10px;
+    height: 10px;
+    color: #A9A9A9;
   }
 }
 
 //logo上传
 .chooseImgDiv {
   width: 140px;
-  height:140px;
-  display:flex;
+  height: 140px;
+  display: flex;
   align-items: center;
   justify-content: center;
-  color:#5570F1;
-  font-size:14px;
+  color: #5570F1;
+  font-size: 14px;
+
   img {
-    display:block;
+    display: block;
   }
 }
+
 .uploaderBox {
-  .avatar-uploader{
+  .avatar-uploader {
     width: 140px;
-    height:140px;
+    height: 140px;
     border: 1px solid #d9d9d9;
     border-radius: 12px;
     cursor: pointer;
     position: relative;
     overflow: hidden;
   }
+
   .avatar-uploader {
     border-color: #d9d9d9;
   }
 }
+
 .avatar-uploader-icon {
   font-size: 20px;
   color: #8c939d;
@@ -209,6 +244,7 @@
   line-height: 60px;
   text-align: center;
 }
+
 .avatar {
   width: 140px;
   height: 140px;
@@ -217,24 +253,27 @@
 
 //2.导航池
 .windowTitle {
-  display:flex;
-  padding-bottom:20px;
-  font-size:16px;
+  display: flex;
+  padding-bottom: 20px;
+  font-size: 16px;
   font-weight: bold;
   box-sizing: border-box;
   margin-bottom: 20px;
+
   .webNavTitle {
-    width:120px;
-    text-align:right;
-    margin-right:20px;
+    width: 120px;
+    text-align: right;
+    margin-right: 20px;
   }
+
   .webNavTitleRight {
-    width:100%;
+    width: 100%;
     text-align: center;
   }
 }
+
 //关联导航池
-.layerBoxLineTwo{
+.layerBoxLineTwo {
   padding-top: 30px;
 }
 
@@ -261,30 +300,35 @@
 
 //发布新闻
 .bottomBtnBox {
-  margin:0 30px 30px 30px;
-  text-align:center;
+  margin: 0 30px 30px 30px;
+  text-align: center;
 }
+
 .disclaimerBox {
   border: 1px solid #DCDFE6;
   border-radius: 8px;
   padding: 20px;
   margin-left: 20px;
   margin-bottom: 22px;
-  .el-checkbox__inner{
+
+  .el-checkbox__inner {
     margin-right: 10px;
   }
+
   .disclaimerTitle {
     font-size: 14px;
     color: #606266;
     margin-bottom: 10px;
     display: flex;
     align-items: center;
+
     img {
       margin-right: 10px;
       width: 14px;
       height: 14px;
     }
   }
+
   .disclaimerText {
     font-size: 12px;
     color: #666666;
@@ -294,31 +338,35 @@
 /*页面布局 end------------------------------------------------------------>*/
 
 /*quill汉化 start------------------------------------------------------------>*/
- .ql-snow .ql-tooltip[data-mode=link]::before {
+.ql-snow .ql-tooltip[data-mode=link]::before {
   content: "请输入链接地址:" !important;
 }
+
 .ql-snow .ql-tooltip.ql-editing a.ql-action::after {
-    border-right: 0px;
-    content: '保存' !important;
-    padding-right: 0px;
+  border-right: 0px;
+  content: '保存' !important;
+  padding-right: 0px;
 }
 
 .ql-snow .ql-tooltip[data-mode=video]::before {
-    content: "请输入视频地址:" !important;
+  content: "请输入视频地址:" !important;
 }
 
 .ql-snow .ql-picker.ql-size .ql-picker-label::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item::before {
   content: '14px' !important;
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label[data-value=small]::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value=small]::before {
   content: '10px' !important;
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label[data-value=large]::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value=large]::before {
   content: '18px' !important;
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label[data-value=huge]::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value=huge]::before {
   content: '32px' !important;
@@ -328,26 +376,32 @@
 .ql-snow .ql-picker.ql-header .ql-picker-item::before {
   content: '文本' !important;
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
   content: '标题1' !important;
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
   content: '标题2' !important;
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
   content: '标题3' !important;
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
   content: '标题4' !important;
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
   content: '标题5' !important;
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
   content: '标题6' !important;
@@ -357,14 +411,25 @@
 .ql-snow .ql-picker.ql-font .ql-picker-item::before {
   content: '标准字体' !important;
 }
+
 .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=serif]::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=serif]::before {
   content: '衬线字体' !important;
 }
+
 .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=monospace]::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=monospace]::before {
   content: '等宽字体' !important;
 }
+
 /*quill汉化 end------------------------------------------------------------>*/
 
+// el-cascader高度 start
+.el-cascader-panel {
+  height: 500px;
+}
 
+.el-scrollbar__wrap {
+  height: 100% !important;
+}
+// el-cascader高度 end

src/utils/baseUrl.js

@@ -5,17 +5,17 @@ const URL = {
   //baseUrl: 'http://admindev.bjzxtw.org.cn:9501',//测试域名
   //baseUrl: 'http://116.131.8.26:9501',//pre环境ip
   //baseUrl: 'http://adminpre.bjzxtw.org.cn:9501',//pre环境域名
-  baseUrl: 'http://apipre1.bjzxtw.org.cn:29501',//pre环境域名2
+  // baseUrl: 'http://apipre1.bjzxtw.org.cn:29501',//pre环境域名2
   //baseUrl: 'http://192.168.1.201:9501',//刘佳伟本地环境
   //baseUrl:'http://192.168.1.115:9501',//冯蕊的本地环境
-  //baseUrl: 'http://192.168.1.127:9501',//刘剑的本地环境
+  baseUrl: 'http://192.168.1.127:9501',//刘剑的本地环境
   //WebsocketUrl: 'ws://192.168.1.201:9506',//刘佳伟 -- websocket地址
-  //WebsocketUrl: 'ws://192.168.1.127:9506'//刘剑 -- websocket地址
+  WebsocketUrl: 'ws://192.168.1.127:9506'//刘剑 -- websocket地址
   //WebsocketUrl: 'ws://183.131.25.186:9506',//测试环境ip -- websocket地址
   //WebsocketUrl: 'ws://admindev.bjzxtw.org.cn:9506',//测试环境域名
   //WebsocketUrl: 'ws://116.131.8.26:9506'//pre环境ip -- websocket地址
   //WebsocketUrl: 'ws://adminpre.bjzxtw.org.cn:9506'//pre环境域名 -- websocket地址
-  WebsocketUrl: 'ws://apipre1.bjzxtw.org.cn:29501'//pre环境域名 -- websocket地址
+  // WebsocketUrl: 'ws://apipre1.bjzxtw.org.cn:29501'//pre环境域名 -- websocket地址
   //WebsocketUrl: 'ws://103.105.201.2:9506'//正式环境ip -- websocket地址
   //WebsocketUrl: 'wss://flzxw.bjzxtw.org.cn'//正式环境域名 wss可用 -- websocket地址
 }

src/views/advertise/adPlaceList.vue

@@ -43,15 +43,15 @@
                         </el-table-column>
                         <el-table-column prop="name" label="广告位名称" width="220">
                         </el-table-column>
-                        <el-table-column prop="type_name" label="广告类型" width="130">
+                        <el-table-column prop="type_name" label="广告类型" width="110">
                         </el-table-column>
-                        <el-table-column prop="size" label="宽/高 (PX)" width="140">
+                        <el-table-column prop="size" label="宽/高 (PX)" width="120">
                         </el-table-column>
-                        <el-table-column prop="price" label="价格 (天)" width="130">
+                        <el-table-column prop="price" label="价格 (天)" width="110">
                         </el-table-column>
-                        <el-table-column prop="created_at" label="创建时间" width="220">
+                        <el-table-column prop="created_at" label="创建时间" >
                         </el-table-column>
-                        <el-table-column prop="updated_at" label="修改时间" width="220">
+                        <el-table-column prop="updated_at" label="修改时间" >
                         </el-table-column>
                         <el-table-column fixed="right" label="操作" width="200">
                             <template slot-scope="scope">
@@ -198,7 +198,7 @@ export default {
             }
         }
         return {
-            tableDivTitle: "广告列表",  //列表标题
+            tableDivTitle: "广告位列表",  //列表标题
             dialogTableVisible: false,      //编辑弹框
             dialogName: '编辑', //编辑弹窗名称
             loading: true, //加载中

src/views/advertise/advertiseList.vue

@@ -173,10 +173,10 @@
             <div class="graph">
                 <el-carousel indicator-position="outside" autoplay loop>
                     <el-carousel-item>
-                        <img src="../../assets/advertise/ad01.png" alt="" class="shilitu">
+                        <img src="../../assets/advertise/ad1.png" alt="" class="shilitu">
                     </el-carousel-item>
                     <el-carousel-item>
-                        <img src="../../assets/advertise/ad02.png" alt="" class="shilitu">
+                        <img src="../../assets/advertise/ad2.png" alt="" class="shilitu">
                     </el-carousel-item>
                 </el-carousel>
             </div>

src/views/news/creatNews.vue

@@ -18,13 +18,13 @@
           </el-form-item>
           <div v-if="form.islink == true">
             <el-form-item label="站点名称：" prop="cat_arr_id" class="custom-align-right">
-              <el-cascader :key="parentKey" v-model="form.web_site_id" placeholder="请选择站点名称"
+              <el-cascader :key="parentKey" v-model="form.web_site_id" placeholder="请选择站点名称" popper-class="my_cascader"
                 :options="creatNews_nav_pool_arr" @change="creatNews_nav_pool_change_fun(form.web_site_id)" filterable
                 clearable></el-cascader>
             </el-form-item>
             <el-form-item label="展示名称：" prop="cat_arr_id" class="custom-align-right">
               <el-cascader :key="parentKey_2" v-model="form.cat_arr_id" placeholder="请选择要绑定的父级名称" :props="parentData_2"
-                filterable clearable></el-cascader>
+                popper-class="my_cascader" filterable clearable></el-cascader>
             </el-form-item>
             <!-- <el-form-item label="导航池名称：" prop="cat_arr_id" class="custom-align-right">
               <el-cascader :key="parentKey" v-model="form.cat_arr_id" placeholder="请选择要绑定的导航池名称" :props="parentData" filterable clearable></el-cascader>
@@ -40,41 +40,41 @@
             <div v-if="creatNews_user_type != 10000">
               <el-form-item label="展示名称：" prop="cat_arr_id" class="custom-align-right">
                 <el-cascader :key="parentKey" v-model="form.cat_arr_id" placeholder="请选择要绑定的展示名称" :props="parentData"
-                  filterable clearable></el-cascader>
+                  popper-class="my_cascader" style="height: 100%;" filterable clearable></el-cascader>
               </el-form-item>
             </div>
             <div>
               <div v-if="creatNews_user_type == 10000">
                 <el-form-item label="站点名称：" prop="cat_arr_id" class="custom-align-right">
                   <el-cascader :key="parentKey" v-model="form.web_site_id" placeholder="请选择站点名称"
-                    :options="creatNews_nav_pool_arr" @change="creatNews_nav_pool_change_fun(form.web_site_id)"
-                    filterable clearable></el-cascader>
+                    popper-class="my_cascader" :options="creatNews_nav_pool_arr"
+                    @change="creatNews_nav_pool_change_fun(form.web_site_id)" filterable clearable></el-cascader>
                 </el-form-item>
                 <el-form-item label="展示名称：" prop="cat_arr_id" class="custom-align-right">
                   <el-cascader :key="parentKey_2" v-model="form.cat_arr_id" placeholder="请选择要绑定的父级名称"
-                    :props="parentData_2" filterable clearable></el-cascader>
+                    popper-class="my_cascader" style="height: 100%;" :props="parentData_2" filterable
+                    clearable></el-cascader>
                 </el-form-item>
               </div>
-              <el-form-item label="行政区划：" class="custom-align-right" prop="city_arr_id">
+              <el-form-item label="行政区划：" class="custom-align-right" prop="">
                 <CityCascader v-model="form.city_arr_id" @update-city-id="update_city_arr_id"></CityCascader>
               </el-form-item>
-              <el-form-item label="行政职能：" class="custom-align-right" prop="department_arr_id">
+              <el-form-item label="行政职能：" class="custom-align-right" prop="">
                 <el-cascader :key="searchDepartmentKey" v-model="form.department_arr_id" placeholder="选择导航池所属行政区划"
-                  :props="searchDepartmentData" filterable clearable></el-cascader>
+                  popper-class="my_cascader" :props="searchDepartmentData" filterable clearable></el-cascader>
               </el-form-item>
               <div v-if="creatNews_user_type == 10000">
                 <el-form-item label="推荐等级：" class="custom-align-right">
-                  <el-select v-model="form.level" clearable placeholder="请选择推荐等级..">
+                  <el-select v-model="form.level" multiple clearable placeholder="请选择推荐等级.." @change="levelChange">
                     <el-option label="头条" :value="1"></el-option>
                     <el-option label="轮播图" :value="2"></el-option>
                     <el-option label="推荐图" :value="3"></el-option>
-                    <el-option label="热点资讯" :value="4"></el-option>
-                    <el-option label="资讯推荐" :value="5"></el-option>
+                    <!-- <el-option label="热点资讯" :value="4"></el-option>
+                    <el-option label="资讯推荐" :value="5"></el-option> -->
                   </el-select>
                 </el-form-item>
               </div>
-              <el-form-item label="缩略图：" class="custom-align-right" prop="imgUrl"
-                v-if="form.level == 2 || form.level == 3">
+              <el-form-item label="缩略图：" class="custom-align-right" prop="">
                 <div class="uploaderBox">
                   <el-upload class="avatar-uploader" action="#" :show-file-list="false"
                     :before-upload="beforeAvatarUpload">
@@ -92,9 +92,10 @@
                     </div>
                   </el-upload>
                   <input type="hidden" v-model="form.imgurl">
+                  <span class="photo_tips">推荐图片长宽比例为 16:9，大小不能超过 500 K。</span>
                 </div>
               </el-form-item>
-              <el-form-item label="资讯关键词：" prop="keyword" class="custom-align-right">
+              <el-form-item label="资讯关键词：" prop="" class="custom-align-right">
                 <template #label>
                   <span class="askBox">
                     资讯关键词：
@@ -106,7 +107,7 @@
                 <tagInput :initialTags="tags" @tags-updated="updateTags"></tagInput>
                 <!-- <el-input v-model="form.keyword" autocomplete="off" placeholder="请输入资讯关键词"></el-input> -->
               </el-form-item>
-              <el-form-item label="资讯描述：" prop="introduce" class="custom-align-right">
+              <el-form-item label="资讯描述：" prop="" class="custom-align-right">
                 <template #label>
                   <span class="askBox">
                     资讯描述：
@@ -118,6 +119,39 @@
                 <el-input type="textarea" v-model="form.introduce" class="custom-textarea"
                   placeholder="请输入资讯描述"></el-input>
               </el-form-item>
+              <el-form-item label="作者：" prop="author" class="custom-align-right">
+                <el-input v-model="form.author" autocomplete="off" placeholder="请输入作者"></el-input>
+              </el-form-item>
+              <el-form-item label="浏览量：" class="custom-align-right">
+                <el-input v-model="form.hits" autocomplete="off" placeholder="请输入浏览量"></el-input>
+              </el-form-item>
+              <el-form-item label="是否为原创：" prop="is_original" class="custom-align-right">
+                <el-radio-group v-model="form.is_original" @change="changeIsOriginal">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <div v-if="form.is_original == 0">
+                <el-form-item label="来源名称：" prop="copyfrom" class="custom-align-right">
+                  <el-input v-model="form.copyfrom" autocomplete="off" placeholder="请输入来源名称"></el-input>
+                </el-form-item>
+                <el-form-item label="来源链接：" prop="fromurl" class="custom-align-right">
+                  <el-input v-model="form.fromurl" autocomplete="off" placeholder="请输入来源链接"></el-input>
+                </el-form-item>
+                <div class="disclaimerBox">
+                  <div class="disclaimerTitle">
+                    <img src="@/assets/public/check.png" />同意《免责声明》：
+                  </div>
+                  <div class="disclaimerText">
+                    本文来源于网络转载，仅供学习交流使用，不构成商业目的。版权归原作者所有，如涉及作品内容、版权和其他问题，请在30日内与本站联系，我们将在第一时间处理。</div>
+                </div>
+              </div>
+              <div v-if="form.is_original == 1">
+                <el-form-item label="来源名称：" prop="copyfrom" class="custom-align-right">
+                  <el-input v-model="form.copyfrom" autocomplete="off" placeholder="请输入来源名称"
+                    disabled="disabled"></el-input>
+                </el-form-item>
+              </div>
               <div class="QuillTitle">
                 <span>* </span>资讯内容：
                 <div @click="toggleSourceMode" class="QuillModelBtn">
@@ -127,7 +161,7 @@
               <el-form-item label="" prop="content">
                 <div class="editor-container">
                   <div v-if="showHtml">
-                    <textarea v-model="editorHtml" style="width: 100%; height: 400px;"></textarea>
+                    <textarea v-model="editorHtml" style="width: 100%; height: 300px;"></textarea>
                   </div>
                   <div v-else>
                     <quill-editor ref="quillEditor" v-model="form.content" :options="editorOptions"
@@ -138,7 +172,7 @@
                     accept="image/jpeg, image/png" />
                 </div>
               </el-form-item>
-              <el-form-item label="作者：" prop="author" class="custom-align-right">
+              <!-- <el-form-item label="作者：" prop="author" class="custom-align-right">
                 <el-input v-model="form.author" autocomplete="off" placeholder="请输入作者"></el-input>
               </el-form-item>
               <el-form-item label="浏览量：" class="custom-align-right">
@@ -160,7 +194,6 @@
                 <div class="disclaimerBox">
                   <div class="disclaimerTitle">
                     <img src="@/assets/public/check.png" />同意《免责声明》：
-                    <!-- <el-checkbox v-model="disclaimer" disabled="disabled"></el-checkbox> -->
                   </div>
                   <div class="disclaimerText">
                     本文来源于网络转载，仅供学习交流使用，不构成商业目的。版权归原作者所有，如涉及作品内容、版权和其他问题，请在30日内与本站联系，我们将在第一时间处理。</div>
@@ -171,7 +204,7 @@
                   <el-input v-model="form.copyfrom" autocomplete="off" placeholder="请输入来源名称"
                     disabled="disabled"></el-input>
                 </el-form-item>
-              </div>
+              </div> -->
               <!-- <el-form-item label="资讯状态：" class="custom-align-right" style="width: 100%;" v-if="creatNews_user_type == 10000">
                 <el-select v-model="form.status" placeholder="请选择..">
                   <el-option label="已发布" :value="1"></el-option>
@@ -320,12 +353,12 @@ export default {
         content: "",//内容
         author: "",//作者
         hits: "",//浏览量
-        is_original: 0,//是否为原创 0非 1是
-        copyfrom: "",//来源名称
+        is_original: 1,//是否为原创 0非 1是
+        copyfrom: "本网",//来源名称
         fromurl: "",//来源地址
         status: 0,//状态 0待发布 1已发布 404已删除  如果是普通用户，这里始终为0
         web_site_id: 0,
-        is_survey: 1,//调查问卷：0：否；1：是；
+        is_survey: 0,//调查问卷：0：否；1：是；
         survey_name: "",//问卷名称
         suvey_array: "",//选项名称集合 
         survey_type: 0 //0:单选 1：复选
@@ -343,11 +376,11 @@ export default {
         //推荐等级不能为空
         //level:[{required:true,trigger:'blur',validator:validateEmpty}],
         //关键词不能为空
-        keyword: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        // keyword: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         //描述不能为空
-        introduce: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        // introduce: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         //行政区划
-        city_arr_id: [{ required: true, trigger: 'blur', validator: validateArray }],
+        // city_arr_id: [{ required: true, trigger: 'blur', validator: validateArray }],
         //行政职能
         department_arr_id: [{ required: true, trigger: 'blur', validator: validateArray }],
         //内容不能为空
@@ -720,7 +753,7 @@ export default {
         id: this.$route.query.id
       };
       this.$store.dispatch('news/getArticleInfo', data).then(res => {
-        console.log(res);
+        console.log('111111', res);
         this.form.title = res.data.title;
         //判断是否使用了外链
         if (res.data.islink == 1) {
@@ -742,16 +775,16 @@ export default {
           this.form.linkurl = res.data.linkurl;
         }
         //如果推荐等级为0 不再回显等级
-        if (res.data.level == 0) {
+        if (res.data.level == "[]") {
           this.form.level = "";
         } else {
-          this.form.level = res.data.level;
+          this.form.level = JSON.parse(res.data.level);
         }
         //回显站点名称
         //判断web_site_id是否为字符串,如果是转换为数字
-        if(typeof res.data.web_site_id === 'string') {
+        if (typeof res.data.web_site_id === 'string') {
           this.form.web_site_id = Number(res.data.web_site_id);
-        }else{
+        } else {
           this.form.web_site_id = res.data.web_site_id//站点名称
         }
 
@@ -771,7 +804,7 @@ export default {
         this.form.imgurl = res.data.imgurl;
         this.imgUrl = res.data.imgurl;
         this.form.keyword = res.data.keyword;
-        this.tags=res.data.keyword?res.data.keyword.split(","):[];
+        this.tags = res.data.keyword ? res.data.keyword.split(",") : [];
         this.form.introduce = res.data.introduce;
         this.form.content = res.data.content;
         this.form.author = res.data.author;
@@ -781,7 +814,11 @@ export default {
         this.form.fromurl = res.data.fromurl;
         this.form.status = res.data.status;
         this.form.survey_name = res.data.survey_name;
-        this.form.is_survey = res.data.is_survey;
+        if (res.data.is_survey == null) {
+          this.form.is_survey = 0;
+        } else {
+          this.form.is_survey = res.data.is_survey;
+        }
         this.form.survey_type = res.data.survey_type;
         this.inputList = [];
         if (res.data.survey_array.length > 0) {
@@ -847,9 +884,12 @@ export default {
         this.cleatForm(1)
       }
       //如果推荐等级为空，则设置为0
-      if (this.form.level == "") {
-        this.form.level = 0;
-      }
+      // if (this.form.level == "") {
+      //   this.form.level = "0";
+      // }else{
+      this.form.level = JSON.stringify(this.form.level);
+      // }
+
       //取出行政职能和行政区划数组的最后一个数字
       this.form.department_id = this.form.department_arr_id[this.form.department_arr_id.length - 1];
       this.form.city_id = this.form.city_arr_id[this.form.city_arr_id.length - 1];
@@ -1075,6 +1115,13 @@ export default {
       this.tags = newTags;
       this.form.keyword = newTags.join(',');
     },
+    //推荐等级多选获取到的数据
+    levelChange(value) {
+      // const str = JSON.stringify(value);
+      // console.log(str);
+      this.form.level = value;
+      console.log(this.form.level);
+    }
   },
   mounted() {
     this.creatNews_user_type = getUseType()
@@ -1157,16 +1204,16 @@ export default {
 }
 
 .editor-container {
-  height: 420px;
-  padding-bottom: 20px;
+  height: 310px;
+  padding-bottom: 5px;
 }
 
 .my-quill-editor {
-  height: 320px;
+  height: 245px;
 }
 
 .ql-editor {
-  height: 320px;
+  height: 245px;
 }
 
 /* 富文本对齐方式 */
@@ -1226,6 +1273,10 @@ export default {
   /* 设置标签文字右对齐 */
 }
 
+::v-deep .el-popper {
+  height: 500px;
+}
+
 ::v-deep .el-select {
   width: 100%;
   /* 禁止用户拖拽调整大小 */
@@ -1256,4 +1307,26 @@ export default {
   }
 }
 
-//执行v-deep穿透scope选择器 end------------------------------------------------------------>*/</style>
+//该项不能为空几个字的位置
+::v-deep .el-form-item__error {
+  color: #ff4949;
+  font-size: 12px;
+  line-height: 1;
+  padding-top: 0px;
+  position: absolute;
+  top: 22%;
+  left: 93%;
+}
+
+//输入框距离底部的距离
+::v-deep .el-form-item {
+  margin-bottom: 5px;
+}
+
+//图片提示文字样式
+.photo_tips {
+  font-size: 12px;
+  color: #999;
+}
+// 执行v-deep穿透scope选择器 end------------------------------------------------------------>
+</style>

src/views/website/editNavigation.vue

@@ -87,27 +87,26 @@
             <el-input v-model="form.alias" autocomplete="off"></el-input>
             <input type="hidden" v-model="form.seo_title">
           </el-form-item>
-          <el-form-item label="栏目标题：" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
+          <el-form-item label="展示标题：" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
             <div class="formLabelFloatBox">
               <el-input v-model="form.seo_title" autocomplete="off"></el-input>
             </div>
           </el-form-item>
-          <el-form-item label="排序：" :label-width="formLabelWidth" prop="sort" class="custom-align-right">
-            <div class="formLabelFloatBox">
-              <el-input v-model="form.sort" autocomplete="off" ></el-input>
-            </div>
-          </el-form-item>
-          <el-form-item label="栏目关键词：" :label-width="formLabelWidth" prop="seo_keywords" class="custom-align-right">
+          <el-form-item label="展示关键词：" :label-width="formLabelWidth" prop="seo_keywords" class="custom-align-right">
             <div class="formLabelFloatBox">
               <inputTag  :initialTags="tags" @tags-updated="updateTags"/> 
               <!-- <inputTag  :initialTags="form.seo_keywords" @tags-updated="updateTags"/> -->
               <!-- <el-input v-model="form.seo_keywords" autocomplete="off"></el-input> -->
             </div>
           </el-form-item>
-          
-          <el-form-item label="栏目描述：" :label-width="formLabelWidth" prop="seo_description" class="custom-align-right">
+          <el-form-item label="展示描述：" :label-width="formLabelWidth" prop="seo_description" class="custom-align-right">
             <el-input type="textarea" v-model="form.seo_description" class="custom-textarea"></el-input>
           </el-form-item>
+          <el-form-item label="排序：" :label-width="formLabelWidth" prop="sort" class="custom-align-right">
+            <div class="formLabelFloatBox">
+              <el-input v-model="form.sort" autocomplete="off" ></el-input>
+            </div>
+          </el-form-item>
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -357,6 +356,7 @@ export default {
             });
             //清空并退出
             this.closeWindow();
+            this.getData();
           }).catch(() => {
             this.$message({
               type: 'info',