修改bug

src/router/index.js

@@ -132,7 +132,7 @@ export const constantRoutes = [
         path: '',
         component: () => import('@/views/website/categoryList'),
         meta: {
-          title: '导航池',
+          title: '栏目名称',
           hidden: true,
           breadcrumb: true
         }
@@ -148,7 +148,7 @@ export const constantRoutes = [
         path: '',
         component: () => import('@/views/website/websiteColumn'),
         meta: {
-          title: '网站导航',
+          title: '栏目分配',
           hidden: true,
           breadcrumb: true
         }

src/views/news/NewList.vue

@@ -71,6 +71,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="category_name" label="栏目名称" width="100"></el-table-column>
+            <el-table-column prop="alias" label="展示名称" width="100"></el-table-column>
             <!-- <el-table-column prop="islink" label="是否引用外链" width=""></el-table-column>
             <el-table-column prop="linkurl" label="是否为原创" width="">
               <template slot-scope="scope">

src/views/news/creatNews.vue

@@ -14,8 +14,8 @@
                 :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"
+            <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"
                 popper-class="my_cascader" filterable clearable></el-cascader>
             </el-form-item>
             <el-form-item label="外链地址：" prop="linkurl" class="custom-align-right">
@@ -27,8 +27,8 @@
           </div>
           <div v-if="form.islink == false">
             <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"
                   popper-class="my_cascader" style="height: 100%;" filterable clearable></el-cascader>
               </el-form-item>
             </div>
@@ -39,8 +39,8 @@
                     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="请选择要绑定的父级名称"
+                <el-form-item label="展示名称：" prop="cat_arr_id" class="custom-align-right">
+                  <el-cascader :key="parentKey_2" v-model="form.cat_arr_id" placeholder="请选择要绑定的展示名称"
                     popper-class="my_cascader" style="height: 100%;" :props="parentData_2" filterable
                     clearable></el-cascader>
                 </el-form-item>
@@ -139,7 +139,7 @@
               </div>
               <el-form-item label="资讯内容：" prop="content" class="custom-align-right">
                 <myEditor ref="myEditor" v-model="form.content"></myEditor>
-              </el-form-item> 
+              </el-form-item>
               <el-form-item label="是否开启投票：" prop="is_survey" class="custom-align-right">
                 <el-radio-group v-model="form.is_survey">
                   <el-radio :label="1">是</el-radio>
@@ -176,10 +176,11 @@
                   <el-checkbox v-model="checked">允许用户自己填写</el-checkbox>
                 </el-form-item>
               </div>
-              <!-- 推荐新闻 -->
-              <!-- <el-form-item label="手动推荐：" prop="commend_id" class="custom-align-right">
-                <el-select v-model="form.commend_id" placeholder="请选择手动推荐名称" multiple filterable clearable remote :remote-method="remoteMethod" :loading="loading">
-                  <el-option v-for="item in commend_article" :key="item.id" :label="item.title" :value="item.id"></el-option>
+              <el-form-item label="手动推荐：" prop="commend_id" class="custom-align-right">
+                <el-select v-model="form.commend_id" placeholder="请选择手动推荐名称" multiple filterable clearable remote
+                  :remote-method="remoteMethod" :loading="loading">
+                  <el-option v-for="item in commend_article" :key="item.id" :label="item.title"
+                    :value="item.id"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="" prop="commend_id" class="custom-align-right">
@@ -189,9 +190,10 @@
                   </el-tag>
                 </draggable>
               </el-form-item>
+
               <el-form-item label="创建时间：" class="custom-align-right" v-if="created_at">
                 <el-input v-model="created_at" autocomplete="off" disabled></el-input>
-              </el-form-item> -->
+              </el-form-item>
             </div>
           </div>
         </div>
@@ -279,7 +281,7 @@ export default {
       disclaimer: true,//免责声明
       //提交表单
       creatNews_user_type: 0,//判断用户类型'
-      //created_at: "",//创建时间
+      created_at: "",//创建时间
       commend_article: [],//手动推荐
       form: {
         user_type: "??",//判断用户类型'
@@ -310,7 +312,7 @@ export default {
         survey_name: "",//问卷名称
         suvey_array: "",//选项名称集合 
         survey_type: 0, //0:单选 1：复选
-        //commend_id: [],//手动推荐
+        commend_id: [],//手动推荐
       },
       //1.2 表单验证规则
       formRules: {
@@ -453,6 +455,31 @@ export default {
       //表单项 end ------------------------------------------------------------>
     };
 
+  }, watch: {
+    '$route'(to, from) {
+      console.log(from, '---------------------------------------');
+      // 监听路由参数中的 id 变化，若变化则更新页面状态并获取数据
+      if (to.query.id) {
+        this.getMainData();
+      }
+    },
+
+
+    // 监听路由参数中的 id 变化，若变化则更新页面状态并获取数据
+    // '$route.query.id': function (newVal, oldVal) {
+    //   console.log('当前 id:', newVal, '旧的 id:', oldVal);
+    //   if (newVal) {
+    //     this.editStatus = true;
+    //     this.tableDivTitle = "编辑资讯";
+    //     //     // 调用方法名保持大小写一致
+    //     this.getMainData();
+    //   } else {
+    //     this.editStatus = false;
+    //     this.tableDivTitle = "添加资讯";
+    //   }
+    // }
+
+
   },
   methods: {
     //1.提交表单 start ------------------------------------------------------------>
@@ -553,9 +580,7 @@ export default {
         //如果是普通用户 推荐等级设置为0 
         this.form.level = "[0]";
       }
-      // if (this.form.commend_id != undefined && this.form.commend_id.length > 0) {
-      //   this.form.commend_id = JSON.stringify(this.form.commend_id); // 提取推荐ID
-      // }
+
       //先进行验证
       console.log(this.form);
 
@@ -568,6 +593,13 @@ export default {
             this.form.level = JSON.stringify(this.form.level);
           }
           //console.log(this.form)
+          const formData = { ...this.form };
+          if (formData.commend_id != undefined && formData.commend_id.length > 0) {
+            formData.commend_id = JSON.stringify(formData.commend_id); // 提取推荐ID
+          }
+          if (formData.commend_id.length == 0) {
+            formData.commend_id = '[]';
+          }
           this.$store.dispatch('news/addArticle', this.form).then(res => {
             if (res.code == 200) {
               //汇报结果
@@ -699,7 +731,7 @@ export default {
         } else {
           this.form.web_site_id = res.data.web_site_id//站点名称
         }
-        //this.created_at = res.data.created_at;
+        this.created_at = res.data.created_at;
         this.form.cat_arr_id = Array.isArray(res.data.cat_arr_id) ? res.data.cat_arr_id : JSON.parse(res.data.cat_arr_id);
         console.log(this.form.cat_arr_id)
         //回显导航池 连同非管理员得一起刷新
@@ -729,7 +761,7 @@ export default {
         this.form.fromurl = res.data.fromurl;
         this.form.status = res.data.status;
         this.form.survey_name = res.data.survey_name;
-        //this.form.commend_id = JSON.parse(res.data.commend_id);
+        this.form.commend_id = JSON.parse(res.data.commend_id);
         if (res.data.is_survey == null) {
           this.form.is_survey = 0;
         } else {
@@ -824,10 +856,7 @@ export default {
         }
         this.form.city_arr_id = JSON.stringify(this.form.city_arr_id);
       }
-      //推荐新闻
-      // if (this.form.commend_id != undefined && this.form.commend_id.length > 0) {
-      //   this.form.commend_id = JSON.stringify(this.form.commend_id); // 提取推荐ID
-      // }
+
 
       //将department_id和city_id转换为字符串  
       // this.form.department_arr_id = JSON.stringify(this.form.department_arr_id);
@@ -859,8 +888,15 @@ export default {
           } else {
             this.form.level = JSON.stringify(this.form.level);
           }
+          const formData = { ...this.form };
+          if (formData.commend_id != undefined && formData.commend_id.length > 0) {
+            formData.commend_id = JSON.stringify(formData.commend_id); // 提取推荐ID
+          }
+          if (formData.commend_id.length == 0) {
+            formData.commend_id = '[]';
+          }
           //console.log(this.form)
-          this.$store.dispatch('news/updateArticle', this.form).then(res => {
+          this.$store.dispatch('news/updateArticle', formData).then(res => {
             if (res.code != 200) {
               this.$message.error("修改失败，请稍后再试！");
             } else {
@@ -1031,12 +1067,12 @@ export default {
       // 处理拖拽结束事件（如果需要）
       console.log('拖拽结束', this.commend_article);
     },
-    // handleClose(item) {
-    //   const index = this.form.commend_id.indexOf(item);
-    //   if (index > -1) {
-    //     this.form.commend_id.splice(index, 1);
-    //   }
-    // },
+    handleClose(item) {
+      const index = this.form.commend_id.indexOf(item);
+      if (index > -1) {
+        this.form.commend_id.splice(index, 1);
+      }
+    },
     //6.问卷 刘佳伟 end ------------------------------------------------------------>
   },
   mounted() {

src/views/news/examine.vue

@@ -68,6 +68,7 @@
             <el-table-column fixed prop="id" label="编号" width="50"></el-table-column>
             <el-table-column prop="title" label="资讯题目" width=""></el-table-column>
             <el-table-column prop="category_name" label="栏目名称" width=""></el-table-column>
+            <el-table-column prop="alias" label="展示名称" width=""></el-table-column>
             <el-table-column prop="islink" label="是否引用外链" width=""></el-table-column>
             <el-table-column prop="linkurl" label="是否为原创" width="">
               <template slot-scope="scope">