0.0.47

0.0.47

src/views/template/style/1/components/fivePicture.vue

@@ -1,6 +1,10 @@
 <template>
-  <div>
-   
+  <div class="fivePictureBox">
+    <div><img src="@/assets/template/component/pictureTitle1.png"/></div>
+    <div><img src="@/assets/template/component/pictureTitle2.png"/></div>
+    <div><img src="@/assets/template/component/pictureTitle3.png"/></div>
+    <div><img src="@/assets/template/component/pictureTitle4.png"/></div>
+    <div><img src="@/assets/template/component/pictureTitle5.png"/></div>
   </div>
 </template>
 
@@ -24,17 +28,21 @@ export default {
 </script>
 
 <style scoped lang="less">
-  .styleTitleBox {
-    width: 468px;
-    height: 41px;
-    text-align: center;
-    font-size: 32px;
-    font-weight: bold;
-    color: #333;
-    line-height: 41px;
-  }
-  .titleBoxStyle1{
-    background: url('../../../../../assets/template/component/titleStyle1.png') no-repeat center center;
-    background-size: 100% 100%;
+  .fivePictureBox {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 20px 0;
+    div {
+      width: 20%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      img {
+        display: block;
+        width: 90%;
+      }
+    }
   }
 </style>

src/views/template/style/1/manyPictureSector.vue

@@ -3,8 +3,12 @@
     <div class="manyPictureSectorBoxTitle">
       <styleTitle />
     </div>
-    <div>
-      
+    <div class="manyPictureSectorBox">
+      <fivePicture />
+    </div>
+    <div class="manyPictureNewsBox">
+      <div></div>
+      <div></div>
     </div>
   </div>
   
@@ -12,9 +16,11 @@
 
 <script>
 import styleTitle from './components/styleTitle.vue';
+import fivePicture from './components/fivePicture.vue';
 export default {
   components: {
-    styleTitle
+    styleTitle,
+    fivePicture
   },
   props: {
     
@@ -36,7 +42,7 @@ export default {
 <style scoped lang="less">
   .manyPictureSectorBox {
     display: flex;
-    justify-content: center;
+    flex-direction: column;
     align-items: center;
     width:100%;
     .manyPictureSectorBoxTitle {
@@ -47,6 +53,14 @@ export default {
       justify-content: center;
       align-items: center;
     }
+    .manyPictureSectorBox {
+      width: 80%;
+      border: 1px dashed #5570F1;
+    }
+    .manyPictureNewsBox {
+      width: 80%;
+      border: 1px dashed #5570F1;
+    }
   }
   
 </style>

src/views/website/WebsiteList.vue

@@ -16,12 +16,12 @@
             <el-cascader v-model="getApiData.website_column_id" :props="{checkStrictly:true}" :options="website_column_arr" clearable></el-cascader>
           </div>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <div class="searchBox">
-            <div class="searchTitle">网站城市：</div>
+            <div class="searchTitle">行政区划：</div>
             <CityCascader v-model="getApiData.city_arr_id" @update-city-id="updateCityId"></CityCascader>
           </div>
-        </el-col>
+        </el-col> -->
       </el-row>
       </div>
     </div>
@@ -41,7 +41,7 @@
       <el-row>
         <template>
           <el-table :data="tableData" style="width: 100%">
-            <el-table-column fixed prop="id" label="编号" width="50"></el-table-column>
+            <el-table-column fixed prop="index" label="编号" width="50"></el-table-column>
             <el-table-column prop="website_name" label="网站名称"></el-table-column>
             <el-table-column prop="column_name" label="上级网系"></el-table-column>
             <el-table-column label="网站地址">
@@ -53,7 +53,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="city_name" label="网站城市"></el-table-column>
+            <!-- <el-table-column prop="city_name" label="行政区划"></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="240" header-align="center">
@@ -148,9 +148,9 @@
           <el-form-item label="上级网系：" :label-width="formLabelWidth" prop="website_column_arr_id" class="custom-align-right">
             <el-cascader v-model="form.website_column_arr_id" :props="{checkStrictly:true}" :options="website_column_arr"></el-cascader>
           </el-form-item>
-          <el-form-item label="城市：" :label-width="formLabelWidth" prop="city_arr_id" class="custom-align-right">
+          <!-- <el-form-item label="行政区划：" :label-width="formLabelWidth" prop="city_arr_id" class="custom-align-right">
             <CityCascader v-model="form.city_arr_id" @update-city-id="updateFormCityId"></CityCascader>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="网站logo：" prop="logo" :label-width="formLabelWidth" :class="['custom-form-item']" class="custom-align-right">
             <div class="uploaderBox">
               <!-- <el-upload class="avatar-uploader" action="#" :show-file-list="false" :before-upload="beforeAvatarUpload">
@@ -322,7 +322,7 @@ export default {
           {url:"",show:false}
         ],
         website_column_arr_id:[],//需要提交的上级网系 数组
-        city_arr_id:[0],//需要提交的城市id
+        //city_arr_id:[0],//需要提交的城市id
         logo:"",//logo地址 提交文件换取地址
         title:"",//需要提交的网站标题
         keywords:"",//需要提交的网站标题
@@ -341,7 +341,7 @@ export default {
         //网系不能为空 注意，因为是select框，只有提交的时候才会验证
         website_column_arr_id: [{type:'array',required:true,trigger:'change',message:'必须选择一个网系！',validator:validateColumn}],
         //网站标题，关键词，描述不能为空
-        city_arr_id:[{required:true,trigger:'blur',validator:validateColumn}],
+        //city_arr_id:[{required:true,trigger:'blur',validator:validateColumn}],
         title:[{required:true,trigger:'blur',validator:validateEmpty}],
         keywords:[{required:true,trigger:'blur',validator:validateEmpty}],
         description:[{required:true,trigger:'blur',validator:validateEmpty}],
@@ -385,10 +385,17 @@ export default {
       //console.log(this.getApiData)
       this.$store.dispatch('pool/getWebList',this.getApiData).then(res=> {
         let newData = [];
-        for(let item of res.data.rows){
-          if(item.city_name==null){item.city_name="--"}
-          newData.push(item)
+        //显示原有的id
+        // for(let item of res.data.rows){
+        //   if(item.city_name==null){item.city_name="--"}
+        //   newData.push(item)
+        // }
+        //显示1-10编号
+        for(let i=0;i<res.data.rows.length;i++){
+          newData[i] = res.data.rows[i];
+          newData[i].index = i+1;
         }
+        console.log(newData)
         //格式化网站地址
         // res.data.rows.forEach(item => {
         //   item.website_url = item.website_url.join(', ');
@@ -446,7 +453,7 @@ export default {
       this.getApiData.keyword = "";
       this.getApiData.website_column_id = [];
       this.getApiData.city_id = [];
-      this.getApiData.city_arr_id = [];
+      //this.getApiData.city_arr_id = [];
       this.getApiData.page = 1;
       this.getApiData.pageSize = 10;
       this.getData();
@@ -483,7 +490,7 @@ export default {
         {url:"",show:false},
         {url:"",show:false}
       ];
-      this.form.city_arr_id = [0];
+      //this.form.city_arr_id = [0];
       this.form.logo = "";
       this.form.title = "";
       this.form.keywords = "";
@@ -554,8 +561,8 @@ export default {
     },
     //3.5 弹出框的城市选择器
     updateFormCityId(value){
-      console.log("城市ID已更新:", value);
-      this.form.city_arr_id = value;
+      //console.log("城市ID已更新:", value);
+      //this.form.city_arr_id = value;
     },
     //3.6 上传图片操作
     beforeAvatarUpload(file) {
@@ -768,7 +775,7 @@ export default {
         }
         //回显id
         //存放城市id
-        this.form.city_arr_id = res.data.city_arr_id;
+        //this.form.city_arr_id = res.data.city_arr_id;
         //当cascaderKey的值改变的时候 级联选择器会重置里面的内容
         //this.cascaderKey += 1;
         //回显网站标题，描述，关键词