Merge branch 'pre' of http://git.bjzxtw.org.cn:3000/zxt/admin_home into pre

src/router/index.js

@@ -148,7 +148,7 @@ export const constantRoutes = [
         path: '',
         component: () => import('@/views/website/editNavigation'),
         meta: {
-          title: '导航详情',
+          title: '栏目详情',
           hidden: true,
           breadcrumb: true
         }

src/router/modules/dangyunlong.js

@@ -60,7 +60,7 @@ const dangyunlongRouter= [
         path: '',
         component: () => import('@/views/website/editNavigation'),
         meta: {
-          title: '导航详情',
+          title: '栏目详情',
           hidden: true,
           breadcrumb: true
         }

src/views/menu/menulist.vue

@@ -37,7 +37,7 @@
             <el-table-column fixed="right" label="操作" width="200"  header-align="center">
               <template slot-scope="scope">
                 <div class="listBtnBox">
-                  <div class="listDeleteBtn" @click="deleteRow(scope.row.id)"><i class="el-icon-delete"></i>移除</div>
+                  <div class="listDeleteBtn" @click="deleteRow(scope.row.id)"><i class="el-icon-delete"></i>删除</div>
                   <div class="listEditBtn" @click="editRow(scope.row)"><i class="el-icon-edit-outline"></i>编辑</div>
                 </div>
               </template>
@@ -252,7 +252,7 @@ export default {
           }else{
             this.$message({
               type: 'warning',
-              message: '请先移除子菜单！'
+              message: '请先删除子菜单！'
             });
           }
         }).catch(() => {

src/views/news/NewList.vue

@@ -12,8 +12,8 @@
           </el-col>
           <el-col :span="8">
             <div class="searchBox">
-              <div class="searchTitle">导航池名称：</div>
-              <el-input placeholder="请输入导航池名称" autocomplete="off" v-model="getApiData.category_name"/>
+              <div class="searchTitle">展示名称：</div>
+              <el-input placeholder="请输入展示名称" autocomplete="off" v-model="getApiData.category_name"/>
             </div>
           </el-col>
           <el-col :span="8">
@@ -67,7 +67,7 @@
           <el-table :data="tableData" style="width: 100%">
             <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="category_name" 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">
@@ -104,7 +104,7 @@
             <el-table-column fixed="right" label="操作" width="200" header-align="center">
               <template slot-scope="scope">
                 <div class="listBtnBox">
-                  <div class="listDeleteBtn" @click="deleteRow(scope.row.id, tableData)"><i class="el-icon-delete"></i>移除</div>
+                  <div class="listDeleteBtn" @click="deleteRow(scope.row.id, tableData)"><i class="el-icon-delete"></i>删除</div>
                   <div class="listEditBtn" @click="goEdit(scope.row.id, tableData)"><i class="el-icon-edit-outline"></i>编辑</div>
                 </div>
               </template>

src/views/news/creatNews.vue

@@ -17,13 +17,13 @@
             <el-checkbox v-model="form.islink">是否使用外链</el-checkbox>
           </el-form-item>
           <div v-if="form.islink == true">
-            <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-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"
                 filterable clearable></el-cascader>
             </el-form-item>
             <!-- <el-form-item label="导航池名称：" prop="cat_arr_id" class="custom-align-right">
@@ -38,20 +38,20 @@
           </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"
                   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-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-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="请选择要绑定的父级名称"
                     :props="parentData_2" filterable clearable></el-cascader>
                 </el-form-item>
               </div>
@@ -172,7 +172,7 @@
                 <el-select v-model="form.status" placeholder="请选择..">
                   <el-option label="已发布" :value="1"></el-option>
                   <el-option label="待发布" :value="0"></el-option>
-                  <el-option label="已拒绝" :value="2"></el-option>
+                  <!-- <el-option label="已拒绝" :value="2"></el-option> -->
                 </el-select>
               </el-form-item>
               <el-form-item label="是否开启投票：" prop="is_survey" class="custom-align-right">

src/views/news/examine.vue

@@ -12,8 +12,8 @@
           </el-col>
           <el-col :span="8">
             <div class="searchBox">
-              <div class="searchTitle">导航池名称：</div>
-              <el-input placeholder="请输入导航池名称" autocomplete="off" v-model="getApiData.category_name"/>
+              <div class="searchTitle">展示名称：</div>
+              <el-input placeholder="请输入展示名称" autocomplete="off" v-model="getApiData.category_name"/>
             </div>
           </el-col>
           <el-col :span="8">
@@ -67,7 +67,7 @@
           <el-table :data="tableData" style="width: 100%">
             <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="category_name" 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">
@@ -103,7 +103,7 @@
                   <div class="listLinkBtn" @click="selectRow(scope.row.cat_arr_id, scope.row)"><i class="el-icon-full-screen"></i>站点选择</div>
                   <div class="listMainBtn" @click="getUpRow(scope.row.id, tableData)" v-if="scope.row.status==0"><i class="el-icon-check"></i>审核</div>
                   <div class="listUpBtn" @click="returnRow(scope.row.id, tableData)" v-else><i class="el-icon-refresh-right"></i>撤回</div>
-                  <div class="listDeleteBtn" @click="deleteRow(scope.row.id, tableData)"><i class="el-icon-delete"></i>移除</div>
+                  <div class="listDeleteBtn" @click="deleteRow(scope.row.id, tableData)"><i class="el-icon-delete"></i>删除</div>
                   <div class="listEditBtn" @click="goEdit(scope.row.id, tableData)"><i class="el-icon-edit-outline"></i>编辑</div>
                 </div>
               </template>

src/views/website/WebsiteList.vue

@@ -59,12 +59,12 @@
             <el-table-column fixed="right" label="操作" width="240" 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="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="listMainBtn" @click="creatWebsite(scope.row.id)"><i class="el-icon-brush"></i>模板</div> -->
                 </div>
                 <!-- <div class="listMainBtn"><i class="el-icon-view"></i>详情</div> -->
-                <!-- <el-button @click.native.prevent="deleteData(scope.row.id, tableData)" type="text" size="small">移除</el-button>
+                <!-- <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> -->
               </template>
             </el-table-column>

src/views/website/categoryList.vue

@@ -50,10 +50,10 @@
             <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="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="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> -->
               </template>
             </el-table-column>

src/views/website/editNavigation.vue

@@ -16,15 +16,15 @@
               <el-input placeholder="请输入栏目名称" autocomplete="off" v-model="getApiData.name"/>
             </div>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <div class="searchBox">
               <div class="searchTitle">行政职能部门：</div>
               <el-cascader :key="searchDepartmentKey" v-model="getApiData.department_id" placeholder="请选择行政职能部门" :props="searchDepartmentData" filterable clearable></el-cascader>
             </div>
-          </el-col>
+          </el-col> -->
         </el-row>
       </div>
-      <div class="layerBoxLineTwo">
+      <!-- <div class="layerBoxLineTwo">
         <el-row>
           <el-col :span="8">
             <div class="searchBox">
@@ -33,7 +33,7 @@
             </div>
           </el-col>
         </el-row>
-      </div>
+      </div> -->
     </div>
     <div class="layerBoxNoBg">
       <div></div>
@@ -79,24 +79,24 @@
     <!--表格内容 end------------------------------------------------------------>
 
     <!--弹出框start------------------------------------------------------------>
-    <el-dialog title="编辑导航" :visible.sync="windowStatus">
+    <el-dialog title="编辑栏目" :visible.sync="windowStatus">
       <el-form :model="form" ref="form" :rules="formRules" autocomplete="off" label-position="left">
         <div class="formDiv">
-          <el-form-item label="导航名称：" :label-width="formLabelWidth" prop="alias" class="custom-align-right">
+          <el-form-item label="展示名称：" :label-width="formLabelWidth" prop="alias" class="custom-align-right">
             <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="seo_keywords" class="custom-align-right">
+          </el-form-item>
+          <el-form-item label="栏目关键词：" :label-width="formLabelWidth" prop="seo_keywords" class="custom-align-right">
             <div class="formLabelFloatBox">
               <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>
         </div>
@@ -139,7 +139,7 @@ export default {
 
     return {
       //1.列表和分页相关 start ------------------------------------------------------------>
-      tableDivTitle:"导航详情",
+      tableDivTitle:"栏目详情",
       tableData: [],//列表
       allCount:0,//总条数
       editId:0,//要修改的网站id
@@ -235,7 +235,7 @@ export default {
         //网站名称不能为空
         alias:[{required:true,trigger:'blur',validator:validateEmpty}],
         //网站标题，关键词，描述不能为空
-        //seo_title:[{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}],
       },
@@ -330,7 +330,7 @@ export default {
     //提交编辑的数据
     addToServe(){
       //把标题的值给与seo_title
-      this.form.seo_title = this.form.alias;
+      // this.form.seo_title = this.form.alias;
       this.$refs.form.validate(valid => {
         if (valid) {
           this.$store.dispatch('pool/upWebsiteCategoryones',this.form).then(res=> {

src/views/website/websiteColumn.vue

@@ -69,7 +69,7 @@
     <!--表格内容 end------------------------------------------------------------>
 
     <!--弹出框 start------------------------------------------------------------>
-    <el-dialog :title="editId ? '关联栏目名称' : '编辑关联栏目名称'" :visible.sync="windowStatus" :close-on-click-modal="false">
+    <el-dialog :title="editId ? '关联栏目名称' : '关联栏目名称'" :visible.sync="windowStatus" :close-on-click-modal="false">
       <el-form :model="form" ref="form" :rules="formRules" label-position="left">
         <div class="formDiv">
           <el-form-item label="关联网站名称：" :label-width="formLabelWidth" prop="webSiteName" class="custom-align-right">

src/views/website/websiteTag.vue

@@ -67,12 +67,12 @@
                 <el-table-column fixed="right" label="操作" width="240" 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="listDeleteBtn" @click="deleteData(scope.row.id, tableData)"><i class="el-icon-delete"></i>删除</div>
                       <div class="listEditBtn" @click="getDataMain(scope.row.id,scope.row, tableData)"><i class="el-icon-edit-outline"></i>编辑</div>
                       <!-- <div class="listMainBtn" @click="creatWebsite(scope.row.id)"><i class="el-icon-brush"></i>搭建</div> -->
                     </div>
                     <!-- <div class="listMainBtn"><i class="el-icon-view"></i>详情</div> -->
-                    <!-- <el-button @click.native.prevent="deleteData(scope.row.id, tableData)" type="text" size="small">移除</el-button>
+                    <!-- <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> -->
                   </template>
                 </el-table-column>