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

src/views/dashboard/admin/index.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="dashboard-editor-container">
     <!--超级管理员-->
-    <div v-if="userType==10000">
+    <div v-if="userType == 10000">
       <!--网站，内容，公共栏目数量 start------------------------------------------>
       <el-row :gutter="32">
         <el-col :xs="24" :sm="24" :lg="8">
           <div class="topWindowBox">
             <div class="twbTitle">
               <div class="twbIconbgRed">
-                <img src="@/assets/index/twbIconbgBlue.png"/>
+                <img src="@/assets/index/twbIconbgBlue.png" />
               </div>
               网站数量
             </div>
-            <div class="twbNumber">{{topData.website.count}}</div>
+            <div class="twbNumber">{{ topData.website.count }}</div>
             <!-- <div class="twbStatus"><img src="@/assets/index/arrow-up.png"/> +12% <span>较上周</span></div> -->
           </div>
         </el-col>
@@ -20,11 +20,11 @@
           <div class="topWindowBox">
             <div class="twbTitle">
               <div class="twbIconbgBlue">
-                <img src="@/assets/index/twbIconbgRed.png"/>
+                <img src="@/assets/index/twbIconbgRed.png" />
               </div>
               文章发布数量
             </div>
-            <div class="twbNumber">{{topData.article.count}}</div>
+            <div class="twbNumber">{{ topData.article.count }}</div>
             <!-- <div class="twbStatus"><img src="@/assets/index/arrow-up.png"/> +18% <span>较昨天</span></div> -->
           </div>
         </el-col>
@@ -32,11 +32,11 @@
           <div class="topWindowBox">
             <div class="twbTitle">
               <div class="twbIconbgPurple">
-                <img src="@/assets/index/twbIconbgPurple.png"/>
+                <img src="@/assets/index/twbIconbgPurple.png" />
               </div>
               公共栏目数量
             </div>
-            <div class="twbNumber">{{topData.category.count}}</div>
+            <div class="twbNumber">{{ topData.category.count }}</div>
             <!-- <div class="twbStatusDown"><img src="@/assets/index/arrow-down.png"/> -2% <span>较上个月</span></div> -->
           </div>
         </el-col>
@@ -48,7 +48,7 @@
           <div class="chartBox">
             <div class="chartTitle">平台文章增长数量</div>
             <el-row style="background:#fff;padding:16px 16px 0;">
-              <line-chart :chart-data="chartData.lineChartData"/>
+              <line-chart :chart-data="chartData.lineChartData" />
             </el-row>
           </div>
         </el-col>
@@ -56,7 +56,7 @@
           <div class="chartBox">
             <div class="chartTitle">用户类型</div>
             <div class="chart-wrapper">
-              <ring-chart :chart-data="chartData.ringChartData"/>
+              <ring-chart :chart-data="chartData.ringChartData" />
             </div>
           </div>
         </el-col>
@@ -64,25 +64,51 @@
       <!--chart end------------------------------------------>
     </div>
     <!--调研员-->
-    <div v-if="userType==4">
+    <div v-if="userType == 4">
       <el-row :gutter="32">
         <el-col :xs="24" :sm="24" :lg="24">
           <div class="chartBox">
             <div class="chartTitle">投诉举报增长数量</div>
             <el-row style="background:#fff;padding:16px 16px 0;">
-              <line-chart :chart-data="chartData.lineChartData"/>
+              <line-chart :chart-data="chartData.lineChartData" />
             </el-row>
           </div>
         </el-col>
       </el-row>
     </div>
     <!--个人会员-->
-    <div v-if="userType==1">
+    <div v-if="userType == 1">
       <el-row :gutter="32">
         <el-col :xs="24" :sm="24" :lg="24">
-          <div class="noData">
+          <!-- <div class="noData">
             欢迎使用恒星管理平台
