前端调整

src/components/WebSet/WebSiteEdit.vue

@@ -233,6 +233,7 @@
       </div>
     </div>
     <el-dialog :title="commonTitle" :visible.sync="isShowDialog" width="1000px">
+      {{currentEditItem}}
       <!--视频-->
       <plugvideodialog v-if="currentEditItem.Id=='white_label_video'" :plugData="currentEditItemData"></plugvideodialog>
       <!--轮播图-->

src/components/WebSet/classification.vue

@@ -19,7 +19,6 @@
             <el-input v-model='msg.CategoryName' class="permiss-input" :placeholder="$t('fnc.qsrneirong')"></el-input>
           </span>
         </li>
-
         <li>
           <span><em>{{$t('objFill.cengji')}}</em>
             <el-select v-model="msg.Level" :placeholder="$t('pub.pleaseSel')">
@@ -43,12 +42,11 @@
           <input type="button" class="hollowFixedBtn" name="" id="" :value="$t('pub.searchBtn')"
             @click="resetPageIndex(),getList()" />
           <input type="button"
-            @click="outerVisible = true,dialogTitle=$t('objFill.v101.xinzengfl'),clearMessage(),getLineList(),getAllAreaTreeList(0),getLineTeamList();"
+            @click="outerVisible = true,dialogTitle=$t('objFill.v101.xinzengfl'),clearMessage() ,getAllAreaTreeList(0),getLineTeamList();"
             class="normalBtn" :value="$t('pub.addBtn')" />
         </li>
       </ul>
     </div>
-
     <el-table :data="DataList" style="width:100%" v-loading='loading'>
       <el-table-column fixed :label="$t('ground.fenleimc')">
         <template slot-scope="scope">
@@ -85,23 +83,21 @@
         <template slot-scope="scope">
           <template v-if="scope.row.AreaList&&scope.row.AreaList.length>0">
             <div>
-              <span v-for="(file,fIndex) in scope.row.AreaList">
+              <span v-for="(file,fIndex) in scope.row.AreaList" :key="`d_`+scope.row.Id+`_a_`+fIndex">
                 {{file.Name}}{{(fIndex== (scope.row.AreaList.length-1)&&scope.row.AreaList.length>1)?"":","}}
               </span>
             </div>
           </template>
-
           <template v-if="scope.row.LineList&&scope.row.LineList.length>0">
             <div>
-              <span v-for="(file,fIndex) in scope.row.LineList">
+              <span v-for="(file,fIndex) in scope.row.LineList" :key="`d_`+scope.row.Id+`_l_`+fIndex">
                 {{file.Name}}{{(fIndex== (scope.row.LineList.length-1)&&scope.row.LineList.length>1)?"":","}}
               </span>
             </div>
           </template>
-
           <template v-if="scope.row.SeriesList&&scope.row.SeriesList.length>0">
             <div>
-              <span v-for="(file,fIndex) in scope.row.SeriesList">
+              <span v-for="(file,fIndex) in scope.row.SeriesList" :key="`d_`+scope.row.Id+`_s_`+fIndex">
                 {{file.Name}}{{(fIndex== (scope.row.SeriesList.length-1)&&scope.row.SeriesList.length>1)?"":","}}
               </span>
             </div>
@@ -116,7 +112,6 @@
       </el-table-column>
       <el-table-column fixed :label="$t('objFill.v101.activity.col6.t8')">
         <template slot-scope="scope">
-          <!-- style="width: 100px; height: 100px" -->
           <el-image class="icon" :src="scope.row.Icon" :preview-src-list="[scope.row.Icon]"> </el-image>
         </template>
       </el-table-column>
@@ -124,7 +119,6 @@
         <template slot-scope="scope">
           <el-image class="icon" :src="scope.row.BackgroundImage" :preview-src-list="[scope.row.BackgroundImage]">
           </el-image>
-
         </template>
       </el-table-column>
       <el-table-column fixed :label="$t('admin.admin_status')">
@@ -149,11 +143,11 @@
     </el-table>
 
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
-      layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total='total'>
+      layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
     </el-pagination>
 
     <el-dialog :title="dialogTitle" :visible.sync="outerVisible" center width="1000px"
-      :before-close="closeChangeMachie">
+      :before-close="closeChangeMachie" append-to-body>
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -216,7 +210,7 @@
               <template v-if="addMsg.Level==1">
                 <el-form-item :label="$t('system.table_ssLine')">
                   <el-select :disabled="addMsg.IsLock === 1" v-model="addMsg.LineIdList" multiple collapse-tags
