Kaynağa Gözat

Merge branch 'pre' into pre_category_03_11_liu

rkljw 1 ay önce
ebeveyn
işleme
df7e088682

BIN
src/assets/advertise/ad1.png


BIN
src/assets/advertise/ad2.png


+ 163 - 98
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

+ 2 - 2
src/utils/baseUrl.js

@@ -8,9 +8,9 @@ const URL = {
   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地址

+ 6 - 6
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, //加载中

+ 7 - 7
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>
@@ -1010,22 +1010,22 @@ export default {
 }
 
 .graph {
-    width: 900px;
-    height: 530px;
+    width: 100%;
     margin: 0 auto;
     overflow: hidden;
 
     .shilitu {
-        width: 900px;
-        height: 495px;
+        width: 100%;
+        height: 380px;
         z-index: 100000;
     }
 
 }
 
+
 ::v-deep .el-carousel__container {
     position: relative;
-    height: 500px;
+    height: 370px;
 }
 
 /* 自定义指示器样式 */

+ 131 - 97
src/views/news/addJobHunting.vue

@@ -34,7 +34,7 @@
                 </div>
 
               </el-upload>
-              <div class="imgBox" style="color:red;margin-left: 00px ;margin-bottom: 20px; padding-top: -20px;">
+              <div class="imgBox" style="color:red;margin-left: 00px ;margin-bottom: 0px; padding-top: 0px;">
                 请添加图片,上传格式要求jpg、gif、png,不大于500 k</div>
             </div>
           </el-form-item>
@@ -47,21 +47,21 @@
             <el-input v-model="form.name" autocomplete="off" placeholder="请输入姓名"></el-input>
           </el-form-item>
           <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"
+            <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>
             </el-form-item>
           </div>
           <div v-if="creatNews_user_type == 10000">
 
-            <el-form-item label="站点名称:" prop="cat_arr_id" class="custom-align-right">
+            <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>
             </el-form-item>
 
 
-            <el-form-item label="导航池名称:" prop="cat_arr_id" class="custom-align-right">
+            <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>
             </el-form-item>
@@ -78,11 +78,11 @@
             <el-date-picker v-model="form.jobtime" type="date" placeholder="选择参加工作时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="手机号:" prop="phone" class="custom-align-right">
+          <el-form-item label="手机号" prop="phone" class="custom-align-right">
             <el-input v-model="form.phone" autocomplete="off" placeholder="请输入手机号"></el-input>
           </el-form-item>
-          <el-form-item label="微信号:" prop="phone" class="custom-align-right">
-            <el-input v-model="form.phone" autocomplete="off" placeholder="请输入微信号"></el-input>
+          <el-form-item label="微信号:" prop="wx" class="custom-align-right">
+            <el-input v-model="form.wx" autocomplete="off" placeholder="请输入微信号"></el-input>
           </el-form-item>
 
           <el-form-item label="出生年月:" prop="validity" class="custom-align-right">
@@ -91,7 +91,7 @@
           </el-form-item>
 
           <el-form-item label="最高学历:" class="custom-align-right" style="width: 100%;">
-            <el-select v-model="form.educational" placeholder="请选择最高学历">
+            <el-select v-model="form.educational" placeholder="请选择最高学历" @change='changeCompanyNature()'>
               <el-option v-for="item in educations" :key="item.id" :label="item.ename" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
@@ -104,30 +104,30 @@
               <el-option label="其他" :value="4"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="籍贯:" prop="origin" class="custom-align-right">
+          <el-form-item label="籍贯" prop="origin" class="custom-align-right">
             <el-input v-model="form.origin" autocomplete="off" placeholder="请输入籍贯"></el-input>
           </el-form-item>
 
           <el-form-item label="语言能力:" class="custom-align-right" style="width: 100%; display: inline;">
-            <el-select v-model="form.language" placeholder="请选择语种" style="width: 40%;">
+            <el-select v-model="form.language" placeholder="请选择语种" style="width: 40%;" @change='changeCompanyNature()'>
               <el-option v-for="item in languages" :key="item.id" :label="item.ename" :value="item.id"></el-option>
             </el-select>
-            <el-select v-model="form.level" placeholder="请选择掌握程度" style="width: 40%;">
+            <el-select v-model="form.level" placeholder="请选择掌握程度" style="width: 40%;" @change='changeCompanyNature()'>
               <el-option v-for="item in languagetypes" :key="item.id" :label="item.ename" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
-          <el-divider content-position="right"> </el-divider>
-          <div id="jobIntentions">
+          <!-- <el-divider content-position="right"> </el-divider> -->
+          <div id="jobIntentions" style="margin: 10px 0px;">
             <tableTitle name="求职意向" />
             <!-- 求职意向表单内容 -->
           </div>
           <el-form-item label="发布地点:" prop="city_arr_id" class="custom-align-right">
-            <el-cascader :key="cascaderKey" v-model="form.city_arr_id" placeholder="发布地区" :props="cityData" filterable
-              clearable></el-cascader>
+            <el-cascader :key="cascaderKey" v-model="form.city_arr_id" placeholder="请选择发布地区" :props="cityData"
+              filterable clearable></el-cascader>
           </el-form-item>
 
-          <el-form-item label="职位性质" class="custom-align-right" style="width: 100%;">
-            <el-select v-model="form.politic" placeholder="请选择职位性质">
+          <el-form-item label="职位性质" class="custom-align-right" style="width: 100%;">
+            <el-select v-model="form.politic" placeholder="请选择职位性质" @change='changeCompanyNature()'>
               <el-option v-for="item in natures" :key="item.id" :label="item.ename" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
@@ -144,23 +144,23 @@
 
             </el-select>
           </el-form-item>
+          <el-form-item label="公司性质:" v-if="jobNature" prop="company_nature" class="custom-align-right">
+            <el-select v-model="form.company_nature" placeholder="请选择公司性质" @change='changeCompanyNature()'>
+              <el-option v-for="item in jobNature" :key="item.id" :label="item.nature_name" :value="item.id">
+              </el-option>
 
-          <el-form-item label="公司性质:" prop="company_nature" class="custom-align-right">
-            <el-select v-model="form.company_nature" placeholder="请选择公司性质:">
-              <el-option v-for="item in jobNature" :key="item.id" :label="item.nature_name"
-                :value="item.id"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="薪资范围:" prop="salary" class="custom-align-right">
-            <el-select v-model="form.salary" placeholder="请选择薪资范围">
+            <el-select v-model="form.salary" placeholder="请选择薪资范围" @change='changeCompanyNature()'>
               <el-option v-for="item in incomes" :key="item.id" :label="item.ename" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="个人评价:" prop="self_evaluation" class="custom-align-right">
+          <el-form-item label="个人评价" prop="self_evaluation" class="custom-align-right">
             <el-input v-model="form.self_evaluation" autocomplete="off" type="textarea" aria-rowspan="6"
               placeholder="请输入个人评价"></el-input>
           </el-form-item>
-          <el-divider content-position="right"> </el-divider>
+          <!-- <el-divider content-position="right"> </el-divider> -->
           <div id="professionalSkills">
             <tableTitle name="专业技能" />
             <!-- 专业技能表单内容 -->
@@ -170,21 +170,10 @@
               +
               添加</el-button>
           </el-form-item>
-
-          <!-- <el-form-item v-for="(item, index) in form.skillsList" :key="index" :label="`专业技能 ${index + 1}:`"
-            prop="skills11" class="custom-align-right">
-
-            <el-input v-model="form.skillsList[index]" autocomplete="off" placeholder="请输入专业技能"> </el-input>
-          </el-form-item> -->
-
-          <el-form-item v-for="(item, index) in form.skillList" :key="index" :label="'技能' + (index + 1)"
+          <el-form-item v-for="(item, index) in form.skillList" :key="index" :label="'技能' + (index + 1) + ':'"
             prop="skillList" class="custom-align-right">
             <el-input v-model="form.skillList[index].skill" autocomplete="off" placeholder="请输入专业技能"></el-input>
-
           </el-form-item>
-          <el-divider content-position="right"> </el-divider>
-
-
           <div id="workExperience">
             <tableTitle name="工作经历" />
           </div>
@@ -198,26 +187,28 @@
 
           <div v-for="(item, index) in form.job_experience" :key="index">
 
-            <el-form-item label="公司名称:" prop="company_name" class="custom-align-right">
+            <el-form-item label="公司名称:" prop="company_name" class="custom-align-right" style="width: 100%;">
               <el-input v-model="form.job_experience[index].company_name" autocomplete="off"
                 placeholder="请输入公司名称"></el-input>
             </el-form-item>
 
 
             <el-form-item label="所属行业:" prop="job_industry" class="custom-align-right" style="width: 100%;">
-              <el-select v-model="form.job_experience[index].job_industry" placeholder="请选择所属行业">
+              <el-select v-model="form.job_experience[index].job_industry" placeholder="请选择所属行业"
+                @change='changeCompanyNature()'>
                 <el-option v-for="item in jobIndustry" :key="item.hyid" :label="item.hyname"
                   :value="item.hyid"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="职位名称:" prop="job_name" class="custom-align-right">
-              <el-select v-model="form.job_experience[index].job_name" placeholder="请选择职位名称">
+              <el-select v-model="form.job_experience[index].job_name" placeholder="请选择职位名称"
+                @change='changeCompanyNature()'>
                 <el-option v-for="item in jobPosition" :key="item.zwid" :label="item.zwname"
                   :value="item.zwid"></el-option>
 
               </el-select>
             </el-form-item>
-            <el-form-item label="所属部门:" prop="department" class="custom-align-right">
+            <el-form-item label="所属部门" prop="department" class="custom-align-right">
               <el-input v-model="form.job_experience[index].department" autocomplete="off"
                 placeholder="请输入所属部门"></el-input>
             </el-form-item>
@@ -227,15 +218,15 @@
                 start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="工作内容:" prop="job_content" class="custom-align-right">
+            <el-form-item label="工作内容" prop="job_content" class="custom-align-right">
               <el-input v-model="form.job_experience[index].job_content" autocomplete="off" type="textarea"
                 aria-rowspan="6" placeholder="请输入工作内容"></el-input>
             </el-form-item>
-            <el-form-item label="工作业绩:" prop="performance" class="custom-align-right">
+            <el-form-item label="工作业绩" prop="performance" class="custom-align-right">
               <el-input v-model="form.job_experience[index].performance" autocomplete="off" type="textarea"
                 aria-rowspan="6" placeholder="请输入工作业绩"></el-input>
             </el-form-item>
-            <el-divider content-position="right">{{ index + 1 }}</el-divider>
+            <el-divider></el-divider>
           </div>
 
 
@@ -255,11 +246,12 @@
                 placeholder="请输入学校名称"></el-input>
             </el-form-item>
             <el-form-item label="学历:" prop="school_education" class="custom-align-right" style="width: 100%;">
-              <el-select v-model="form.education_experience[index].school_education" placeholder="请选择学历">
+              <el-select v-model="form.education_experience[index].school_education" placeholder="请选择学历"
+                @change='changeCompanyNature()'>
                 <el-option v-for="item in educations" :key="item.id" :label="item.ename" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业:" prop="school_major" class="custom-align-right">
+            <el-form-item label="专业" prop="school_major" class="custom-align-right">
               <el-input v-model="form.education_experience[index].school_major" autocomplete="off"
                 placeholder="请输入专业"></el-input>
             </el-form-item>
@@ -274,7 +266,7 @@
               <el-input v-model="form.education_experience[index].school_experience" autocomplete="off" type="textarea"
                 aria-rowspan="6" placeholder="请输入在校经历"></el-input>
             </el-form-item>
-            <el-divider content-position="right"> </el-divider>
+            <!-- <el-divider content-position="right"> </el-divider> -->
           </div>
         </div>
       </el-form>
@@ -320,6 +312,7 @@ export default {
     //0.全局操作 start ------------------------------------------------------------>
     //表单验证
     const validateEmpty = (rule, value, callback) => {
+      console.log(value, '-------------value--------')
       console.log(rule, '-------------rule--------')
       if (value == '') {
         callback(new Error('该项不能为空!'))
@@ -419,7 +412,7 @@ export default {
     //0.全局操作 end ------------------------------------------------------------>
     return {
       jobIndustry: {},
-      jobNature: {},
+      jobNature: [],
       jobPosition: {},
       jobEnum: {},
       educations: [],
@@ -432,7 +425,7 @@ export default {
 
       timeList: [],
       // imgurl: "http://img.bjzxtw.org.cn/dev/image/jpeg/20250220/1740044079754901.png",
-      imgurl: "",
+      imgUrl: "",
       websiteid: 0,
       cascaderKey: 0,//弹窗用的key
       creatNews_pid_num: "0",//请求子导航用的pid
@@ -487,7 +480,6 @@ export default {
         department: [],//所属部门
         job_timeList: [],//工作时间
         job_content: [],//工作内容
-        imgUrl: "",
       },
       //1.2 表单验证规则
       formRules: {
@@ -661,6 +653,9 @@ export default {
     };
   },
   methods: {
+    changeCompanyNature(val) {
+      this.$forceUpdate();
+    },
     getJobHuntingData() {
       this.$store.dispatch('news/getJobHuntingData', {}).then(res => {
         if (res.code == 200) {
@@ -754,18 +749,16 @@ export default {
         this.$message.error('上传缩略图大小不能超过 2MB!');
         return false;
       }
-
       const formData = new FormData();
       formData.append('file', file);
       this.$store.dispatch('pool/uploadFile', formData).then(res => {
         this.imgUrl = res.data.imgUrl;//显示缩略图
-        this.form.imgurl = res.data.imgUrl;//提供表单地址
+        this.form.imgUrl = res.data.imgUrl;//提供表单地址
+        // this.$set(this, 'imgUrl', res.data.imgUrl); // 设置 imgUrl
+        // this.$set(this.form, 'imgurl', res.data.imgUrl); // 设置 form.imgurl
         console.log(res.data.imgUrl)
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '网络错误,请重试!'
-        });
+        console.log(this.imgurl, '-------------imgurl-----2---')
+        console.log(this.form.imgUrl, '-------------form.imgurl--------')
       })
       // 阻止默认的上传行为
       return false;
@@ -773,39 +766,45 @@ export default {
     //1.2 提交表单
     addToServe() {
       //先进行验证
-      console.log(this.form, '-------------form--------');
+      console.log(this.form, '-------------form1--------');
       this.$refs.form.validate(valid => {
 
         if (valid) {
-          console.log(this.form)
-          this.form.job_experience = JSON.stringify(this.form.job_experience);
-          this.form.education_experience = JSON.stringify(this.form.education_experience);
-          this.form.skillList = JSON.stringify(this.form.skillList);
-          this.form.city_arr_id = JSON.stringify(this.form.city_arr_id);
-          this.form.cat_arr_id = JSON.stringify(this.form.cat_arr_id);
-          this.form.website_id = this.form.web_site_id == 0 ? this.websiteid : this.form.web_site_id;
-          //去掉this.form.web_site_id
-          delete this.form.web_site_id;
-          if (this.form.website_id == 0) {
+          // 创建 form 对象的深拷贝
+          const formCopy = JSON.parse(JSON.stringify(this.form));
+
+          // 在副本上进行 JSON 转换
+          formCopy.job_experience = JSON.stringify(formCopy.job_experience);
+          formCopy.education_experience = JSON.stringify(formCopy.education_experience);
+          formCopy.skillList = JSON.stringify(formCopy.skillList);
+          formCopy.city_arr_id = JSON.stringify(formCopy.city_arr_id);
+          formCopy.cat_arr_id = JSON.stringify(formCopy.cat_arr_id);
+          formCopy.website_id = formCopy.web_site_id == 0 ? this.websiteid : formCopy.web_site_id;
+          // 去掉 formCopy.web_site_id
+          delete formCopy.web_site_id;
+
+          if (formCopy.website_id == 0) {
             this.$message.error('请选择站点名称');
             return;
           }
 
-          if (this.form.jobtime != '' || this.form.jobtime != null) {
-            this.form.jobtime = formatLocalDate(this.form.jobtime);
+          if (formCopy.jobtime != '' && formCopy.jobtime != null && formCopy.jobtime != undefined) {
+            formCopy.jobtime = formatLocalDate(formCopy.jobtime);
           } else {
-            this.form.jobtime = null;
+            formCopy.jobtime = null;
           }
-          if (this.form.birth != '' || this.form.birth != null) {
-            this.form.birth = formatLocalDate(this.form.birth);
+          console.log(formCopy.birth, "-----------------birth----------");
+          if (formCopy.birth != '' && formCopy.birth != null && formCopy.birth != undefined) {
+            formCopy.birth = formatLocalDate(formCopy.birth);
           } else {
-            this.form.birth = null;
+            formCopy.birth = null;
           }
-          this.form.job_timeList.forEach(item => {
+          formCopy.job_timeList.forEach(item => {
             item = formatLocalDate(item);
           });
+          console.log(new Date().getTime(), '-------------------校验结束------------------');
 
-          this.$store.dispatch('news/addJobHunting', this.form).then(res => {
+          this.$store.dispatch('news/addJobHunting', formCopy).then(res => {
             if (res.code == 200) {
               //汇报结果
               this.$message({
@@ -872,7 +871,6 @@ export default {
       this.$store.dispatch('news/getJobHuntingInfo', data).then(res => {
         console.log(res);
 
-        this.form.web_site_id = res.data.web_site_id    //站点名称
         this.form.cat_arr_id = Array.isArray(res.data.cat_arr_id) ? res.data.cat_arr_id : JSON.parse(res.data.cat_arr_id);
         this.parentKey += 1; // 触发级联选择器重新加载
         this.loadCascaderPath(this.form.cat_arr_id); // 加载路径数据
@@ -882,10 +880,26 @@ export default {
         this.form.age = res.data.age;
         this.form.phone = res.data.phone;
         this.form.email = res.data.email;
+        this.form.wx = res.data.wx;
+        this.form.company_nature = res.data.company_nature;
+        this.form.salary = res.data.salary;
+        this.form.self_evaluation = res.data.self_evaluation;
+
+        this.form.educational = res.data.educational;
+        this.form.politic = res.data.politic;
+        this.form.language = res.data.language;
+        this.form.level = res.data.level;
+
+
         this.form.address = res.data.address;
         this.form.content = res.data.content;
-        this.form.img = res.data.img;
-        this.imgUrl = res.data.img;
+        this.form.imgUrl = res.data.imgurl;
+        this.imgUrl = res.data.imgurl;
+        this.form.web_site_id = res.data.website_id;
+        this.form.jobtime = res.data.jobtime ? new Date(res.data.jobtime) : '';
+        this.form.birth = res.data.birth ? new Date(res.data.birth) : '';
+        this.form.origin = res.data.origin;
+        this.form.city_arr_id = Array.isArray(res.data.city_arr_id) ? res.data.city_arr_id : JSON.parse(res.data.city_arr_id);
         this.form.job_experience = JSON.parse(res.data.job_experience);
         this.form.education_experience = JSON.parse(res.data.education_experience);
         this.form.skillList = JSON.parse(res.data.skillList);
@@ -924,37 +938,57 @@ export default {
       //添加要修改的id
       this.form.id = this.editId;
       //先进行验证
+      let startTime = new Date().getTime();
+      console.log(startTime, '-------------------开始------------------');
       this.$refs.form.validate(valid => {
+        //记录开始时间
+        let startTime1 = new Date().getTime();
+        console.log(startTime1, '-------------------校验开始------------------');
         if (valid) {
           console.log(this.form)
-          this.form.job_experience = JSON.stringify(this.form.job_experience);
-          this.form.education_experience = JSON.stringify(this.form.education_experience);
-          this.form.skillList = JSON.stringify(this.form.skillList);
-          this.form.city_arr_id = JSON.stringify(this.form.city_arr_id);
-          this.form.cat_arr_id = JSON.stringify(this.form.cat_arr_id);
-          this.form.website_id = this.form.web_site_id == 0 ? this.websiteid : this.form.web_site_id;
-          //去掉this.form.web_site_id
-          delete this.form.web_site_id;
-          if (this.form.website_id == 0) {
+          // 创建 form 对象的深拷贝
+          const formCopy = JSON.parse(JSON.stringify(this.form));
+
+          // 在副本上进行 JSON 转换
+          formCopy.job_experience = JSON.stringify(formCopy.job_experience);
+          formCopy.education_experience = JSON.stringify(formCopy.education_experience);
+          formCopy.skillList = JSON.stringify(formCopy.skillList);
+          formCopy.city_arr_id = JSON.stringify(formCopy.city_arr_id);
+          formCopy.cat_arr_id = JSON.stringify(formCopy.cat_arr_id);
+          formCopy.website_id = formCopy.web_site_id == 0 ? this.websiteid : formCopy.web_site_id;
+          // 去掉 formCopy.web_site_id
+          delete formCopy.web_site_id;
+
+          if (formCopy.website_id == 0) {
             this.$message.error('请选择站点名称');
             return;
           }
 
-          if (this.form.jobtime != '' || this.form.jobtime != null) {
-            this.form.jobtime = formatLocalDate(this.form.jobtime);
+          if (formCopy.jobtime != '' && formCopy.jobtime != null && formCopy.jobtime != undefined) {
+            formCopy.jobtime = formatLocalDate(formCopy.jobtime);
           } else {
-            this.form.jobtime = null;
+            formCopy.jobtime = null;
           }
-          if (this.form.birth != '' || this.form.birth != null) {
-            this.form.birth = formatLocalDate(this.form.birth);
+          console.log(formCopy.birth, "-----------------birth----------");
+          if (formCopy.birth != '' && formCopy.birth != null && formCopy.birth != undefined) {
+            formCopy.birth = formatLocalDate(formCopy.birth);
           } else {
-            this.form.birth = null;
+            formCopy.birth = null;
           }
-          this.form.job_timeList.forEach(item => {
+
+
+          formCopy.job_timeList.forEach(item => {
             item = formatLocalDate(item);
           });
-
-          this.$store.dispatch('news/updateJobHunting', this.form).then(res => {
+          console.log(new Date().getTime(), '-------------------校验结束------------------');
+
+          this.$store.dispatch('news/updateJobHunting', formCopy).then(res => {
+            //记录结束时间
+            let endTime = new Date().getTime(); //计算时间差
+            console.log(endTime, '-------------------结束------------------');
+            let time = endTime - this.startTime;
+            //记录时间差
+            console.log('时间差'.time, '------------------2--------');
             if (res.code != 200) {
               this.$message.error("修改失败,请稍后再试!");
             } else {

+ 125 - 48
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,39 +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>
-              <el-form-item label="推荐等级:" class="custom-align-right">
-                <el-select v-model="form.level" clearable placeholder="请选择推荐等级..">
-                  <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-select>
-              </el-form-item>
-              <el-form-item label="缩略图:" class="custom-align-right" prop="imgUrl"
-                v-if="form.level == 2 || form.level == 3">
+              <div v-if="creatNews_user_type == 10000">
+                <el-form-item label="推荐等级:" class="custom-align-right">
+                  <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-select>
+                </el-form-item>
+              </div>
+              <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">
@@ -90,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">
                     资讯关键词:
@@ -104,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">
                     资讯描述:
@@ -116,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">
@@ -125,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"
@@ -136,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">
@@ -158,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>
@@ -169,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>
@@ -318,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:复选
@@ -341,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 }],
         //内容不能为空
@@ -405,7 +440,7 @@ export default {
               border: 'none',
               color: 'white'
             },
-            modules: ['Resize', 'DisplaySize', 'Toolbar']  // 启用不同的调整方式
+            modules: ['Resize'],  // 启用不同的调整方式
           }
         }
       },
@@ -621,6 +656,8 @@ export default {
         console.log("用户身份为其他用户,提交到审核!")
         this.form.status = 0;
         this.form.web_site_id = this.websiteid;
+        //如果是普通用户 推荐等级设置为0 
+        this.form.level = 0;
       }
 
       //先进行验证
@@ -716,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) {
@@ -738,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//站点名称
         }
 
@@ -767,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;
@@ -777,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) {
@@ -843,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];
@@ -1071,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()
@@ -1153,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;
 }
 
 /* 富文本对齐方式 */
@@ -1222,6 +1273,10 @@ export default {
   /* 设置标签文字右对齐 */
 }
 
+::v-deep .el-popper {
+  height: 500px;
+}
+
 ::v-deep .el-select {
   width: 100%;
   /* 禁止用户拖拽调整大小 */
@@ -1252,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>

+ 3 - 3
src/views/tabbar/tabbarDetail.vue

@@ -109,7 +109,7 @@ import '@/styles/global.less';
 import { addFooterContent, getFooterContent, upFooterContent, delFooterContent } from '@/api/tabbar'
 export default {
     components: {
-        tableTitle,//表格标题-
+        tableTitle,//表格标题
     },
     data() {
         const validateEmpty = (rule, value, callback) => {
@@ -120,8 +120,8 @@ export default {
             }
         }
         return {
-            tableDivTitle: "底部导航详情",  //列表标题
-            dialogTableVisible: false,      //编辑弹框
+            tableDivTitle: "单页详情",  //列表标题
+            dialogTableVisible: false,  //编辑弹框
             dialogName: '编辑', //编辑弹窗名称
 
             tableData: [],//表格数据

+ 121 - 109
src/views/website/categoryList.vue

@@ -6,7 +6,7 @@
         <el-col :span="8">
           <div class="searchBox">
             <div class="searchTitle">栏目名称:</div>
-            <el-input placeholder="请输入栏目名称" autocomplete="off" v-model="getApiData.name"/>
+            <el-input placeholder="请输入栏目名称" autocomplete="off" v-model="getApiData.name" />
           </div>
         </el-col>
         <!-- <el-col :span="8">
@@ -29,14 +29,14 @@
       </div>
       <div>
         <el-button @click="clearSearchList">重置</el-button>
-        <el-button type="primary" style="margin-right:20px"  @click="getData('search')">搜索</el-button>
+        <el-button type="primary" style="margin-right:20px" @click="getData('search')">搜索</el-button>
       </div>
     </div>
     <!--搜索功能 end------------------------------------------------------------>
 
     <!--表格内容 start------------------------------------------------------------>
     <div class="layerBox">
-      <tableTitle :name="tableDivTitle"/>
+      <tableTitle :name="tableDivTitle" />
       <el-row>
         <template>
           <el-table :data="tableData" style="width: 100%">
@@ -45,20 +45,22 @@
             <!-- <el-table-column prop="department_name" label="行政职能部门"></el-table-column>
             <el-table-column prop="city_name" label="行政区划"></el-table-column> --> 父级栏目
             <!-- <el-table-column prop="sort" label="权重"></el-table-column> -->
-            <el-table-column  label="父级栏目">
+            <el-table-column label="父级栏目">
               <template slot-scope="scope">
                 <div>
-                 {{scope.row.parent_name?scope.row.parent_name:"---"}} 
+                  {{ scope.row.parent_name ? scope.row.parent_name : "---" }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column prop="created_at" label="创建时间"></el-table-column>
             <el-table-column prop="updated_at" label="修改时间"></el-table-column>
-            <el-table-column fixed="right" label="操作" width="200"  header-align="center">
+            <el-table-column fixed="right" label="操作" width="200" header-align="center">
               <template slot-scope="scope">
                 <div class="listBtnBox">
-                  <div class="listDeleteBtn" @click="deleteData(scope.row.id, tableData)"><i class="el-icon-delete"></i>删除</div>
-                  <div class="listEditBtn" @click="getDataMain(scope.row.id, tableData)"><i class="el-icon-edit-outline"></i>编辑</div>
+                  <div class="listDeleteBtn" @click="deleteData(scope.row.id, tableData)"><i
+                      class="el-icon-delete"></i>删除</div>
+                  <div class="listEditBtn" @click="getDataMain(scope.row.id, tableData)"><i
+                      class="el-icon-edit-outline"></i>编辑</div>
                 </div>
                 <!-- <el-button @click.native.prevent="deleteData(scope.row.id, tableData)" type="text" size="small">删除</el-button>
                 <el-button @click.native.prevent="getDataMain(scope.row.id, tableData)" type="text" size="small">编辑</el-button> -->
@@ -72,7 +74,9 @@
     <div class="alignBox">
       <el-row>
         <el-col :span="24">
-          <el-pagination :current-page="getApiData.page" @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-size="10" layout="total, prev, pager, next, jumper" :total="allCount"></el-pagination>
+          <el-pagination :current-page="getApiData.page" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange" :page-size="10" layout="total, prev, pager, next, jumper"
+            :total="allCount"></el-pagination>
         </el-col>
       </el-row>
     </div>
@@ -80,14 +84,15 @@
     <!--表格内容 end------------------------------------------------------------>
 
     <!--弹出框 start------------------------------------------------------------>
-    <el-dialog :title="editId ? '编辑栏目名称' : '添加栏目名称'" :visible.sync="windowStatus" :close-on-click-modal="false" @close="clearToServe(2)">
+    <el-dialog :title="editId ? '编辑栏目名称' : '添加栏目名称'" :visible.sync="windowStatus" :close-on-click-modal="false"
+      @close="clearToServe(2)">
       <el-form :model="form" ref="form" :rules="formRules" autocomplete="off" label-position="left">
         <div class="formDiv">
           <el-form-item label="栏目名称:" :label-width="formLabelWidth" prop="name" class="custom-align-right">
             <el-input v-model="form.name" autocomplete="off" placeholder="请输入栏目名称"></el-input>
             <el-checkbox v-model="show_url" @change="ifUrl">引用外链</el-checkbox>
           </el-form-item>
-          <div v-if="show_url==1">
+          <div v-if="show_url == 1">
             <el-form-item label="外链地址:" :label-width="formLabelWidth" prop="web_url" class="custom-align-right">
               <el-input v-model="form.web_url" autocomplete="off" placeholder="请输入外链地址"></el-input>
             </el-form-item>
@@ -96,7 +101,7 @@
             </el-form-item>
             <el-form-item label="栏目关键词:" :label-width="formLabelWidth" prop="seo_keywords" class="custom-align-right">
               <!-- <el-input v-model="form.seo_keywords" autocomplete="off" placeholder="请输入栏目关键词"></el-input> -->
-              <inputTag  :initialTags="tags" @tags-updated="updateTags"/> 
+              <inputTag :initialTags="tags" @tags-updated="updateTags" />
             </el-form-item>
             <el-form-item label="栏目描述:" :label-width="formLabelWidth" prop="seo_description" class="custom-align-right">
               <el-input type="textarea" v-model="form.seo_description" placeholder="请输入栏目描述"></el-input>
@@ -105,22 +110,24 @@
               <el-input v-model="form.sort" autocomplete="off" placeholder="请输入排序"></el-input>
             </el-form-item> -->
           </div>
-          <div v-if="show_url==0">
+          <div v-if="show_url == 0">
             <!-- <el-form-item label="关联职能部门:" :label-width="formLabelWidth" prop="department_arr_id" class="custom-align-right"> -->
-              <!-- <el-cascader :key="departmentKey" v-model="form.department_arr_id" placeholder="选择要绑定的职能部门" :props="departmentData" filterable clearable></el-cascader> -->
-              <!-- <el-cascader :key="departmentKey" :props="{value:'id',label:'name',children:'children'}" :options="allDepartment" v-model="form.department_arr_id" :show-all-levels="false" filterable />
+            <!-- <el-cascader :key="departmentKey" v-model="form.department_arr_id" placeholder="选择要绑定的职能部门" :props="departmentData" filterable clearable></el-cascader> -->
+            <!-- <el-cascader :key="departmentKey" :props="{value:'id',label:'name',children:'children'}" :options="allDepartment" v-model="form.department_arr_id" :show-all-levels="false" filterable />
             </el-form-item> -->
             <!-- <el-form-item label="关联行政区划:" :label-width="formLabelWidth" prop="city_arr_id" class="custom-align-right">
               <el-cascader :key="cascaderKey" v-model="form.city_arr_id" placeholder="选择要绑定行政区划" :props="cityData" filterable clearable></el-cascader>
             </el-form-item> -->
             <el-form-item label="父级栏目:" :label-width="formLabelWidth" class="custom-align-right">
-              <el-cascader :key="parentKey" v-model="form.pid_arr" placeholder="请选择要绑定的父级栏目" :props="parentData" filterable clearable></el-cascader>
+              <el-cascader :key="parentKey" v-model="form.pid_arr" placeholder="请选择要绑定的父级栏目" :props="parentData"
+                filterable clearable></el-cascader>
             </el-form-item>
             <el-form-item label="栏目标题:" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
               <template #label>
                 <span class="askBox">
                   栏目标题:
-                  <el-tooltip class="item" effect="dark" content="栏目标题,如:三农市场网_农资产品商城_网站列表_全国信息一体化网络平台_项目大全。" placement="top">
+                  <el-tooltip class="item" effect="dark" content="栏目标题,如:三农市场网_农资产品商城_网站列表_全国信息一体化网络平台_项目大全。"
+                    placement="top">
                     <i class="el-icon-question"></i>
                   </el-tooltip>
                 </span>
@@ -137,7 +144,7 @@
                 </span>
               </template>
               <!-- <el-input v-model="form.seo_keywords" autocomplete="off" placeholder="请输入栏目关键词"></el-input> -->
-              <inputTag  :initialTags="tags" @tags-updated="updateTags"/> 
+              <inputTag :initialTags="tags" @tags-updated="updateTags" />
             </el-form-item>
             <el-form-item label="栏目描述:" :label-width="formLabelWidth" prop="seo_description" class="custom-align-right">
               <template #label>
@@ -148,7 +155,8 @@
                   </el-tooltip>
                 </span>
               </template>
-              <el-input type="textarea" v-model="form.seo_description" class="custom-textarea" placeholder="请输入栏目描述"></el-input>
+              <el-input type="textarea" v-model="form.seo_description" class="custom-textarea"
+                placeholder="请输入栏目描述"></el-input>
             </el-form-item>
             <!-- <el-form-item label="排序:" :label-width="formLabelWidth" class="custom-align-right">
               <el-input v-model="form.sort" autocomplete="off" placeholder="请输入排序"></el-input>
@@ -158,7 +166,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="closeWindow">取 消</el-button>
-        <el-button type="primary" @click="editToServe" v-if="editBtn==true">确定</el-button>
+        <el-button type="primary" @click="editToServe" v-if="editBtn == true">确定</el-button>
         <el-button type="primary" @click="addToServe" v-else>提交</el-button>
       </div>
     </el-dialog>
@@ -182,7 +190,7 @@ export default {
   data() {
     //0.全局操作 start ------------------------------------------------------------>
     //表单验证
-    const validateEmpty = (rule,value,callback) => {
+    const validateEmpty = (rule, value, callback) => {
       if (value.length == 0) {
         callback(new Error('该项不能为空!'))
       } else {
@@ -203,35 +211,35 @@ export default {
     //       callback()
     //   }
     // }
-    const validatePid = (rule,value,callback) => {
+    const validatePid = (rule, value, callback) => {
       if (value.length === 0) {
-          callback(new Error('请选择父级栏目!'))
+        callback(new Error('请选择父级栏目!'))
       } else {
-          callback()
+        callback()
       }
     }
     let self = this;
     //0.全局操作 end ------------------------------------------------------------>
     return {
-      tags:[],
+      tags: [],
       //1.列表和分页相关 start ------------------------------------------------------------>
-      tableDivTitle:"栏目名称列表",
-      tableData:[],//内容
-      allCount:0,//总条数
-      editId:0,//要修改的网站id
-      getApiData:{
-        name:"",//栏目池名称查询
+      tableDivTitle: "栏目名称列表",
+      tableData: [],//内容
+      allCount: 0,//总条数
+      editId: 0,//要修改的网站id
+      getApiData: {
+        name: "",//栏目池名称查询
         // department_id:[],//行政职能部门id
         // city_id:[],//行政区划
-        page:1,//当前是第几页
-        pageSize:10,//一共多少条
+        page: 1,//当前是第几页
+        pageSize: 10,//一共多少条
       },
-      allDepartment:[],//所有职能
+      allDepartment: [],//所有职能
       //列表和分页相关 end ------------------------------------------------------------>
 
       //2.搜索相关 start ------------------------------------------------------------>
       //行政职能部门
-      searchDepartmentKey:0, //列表缓存key
+      searchDepartmentKey: 0, //列表缓存key
       // searchDepartmentData: {
       //   checkStrictly: true,
       //   lazy: true,
@@ -259,11 +267,11 @@ export default {
       //   }
       // },
       //获取城市列表
-      searchCascaderKey:0, //列表缓存key
+      searchCascaderKey: 0, //列表缓存key
       searchCityData: {
         checkStrictly: true,
         lazy: true,
-        async lazyLoad (node, resolve) {
+        async lazyLoad(node, resolve) {
           const { level, data } = node;
           if (data && data.children && data.children.length !== 0) {
             return resolve(node)
@@ -271,9 +279,9 @@ export default {
           console.log(level)
           let parentId = level == 0 ? 0 : data.value
           let parames = {
-            'pid':parentId
+            'pid': parentId
           }
-          self.$store.dispatch('pool/getcityList',parames).then(res=> {
+          self.$store.dispatch('pool/getcityList', parames).then(res => {
             if (res.data) {
               const nodes = res.data.map(item => ({
                 value: item.id,
@@ -289,45 +297,45 @@ export default {
       //搜索相关 end ------------------------------------------------------------>
 
       //3.弹出框设置 start ------------------------------------------------------------>
-      windowStatus:false, //显示弹出框
+      windowStatus: false, //显示弹出框
       formLabelWidth: '140px',
-      show_url:false, //是否显示外链输入框
-      editBtn:false,//当显示编辑按钮的时候,就不显示提交
+      show_url: false, //是否显示外链输入框
+      editBtn: false,//当显示编辑按钮的时候,就不显示提交
       //弹出框设置 end ------------------------------------------------------------>
 
       //4.弹出框中的表单设置 start ------------------------------------------------------------>
       //4.1表单收集的数据
       form: {
         name: '',//栏目池名称
-        is_url:0,//是否为外链,0=否 1=是
-        web_url:"",//外链地址
+        is_url: 0,//是否为外链,0=否 1=是
+        web_url: "",//外链地址
         // department_arr_id:[],//职能部门
         // city_arr_id:[],//行政区划
-        sort:0,//排序
+        sort: 0,//排序
         //pid:2,
-        seo_title:"",//标题
-        seo_keywords:"",//关键词
-        seo_description:"",//描述
-        pid_arr:[]//父级栏目
+        seo_title: "",//标题
+        seo_keywords: "",//关键词
+        seo_description: "",//描述
+        pid_arr: []//父级栏目
       },
       //4.2表单验证规则
       formRules: {
         //网站名称不能为空
-        name:[{required:true,trigger:'blur',validator:validateEmpty}],//栏目池名称不能为空
-        web_url:[{required:true,trigger:'blur',validator:validateEmpty}],//外链地址不能为空
+        name: [{ required: true, trigger: 'blur', validator: validateEmpty }],//栏目池名称不能为空
+        web_url: [{ required: true, trigger: 'blur', validator: validateEmpty }],//外链地址不能为空
         // department_arr_id: [{type:'array',required:true,trigger:'change',message:'请选择职能部门!',validator:validateDepartment}],
         // city_arr_id: [{type:'array',required:true,trigger:'change',message:'请选择行政区划!',validator:validateCity}],
         // pid_arr: [{type:'array',required:true,trigger:'change',message:'请选择父级栏目!',validator:validatePid}],
-        seo_title:[{required:true,trigger:'blur',validator:validateEmpty}],//标题不能为空
-        seo_keywords:[{required:true,trigger:'blur',validator:validateEmpty}],//关键词不能为空
-        seo_description:[{required:true,trigger:'blur',validator:validateEmpty}],//描述不能为空
+        seo_title: [{ required: true, trigger: 'blur', validator: validateEmpty }],//标题不能为空
+        seo_keywords: [{ required: true, trigger: 'blur', validator: validateEmpty }],//关键词不能为空
+        seo_description: [{ required: true, trigger: 'blur', validator: validateEmpty }],//描述不能为空
       },
       //获取城市列表
-      cascaderKey:0,//弹窗用的key
+      cascaderKey: 0,//弹窗用的key
       cityData: {
         checkStrictly: true,
         lazy: true,
-        async lazyLoad (node, resolve) {
+        async lazyLoad(node, resolve) {
           const { level, data } = node;
           if (data && data.children && data.children.length !== 0) {
             return resolve(node)
@@ -335,9 +343,9 @@ export default {
           console.log(level)
           let parentId = level == 0 ? 0 : data.value
           let parames = {
-            'pid':parentId
+            'pid': parentId
           }
-          self.$store.dispatch('pool/getcityList',parames).then(res=> {
+          self.$store.dispatch('pool/getcityList', parames).then(res => {
             if (res.data) {
               const nodes = res.data.map(item => ({
                 value: item.id,
@@ -351,7 +359,7 @@ export default {
         }
       },
       //获取职能部门
-      departmentKey:0,//弹窗用的key
+      departmentKey: 0,//弹窗用的key
       // departmentData: {
       //   checkStrictly: true,//父级不可选
       //   lazy: true,
@@ -378,11 +386,11 @@ export default {
       //     })
       //   }
       // },
-      parentKey:0,//获取父级栏目
+      parentKey: 0,//获取父级栏目
       parentData: {
         checkStrictly: true,
         lazy: true,
-        async lazyLoad (node, resolve) {
+        async lazyLoad(node, resolve) {
           const { level, data } = node;
           if (data && data.children && data.children.length !== 0) {
             return resolve(node)
@@ -390,9 +398,9 @@ export default {
           console.log(level)
           let parentId = level == 0 ? 0 : data.value
           let parames = {
-            'pid':parentId
+            'pid': parentId
           }
-          self.$store.dispatch('pool/categoryList',parames).then(res=> {
+          self.$store.dispatch('pool/categoryList', parames).then(res => {
             if (res.data) {
               const nodes = res.data.map(item => ({
                 value: item.id,
@@ -411,7 +419,7 @@ export default {
   methods: {
     //1.列表和分页相关 start ------------------------------------------------------------>
     //1.1 开始请求列表信息方法
-    getData(type){
+    getData(type) {
       //搜索条件
       // if(this.getApiData.department_id.length>0){
       //   //网系只提交最后一个
@@ -422,10 +430,10 @@ export default {
       //   this.getApiData.city_id = this.getApiData.city_id[this.getApiData.city_id.length - 1];
       // }
       //如果是搜索,重新加载第一页
-      if(type=="search"){
+      if (type == "search") {
         this.getApiData.page = 1;
       }
-      this.$store.dispatch('pool/getCategoryList',this.getApiData).then(res=> {
+      this.$store.dispatch('pool/getCategoryList', this.getApiData).then(res => {
         this.tableData = res.data.rows; //��与内容
         this.allCount = res.data.count; //给与总条数
       }).catch(() => {
@@ -436,20 +444,20 @@ export default {
       })
     },
     //1.2 删除内容
-    deleteData(id){
+    deleteData(id) {
       this.$confirm('删除后,该条信息及其绑定关系全部删除,确定吗', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         console.log("当前删除:" + id)
-        this.$store.dispatch('pool/delCategory',{id:id}).then(res=> {
-          if(res.code==200){
+        this.$store.dispatch('pool/delCategory', { id: id }).then(res => {
+          if (res.code == 200) {
             this.$message({
               type: 'success',
               message: '删除成功!'
             });
-          }else if(res.code==0){
+          } else if (res.code == 0) {
             this.$message({
               type: 'warning',
               message: res.message
@@ -480,7 +488,7 @@ export default {
       this.getData();
     },
     //1.5 重置按钮
-    clearSearchList(){
+    clearSearchList() {
       this.tableData = [];
       this.getApiData.name = "";
       // this.getApiData.department_id = [];
@@ -490,8 +498,8 @@ export default {
       this.getData();
     },
     //1.6 获取所有职能
-    getAllDepartment(){
-      this.$store.dispatch('cms/getAllDepartment').then(res=> {
+    getAllDepartment() {
+      this.$store.dispatch('cms/getAllDepartment').then(res => {
         console.log(res)
         this.allDepartment = res.data;
       })
@@ -505,25 +513,27 @@ export default {
       this.windowStatus = true;
     },
     //2.1.1 添加栏目池
-    addCategoryList(){
+    addCategoryList() {
+      this.show_url = false;
+      // this.form.is_url = 0;
       this.editId = 0;
       this.editBtn = false;
       this.tags = []
       this.openWindow();
     },
     //2.2 关闭弹出框
-    closeWindow(){
+    closeWindow() {
       this.windowStatus = false;
       this.clearToServe(2);
     },
     //2.3 清理弹出框
-    clearToServe(type){
-      if(type==1){ //type1 使用了外部链接
+    clearToServe(type) {
+      if (type == 1) { //type1 使用了外部链接
         // this.form.department_arr_id = [];
         // this.form.city_arr_id = [];
         this.form.pid_arr = [];
       }
-      if(type==2){ //type2 全部清理
+      if (type == 2) { //type2 全部清理
         this.form.name = "";
         this.form.is_url = 0;
         this.form.web_url = "";
@@ -543,27 +553,27 @@ export default {
     //弹出框设置 end ------------------------------------------------------------>
 
     //3.添加栏目池 start ------------------------------------------------------------>
-    ifUrl(value){
+    ifUrl(value) {
       console.log(value)
-      if(value == true){
+      if (value == true) {
         this.form.is_url = 1
-      }else{
+      } else {
         this.form.is_url = 0
       }
       this.$refs.form.clearValidate();
     },
-    addToServe(){
+    addToServe() {
       //先判断是否使用了外链
-      if(this.show_url == true){
+      if (this.show_url == true) {
         this.clearToServe(1)
       }
       //判断有没有添加父级栏目
-      if(this.form.pid_arr.length==0){
+      if (this.form.pid_arr.length == 0) {
         this.form.pid_arr = [0];
       }
       this.$refs.form.validate(valid => {
         if (valid) {
-          this.$store.dispatch('pool/addCategory',this.form).then(res=> {
+          this.$store.dispatch('pool/addCategory', this.form).then(res => {
             //汇报结果
             this.$message({
               type: 'success',
@@ -585,7 +595,7 @@ export default {
     //添加栏目池 end ------------------------------------------------------------>
 
     //编辑栏目池 start ------------------------------------------------------------>
-    getDataMain(id){
+    getDataMain(id) {
       //先清空窗口
       this.clearToServe(2)
       //打开输入窗口
@@ -594,7 +604,7 @@ export default {
       this.editId = id;
 
       //获取网站详情
-      this.$store.dispatch('pool/getCategoryInfo',{id:id}).then(res=> {
+      this.$store.dispatch('pool/getCategoryInfo', { id: id }).then(res => {
         //清除错误状态
         //this.$refs.form.clearValidate();
         console.log(res)
@@ -602,12 +612,11 @@ export default {
         this.form.name = res.data.name;
 
         //回显示是否使用外链
-        if(res.data.is_url==1){
+        if (res.data.is_url == 1) {
           this.show_url = true;
-        }else if(res.data.is_url==0||res.data.is_url==null){
+        } else if (res.data.is_url == 0 || res.data.is_url == null) {
           this.show_url = false;
         }
-       
         // console.log(res.data.is_url)
         this.form.is_url = res.data.is_url;
 
@@ -633,7 +642,7 @@ export default {
         //回显栏目池标题,描述,关键词
         this.form.seo_title = res.data.seo_title;
         this.form.seo_keywords = res.data.seo_keywords;
-        this.tags = res.data.seo_keywords?res.data.seo_keywords.split(','):[];
+        this.tags = res.data.seo_keywords ? res.data.seo_keywords.split(',') : [];
         this.form.seo_description = res.data.seo_description;
 
         //回显排序
@@ -664,7 +673,7 @@ export default {
     //   }
     // },
     //修改表单
-    editToServe(){
+    editToServe() {
       //防止提交[1,1]这种重复的数据
       // if (this.form.department_arr_id.length > 1) {
       //   const lastIndex = this.form.department_arr_id.length - 1;
@@ -676,7 +685,7 @@ export default {
       this.$refs.form.validate(valid => {
         if (valid) {
           //提交表单
-          this.$store.dispatch('pool/updateCategory',this.form).then(res=> {
+          this.$store.dispatch('pool/updateCategory', this.form).then(res => {
             //汇报结果
             this.$message({
               type: 'success',
@@ -697,13 +706,13 @@ export default {
     },
     //关键词
     updateTags(newTags) {
-            // this.foem.seo_keywords = newTags;
-            this.tags = newTags;
-            this.form.seo_keywords = newTags.join(',');
+      // this.foem.seo_keywords = newTags;
+      this.tags = newTags;
+      this.form.seo_keywords = newTags.join(',');
     },
     //编辑栏目池 end ------------------------------------------------------------>
   },
-  mounted(){
+  mounted() {
     //1.获得初始数据
     this.getData();
     //2.获取所有网系
@@ -716,16 +725,19 @@ export default {
 </script>
 
 <style scoped lang="less">
-  //表单微调 start------------------------------------------------------------>*/
-  ::v-deep .custom-form-item > .el-form-item__label {
-    line-height: 140px !important;
-  }
-  ::v-deep .custom-textarea .el-textarea__inner {
-    resize: none; /* 禁止用���拖拽调整大小 */
-  }
-  ::v-deep .custom-align-right .el-form-item__label {
-    text-align: right; /* 设置标签文字右对齐 */
-  }
-  //表单微调 end------------------------------------------------------------>*/
-</style>
+//表单微调 start------------------------------------------------------------>*/
+::v-deep .custom-form-item>.el-form-item__label {
+  line-height: 140px !important;
+}
+
+::v-deep .custom-textarea .el-textarea__inner {
+  resize: none;
+  /* 禁止用���拖拽调整大小 */
+}
+
+::v-deep .custom-align-right .el-form-item__label {
+  text-align: right;
+  /* 设置标签文字右对齐 */
+}
 
+//表单微调 end------------------------------------------------------------>*/</style>

+ 9 - 9
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',