+          </div> -->
+          <!-- 已审核文章 -->
+          <div class="chartBox">
+            <div class="chartTitle">已审核文章</div>
+            <div class="chart-wrapper">
+              <!-- 展示文章列表 -->
+              <!-- 列表 -->
+              <el-table :data="type_id1.article" style="width: 100%" @click="handleClick">
+                <el-table-column prop="title" label="标题" width="">
+                </el-table-column>
+
+                <el-table-column prop="created_at" label="创建时间" width="180">
+                </el-table-column>
+                <el-table-column prop="updated_at" label="创建时间" width="180">
+                </el-table-column>
+
+                <el-table-column prop="status" label="状态" width="180">
+                  <template slot-scope="scope">
+                    <el-tag :type="scope.row.status == 1 ? 'success' : 'danger'">{{ scope.row.status == 1 ? '已审核' :
+                      '未审核' }}</el-tag>
+                  </template>
+                </el-table-column>
+              </el-table>
+
+            </div>
           </div>
+
         </el-col>
       </el-row>
     </div>
@@ -118,31 +144,36 @@ export default {
   },
   data() {
     return {
-      userType:0,//用户身份
-      topData:{
-        website:{//网站
-          count:0,//总数
-          growth_rate:0//增长数
+      userType: 0,//用户身份
+      topData: {
+        website: {//网站
+          count: 0,//总数
+          growth_rate: 0//增长数
         },
-        article:{//文章
-          count:0,//总数
-          growth_rate:0//增长数
+        article: {//文章
+          count: 0,//总数
+          growth_rate: 0//增长数
         },
-        category:{//栏目
-          count:0,//总数
-          growth_rate:0//增长数
+        category: {//栏目
+          count: 0,//总数
+          growth_rate: 0//增长数
         }
       },
-      chartData:{
-        lineChartData:[],//折线图数据
-        ringChartData:[]//圆环图数据
-      }
+      chartData: {
+        lineChartData: [],//折线图数据
+        ringChartData: []//圆环图数据
+      },
+      type_id1: [],
     }
   },
   methods: {
+    handleClick(row) {
+      this.$router.push({ path: '/articleList/' + row.id })
+    },
+    // 获取首页数据
     //获取用户身份信息
-    getUserInfo(fun){
-      this.$store.dispatch('public/getInfo').then(res=> {
+    getUserInfo(fun) {
+      this.$store.dispatch('public/getInfo').then(res => {
         console.log(res)
         this.userType = res.data.type_id;
         //if(res.data.type_id==10000){}//管理员
@@ -156,13 +187,16 @@ export default {
       })
       fun();
     },
-    getData(){
+    getData() {
       //获取首页数据
-      this.$store.dispatch('public/getAdminIndex').then(res=> {
+      this.$store.dispatch('public/getAdminIndex').then(res => {
         //如果是调研员就不显示其他的
-        if(this.userType==4){
+        if (this.userType == 4) {
           this.chartData.lineChartData = res.data.letterOfComplaintList;
-        }else{
+        } else if (this.userType == 1) {
+          //个人会员
+          this.type_id1 = res.data;
+        } else {
           this.topData.article.count = res.data.article.count;
           this.topData.category.count = res.data.category.count;
           this.topData.website.count = res.data.website.count;
@@ -172,7 +206,7 @@ export default {
       })
     },
   },
-  mounted(){
+  mounted() {
     //先获取用户身份
     this.getUserInfo(this.getData)
     //再获取数据
@@ -182,107 +216,121 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  @title: #212227;
-  @bgColor: #FFFFFF;
-  .topWindowBox{
-    background:@bgColor;
-    border-Radius:20px;
-    height:160px;
-    width:100%;
-    margin-bottom:30px;
-    padding:25px;
-    box-sizing: border-box;
-    .twbTitle {
-      display:flex;
-      align-items: center;
-      font-size:16px;
-      color:@title;
-      .twbIconbgRed,.twbIconbgBlue,.twbIconbgPurple{
-        width: 40px;
-        height: 40px;
-        border-radius: 50%;
-        margin-right: 15px;
-      }
-      // .twbIconbgRed {
-      //   background: #EA79BA;
-      // }
-      // .twbIconbgBlue {
-      //   background: #6DACE7;
-      // }
-      // .twbIconbgPurple{
-      //   background: #AA7AEB;
-      // }
-    }
-    .twbNumber {
-      font-size: 30px;
-      margin-top:32px;
-      font-weight: 1000;
-    }
-    .twbStatus,.twbStatusDown {
-      font-size:14px;
-      margin-top: 35px;
-      display:flex;
-      img {
-        display: block;
-        margin-right: 4px;
-      }
-      span {
-        color:#707B81;
-        margin-left: 8px;
-      }
+@title: #212227;
+@bgColor: #FFFFFF;
+
+.topWindowBox {
+  background: @bgColor;
+  border-Radius: 20px;
+  height: 160px;
+  width: 100%;
+  margin-bottom: 30px;
+  padding: 25px;
+  box-sizing: border-box;
+
+  .twbTitle {
+    display: flex;
+    align-items: center;
+    font-size: 16px;
+    color: @title;
+
+    .twbIconbgRed,
+    .twbIconbgBlue,
+    .twbIconbgPurple {
+      width: 40px;
+      height: 40px;
+      border-radius: 50%;
+      margin-right: 15px;
     }
-    .twbStatus {
-      color:#23C581;
+
+    // .twbIconbgRed {
+    //   background: #EA79BA;
+    // }
+    // .twbIconbgBlue {
+    //   background: #6DACE7;
+    // }
+    // .twbIconbgPurple{
+    //   background: #AA7AEB;
+    // }
+  }
+
+  .twbNumber {
+    font-size: 30px;
+    margin-top: 32px;
+    font-weight: 1000;
+  }
+
+  .twbStatus,
+  .twbStatusDown {
+    font-size: 14px;
+    margin-top: 35px;
+    display: flex;
+
+    img {
+      display: block;
+      margin-right: 4px;
     }
-    .twbStatusDown {
-      color:#E74545
+
+    span {
+      color: #707B81;
+      margin-left: 8px;
     }
   }
 
-  .chartBox {
-    width: 100%;
-    height: 440px;
-    border-radius: 20px;
-    overflow: hidden;
-    background-color: @bgColor;
-    .chartTitle {
-      color: @title;
-      padding: 30px 30px 0 30px;
-      font-size: 16px;
-    }
+  .twbStatus {
+    color: #23C581;
   }
 
-  .noData {
-    color: #CCCCCC;
-    font-size: 32px;
-    font-weight: bold;
-    text-align: center;
-    height: 740px;
-    line-height: 740px;
+  .twbStatusDown {
+    color: #E74545
   }
+}
 
-  .dashboard-editor-container {
-    padding: 32px;
-    background-color: rgb(240, 242, 245);
-    position: relative;
+.chartBox {
+  width: 100%;
+  height: 440px;
+  border-radius: 20px;
+  overflow: hidden;
+  background-color: @bgColor;
 
-    .github-corner {
-      position: absolute;
-      top: 0px;
-      border: 0;
-      right: 0;
-    }
+  .chartTitle {
+    color: @title;
+    padding: 30px 30px 0 30px;
+    font-size: 16px;
+  }
+}
 
-    .chart-wrapper {
-      background: #fff;
-      padding: 16px 16px 0;
-      margin-bottom: 32px;
-    }
+.noData {
+  color: #CCCCCC;
+  font-size: 32px;
+  font-weight: bold;
+  text-align: center;
+  height: 740px;
+  line-height: 740px;
+}
+
+.dashboard-editor-container {
+  padding: 32px;
+  background-color: rgb(240, 242, 245);
+  position: relative;
+
+  .github-corner {
+    position: absolute;
+    top: 0px;
+    border: 0;
+    right: 0;
   }
 
-  @media (max-width:1024px) {
-    .chart-wrapper {
-      padding: 8px;
-    }
+  .chart-wrapper {
+    background: #fff;
+    padding: 16px 16px 0;
+    margin-bottom: 32px;
   }
+}
+
+@media (max-width:1024px) {
+  .chart-wrapper {
+    padding: 8px;
+  }
+}
 </style>

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">
@@ -58,7 +58,7 @@
           <el-table :data="tableData" style="width: 100%">
             <el-table-column fixed prop="id" label="编号" width="80"></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">

src/views/news/creatNews.vue

@@ -22,7 +22,7 @@
                 :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"
                 popper-class="my_cascader" filterable clearable></el-cascader>
             </el-form-item>
@@ -38,8 +38,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>
@@ -50,7 +50,7 @@
                     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-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>

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">

src/views/role/components/userDefault.vue

@@ -144,7 +144,7 @@
           </el-form-item>
 
           <el-form-item label="相关资料：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" accept=".jpg, .jpeg, .png, .pdf"
+            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" accept=".jpg, .jpeg, .png"
               :before-remove="beforeRemove" :on-success="handleUploadSuccess" multiple :limit="30"
               :on-exceed="handleExceed" :file-list="otherList" list-type="picture" :before-upload="beforeAvatarUpload1">
               <el-button size="small" type="primary">点击上传</el-button>
@@ -272,7 +272,7 @@ export default {
 
         websiteTag_arr_id: [],    //站点标识下拉id only
         websiteTag_reg: "",
-        sszq: "", //站点标识下拉id
+        sszq: [], //站点标识下拉id
 
 
 
@@ -299,7 +299,7 @@ export default {
         other: [],//相关资料
         remark: "",//提示词
         zip_code: "",//邮编
-        //   sszq:[]//网站选择
+        // sszq: []//网站选择
       },
       timeList: [],//时间段
       otherList: [],//相关资料列表
@@ -448,9 +448,9 @@ export default {
       this.$message.warning(`当前限制选择 30 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
     beforeRemove(file, fileList) {
-      console.log('file, fileList',file, fileList);
-      for(let item of fileList){
-       this.form.other = this.form.other.filter(item => item !== file.url); 
+      console.log('file, fileList', file, fileList);
+      for (let item of fileList) {
+        this.form.other = this.form.other.filter(item => item !== file.url);
       }
       return this.$confirm(`确定移除 ${file.name}?`);
     },
@@ -642,7 +642,11 @@ export default {
                 this.form.native_place_arr_id = JSON.parse(this.form.native_place_arr_id);
               }
 
-              this.form.sszq = this.form.sszq[0]
+              if (typeof (this.form.sszq) == 'number') {
+                this.form.sszq = this.form.sszq
+              } else {
+                this.form.sszq = this.form.sszq[0]
+              }
 
               //2.设置修改的用户id
               this.form.id = this.editId;

src/views/role/components/userEnterprise.vue

@@ -116,7 +116,7 @@
             <el-input v-model="form.email" autocomplete="off" placeholder="请输入电子邮箱.."></el-input>
           </el-form-item>
           <el-form-item label="相关资料：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" accept=".jpg, .jpeg, .png, .pdf"
+            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" accept=".jpg, .jpeg, .png"
               :before-remove="beforeRemove" :on-success="handleUploadSuccess" multiple :limit="30"
               :on-exceed="handleExceed" :file-list="otherList" list-type="picture" :before-upload="beforeAvatarUpload">
               <el-button size="small" type="primary">点击上传</el-button>
@@ -234,7 +234,7 @@ export default {
 
         websiteTag_arr_id: [],    //站点标识下拉id only
         websiteTag_reg: [],
-        sszq: "", //站点标识下拉id
+        sszq: [], //站点标识下拉id
 
 
         type_id: 3,//企业会员
@@ -399,9 +399,9 @@ export default {
       this.$message.warning(`当前限制选择 30 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
     beforeRemove(file, fileList) {
-      console.log('file, fileList',file, fileList);
-      for(let item of fileList){
-       this.form.other = this.form.other.filter(item => item !== file.url); 
+      console.log('file, fileList', file, fileList);
+      for (let item of fileList) {
+        this.form.other = this.form.other.filter(item => item !== file.url);
       }
       return this.$confirm(`确定移除 ${file.name}?`);
     },
@@ -596,7 +596,12 @@ export default {
               this.form.address_arr_id = JSON.parse(this.form.address_arr_id);
               //2.设置修改的用户id
               this.form.id = this.editId;
-              this.form.sszq = this.form.sszq[0]
+              // 站点标识如果是数字就直接传数字，如果是数组就取第一个值
+              if (typeof (this.form.sszq) == 'number') {
+                this.form.sszq = this.form.sszq
+              } else {
+                this.form.sszq = this.form.sszq[0]
+              }
               //3.提交用户修改
               //如果code为0表示用户不存在，提交表单
               this.$store.dispatch('userMember/updateUser', this.form).then(res => {

src/views/role/components/userInvestigate.vue

@@ -131,7 +131,7 @@
             <el-input v-model="form.address" autocomplete="off" placeholder="请输入门牌号.."></el-input>
           </el-form-item>
           <el-form-item label="相关资料：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" accept=".jpg, .jpeg, .png, .pdf"
+            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" accept=".jpg, .jpeg, .png"
               :before-remove="beforeRemove" :on-success="handleUploadSuccess" multiple :limit="30"
               :on-exceed="handleExceed" :file-list="otherList" list-type="picture" :before-upload="beforeAvatarUpload1">
               <el-button size="small" type="primary">点击上传</el-button>
@@ -273,7 +273,7 @@ export default {
         websiteTag_arr_id: [],    //站点标识下拉id only
 
         websiteTag_reg: "",
-        sszq: "", //站点标识下拉id
+        sszq: [], //站点标识下拉id
 
 
 
@@ -465,9 +465,9 @@ export default {
       this.$message.warning(`当前限制选择 30 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
     beforeRemove(file, fileList) {
-      console.log('file, fileList',file, fileList);
-      for(let item of fileList){
-       this.form.other = this.form.other.filter(item => item !== file.url); 
+      console.log('file, fileList', file, fileList);
+      for (let item of fileList) {
+        this.form.other = this.form.other.filter(item => item !== file.url);
       }
       return this.$confirm(`确定移除 ${file.name}?`);
     },
@@ -588,11 +588,11 @@ export default {
             }
             this.webSiteList.push(data)
           }
-          //如果有数据可以回显
-          if (userWebList) {
-            console.log("显示编辑用户的所属网站！")
-            this.form.sszq = userWebList;
-          }
+          // //如果有数据可以回显
+          // if (userWebList) {
+          //   console.log("显示编辑用户的所属网站！")
+          //   this.form.sszq = userWebList;
+          // }
         }
       })
     },
@@ -696,7 +696,11 @@ export default {
               //this.form.city_arr_id = JSON.parse(this.form.address_arr_id);
 
               //数组转换为数字
-              this.form.sszq = this.form.sszq[0]
+              if (typeof (this.form.sszq) == 'number') {
+                this.form.sszq = this.form.sszq
+              } else {
+                this.form.sszq = this.form.sszq[0]
+              }
 
               //2.设置修改的用户id
               this.form.id = this.editId;

src/views/website/editNavigation.vue

@@ -4,7 +4,7 @@
       <el-row>
         <el-col :span="8">
           <div class="searchBox">
-            <div class="searchTitle">栏目名称：{{ isExpandAll }}</div>
+            <div class="searchTitle">栏目名称：</div>
             <el-input v-model="search"   placeholder="请输入栏目名称"  :clearable="true"/>
             <!-- <el-input placeholder="请输入栏目名称" autocomplete="off" v-model="getApiData.name" /> -->
           </div>
@@ -435,7 +435,7 @@ export default {
             //汇报结果
             this.$message({
               type: 'success',
-              message: '排序修改成成！'
+              message: '排序修改成功！'
             });
             this.getData();
           }).catch(() => {

src/views/website/websiteColumn.vue

@@ -486,7 +486,7 @@ export default {
             if(res.code==200){
               this.$message({
                 type: 'success',
-                message: '导航修改成功！'
+                message: '网站栏目修改成功！'
               });
             }
             //关闭并重置窗口