-                    :placeholder="$t('pub.pleaseSel')">
+                    :placeholder="$t('pub.pleaseSel')" filterable>
                     <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
                     <el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID"
                       :key="item.LineID"></el-option>
@@ -226,8 +220,8 @@
               <template v-else>
                 <el-form-item :label="$t('active.ad_xlmc')">
                   <el-select :disabled="addMsg.IsLock === 1" v-model="addMsg.SeriesIdList" multiple collapse-tags
-                    :placeholder="$t('pub.pleaseSel')">
-                    <el-option :label="$t('pub.unlimitedSel')" :value=queryCommonData.SelectDefaultValue></el-option>
+                    :placeholder="$t('pub.pleaseSel')" filterable>
+                    <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
                     <el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID"
                       :key="item.LtID"></el-option>
                   </el-select>
@@ -248,7 +242,6 @@
             </template>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('objFill.v101.activity.col6.t8')">
@@ -261,15 +254,12 @@
             </el-form-item>
           </el-col>
         </el-row>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
         <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
       </div>
     </el-dialog>
-
-
   </div>
 </template>
 
@@ -329,6 +319,7 @@
           LineIdList: [],
           SeriesIdList: [],
           IsSelfGuidedTour: 0,
+          LinkUrl:"",//页面地址
         },
         rules: {
           CategoryName: [{
@@ -345,6 +336,7 @@
       }
     },
     mounted() {
+      this.getLineList();
       this.getList();
     },
     methods: {
@@ -373,12 +365,8 @@
         this.chooseCategroyArray = arr;
         this.showCategoryName = arrLabel;
       },
-
       getLineList() { //获取线路列表
-        this.apipost(
-          "line_post_GetList", {
-            LineDirection: 2
-          },
+        this.apipost("line_post_GetAllList", {},
           res => {
             if (res.data.resultCode == 1) {
               this.queryCommonData.LineList = res.data.data;
@@ -457,7 +445,6 @@
           this.addMsg.AreaIdList = [];
         } else {
           this.getCateGoryList();
-
         }
       },
       changeSelfGuidedTour() {
@@ -476,7 +463,6 @@
             lineIds = this.cateGoryList[index].LineIds;
           }
           this.getLineTeamList(lineIds);
-
         }
       },
       getCateGoryList() {
@@ -500,7 +486,6 @@
           this.$message.error(this.$t('objFill.v101.qingxzfujifl'));
           return
         }
-
         let params = {
           ...this.addMsg
         }
@@ -519,9 +504,7 @@
           })
         }
         params.AreaIds = tempCategory.substring(0, tempCategory.lastIndexOf(','));
-        // if(params.AreaList&&params.AreaList.length>0){
-        // 	params.AreaIds=params.AreaList.toString();
-        // }
+
         this.apipost('ws_post_SetCategory', params, res => {
           if (res.data.resultCode == 1) {
             this.outerVisible = false;
@@ -536,7 +519,6 @@
       updateData({
         Id
       }) { //修改
-        this.getLineList();
 
         this.apipost('ws_post_GetCategory', {
           Id
@@ -607,7 +589,6 @@
           .ImageList.length > 0) {
           this.$refs.BackgroundImage.ImageList = []
         }
-        //this.$refs.tree.setCheckedKeys([]);
       },
       resetPageIndex() {
         this.msg.pageIndex = 1
@@ -630,7 +611,6 @@
         this.$refs[formName].resetFields();
       }
     }
-
   }
 
 </script>

src/components/WebSet/home/indexRoll2.vue

@@ -300,6 +300,9 @@
         if (chooseMenuObj) {
           this.clickItem.SubName = chooseMenuObj.MenuName;
           this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
+          if (chooseMenuObj.ImgUrl && chooseMenuObj.ImgUrl != '') {
+            this.clickItem.FileUrl = chooseMenuObj.ImgUrl;
+          }
         }
         this.$refs.chooseMenu.initMenuCheck();
       },

src/components/WebSet/home/indexSlider1.vue

@@ -309,6 +309,9 @@
         if (chooseMenuObj) {
           this.clickItem.SubName = chooseMenuObj.MenuName;
           this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
+          if (chooseMenuObj.ImgUrl && chooseMenuObj.ImgUrl != '') {
+            this.clickItem.FileUrl = chooseMenuObj.ImgUrl;
+          }
         }
         this.$refs.chooseMenu.initMenuCheck();
       },

src/router/config.js

@@ -5915,7 +5915,7 @@ export default {
             {
               path: '/Classification',
               name: 'Classification',
-              component: resolve => require(['@/components/WebSet/Classification'], resolve),
+              component: resolve => require(['@/components/WebSet/classification'], resolve),
               meta: {
                 title: '分类管理'
               },