Merge branch 'master' into dev_fbl

src/page/check/learn/details.vue

@@ -37,6 +37,7 @@
               <el-form-item label="展板名称" class="w50">
                 <span>{{ item.name }}</span>
               </el-form-item>
+             
               <el-form-item label="展板简介">
                 <span>{{ item.remarks }}</span>
               </el-form-item>

src/page/check/video/details.vue

-fefe
\ No newline at end of file

src/page/check/video/index.vue

@@ -58,32 +58,31 @@
             </el-table-column>
             <el-table-column label="操作" header-align="center" align="center">
               <template slot-scope="scope" width="220">
-                <el-button-group>
-                  <!-- <el-button
-                    title="删除"
-                    type="text"
-                    size="mini"
-                    @click="handleDelete(scope.row)"
-                  >删除&nbsp;&nbsp;</el-button>
-                  <el-button
-                    title="请填写驳回原因"
-                    size="mini"
-                    type="text"
-                    @click="reject(scope.row)"
-                  >请填写驳回原因&nbsp;&nbsp;</el-button> -->
-                  <el-button title="查看详情" size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button>
-                </el-button-group>
+                 <div class="table-btn-group">
+                <el-tooltip content="详情" placement="top">
+                  <el-button circle @click="openDetails(scope.row)">
+                    <i class="icon-table icon-detail"></i>
+                  </el-button>
+                </el-tooltip>
+              </div>
               </template>
             </el-table-column>
              <el-table-column label="审核" header-align="center" align="center">
               <template slot-scope="scope" width="220">
-                <el-button-group>
-                  <!-- <el-button
-                    title="删除"
-                    type="text"
-                    size="mini"
-                    @click="handleDelete(scope.row)"
-                  >删除&nbsp;&nbsp;</el-button> -->
+                <div class="table-btn-group">
+                <el-tooltip content="通过" placement="top">
+                  <el-button circle @click="adopt(scope.row)">
+                    <i class="icon-table icon-enable"></i>
+                  </el-button>
+                </el-tooltip>
+                 <el-tooltip content="驳回" placement="top">
+                  <el-button circle @click="reject(scope.row)">
+                    <i class="icon-table icon-disable"></i>
+                  </el-button>
+                </el-tooltip>
+              </div>
+                <!-- <el-button-group>
+                  
                   <el-button
                     size="mini"
                     type="text"
@@ -94,7 +93,7 @@
                     type="text"
                     @click="adopt(scope.row)"
                   >通过&nbsp;&nbsp;</el-button>
-                </el-button-group>
+                </el-button-group> -->
               </template>
             </el-table-column>
         </el-table>
@@ -129,49 +128,28 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer btn-group">
-        <el-button size="mini" v-show="type" type="primary" @click="permisSave">确定</el-button>
-        <el-button size="mini" v-show="!type" type="primary" @click="permisEdit">确定</el-button>
+        <el-button size="mini" type="primary" @click="permisSave">确定</el-button>
         <el-button size="mini" @click="close1">取 消</el-button>
       </div>
       </el-dialog>
       <!--请填写驳回原因-->
-      <el-dialog custom-class="party-dialog" title="请填写驳回原因" width="468px" :visible.sync="FormVisible" :before-close="close" >
+      <el-dialog custom-class="party-dialog" title="视频详情" width="80%" :visible.sync="FormVisible" :before-close="close" >
         <div class="dialog-content">
-          <el-form :model="editform" disabled class="party-form" ref="editform"  label-width="80px" label-position="right" :rules="rules">
-            <el-form-item label="审核层级：" :label-width="formLabelWidth">
-              <el-input
-                size="small"
-                v-model="editform.sort"
-                auto-complete="off"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="审核时间：" :label-width="formLabelWidth">
-              <el-input
-                size="small"
-                v-model="editform.menuName"
-                auto-complete="off"
-                clearable
-                onkeyup="this.value=this.value.replace(/^ +| +$/g,'')"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="审核结果：" :label-width="formLabelWidth">
-              <el-input
-                size="small"
-                v-model="editform.menuUrl"
-                auto-complete="off"
-                clearable
-                onkeyup="this.value=this.value.replace(/^ +| +$/g,'')"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="驳回原因：" :label-width="formLabelWidth">
-              <el-input type="textarea" v-model="editform.desc"></el-input>
-            </el-form-item>
-          </el-form>
-          <div slot="footer" class="dialog-footer  btn-group">
-            <el-button size="mini" type="primary" @click="submitForm('editform')">确定</el-button>
-            <el-button size="mini" @click="close">取 消</el-button>
-          </div>
+          <div>
+      <!--
+      <video :src="videoSrc" :poster="videoImg" :autoplay="playStatus" height="421" width="700" :muted="muteStatus">
+        your browser does not support the video tag
+      </video>
+      <button @click="playClick" :class="{hide: isPlay}">点击播放</button> -->
+      <!--class="video-js vjs-default-skin vjs-big-play-centered" -->
+      <video    :preload="preload"
+              :poster="videoImg" :height="height" :width="width" align="center" :controls="controls"  :autoplay="autoplay">
+        <source :src="videoSrc" type="video/mp4">
+      </video>
+    </div>
+          <!-- <div slot="footer" class="dialog-footer  btn-group">
+            <el-button size="mini" type="primary" @click="close">关闭</el-button>
+          </div> -->
         </div>
       </el-dialog>
   </div>
@@ -192,6 +170,19 @@ export default {
       }
     };
     return {
+      videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4',
+      videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb',
+      playStatus: '',
+      muteStatus: '',
+      isMute: true,
+      isPlay: false,
+      width: '100%', // 设置视频播放器的显示宽度（以像素为单位）
+      height: '100%', // 设置视频播放器的显示高度（以像素为单位）
+      preload: 'auto', //  建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
+      controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件，启动视频播放的唯一方法是使用autoplay属性或通过Player API。
+      autoplay: '',
+
+      //--
       type:true,
       value1: "",
       page: { currentPage: 1, pageSize: 10, total: 0 },
@@ -343,16 +334,17 @@ export default {
       this.FormVisible1 = true;
       this.type = true
     },
-    // 新建视频分类确认保存
-    permisSave() {
+ 
+     // 请填写驳回原因视频分类确认保存
+    permisEdit() {
       let _this = this;
       _this.$refs.classForm.validate(valid => {
         if (valid) {
           _this
             .$https(
-              { url: "videoContentCat/save", method: "post", authType: this.backToken },
-              // _this.$qs.stringify(_this.classForm)
-              _this.classForm
+              { url: "videoContentCat/update", method: "put", authType: this.backToken },
+              _this.$qs.stringify(_this.classForm)
+              // _this.classForm
             )
             .then(
               res => {
@@ -385,23 +377,60 @@ export default {
         }
       });
     },
-     // 请填写驳回原因视频分类确认保存
-    permisEdit() {
+    // 请填写驳回原因关闭
+    close() {
+      this.FormVisible = false;
+      // for (let key in this.classForm) {
+      //   this.classForm[key] = null;
+      // }
+      // this.$refs["classForm"].resetFields();
+      // this.FormVisible = false;
+      // this.$refs["editform"].resetFields();
+    },
+    // 新增关闭
+    close1() {
+      this.FormVisible1 = false;
+      for (let key in this.classForm) {
+        this.classForm[key] = null;
+      }
+      this.$refs["classForm"].resetFields();
+    },
+     // 通过
+    adopt(row){
+      this.classForm.id= row.id
+      this.classForm.status = "APPROVED_FINAL"
+      this.classForm.remarks = ""
+      this.permisSave('classForm')
+    },
+    // 请填写驳回原因弹框
+    reject(row) {
+      this.type = false
+      $('.el-dialog__title').html('请填写驳回原因');
+      let  _this=this;
+      _this.classForm.id= row.id
+      _this.classForm.status = "REFUSED"
+      _this.FormVisible1 = true;
+    },
+    // 驳回原因保存
+    permisSave() {
       let _this = this;
-      _this.$refs.classForm.validate(valid => {
-        if (valid) {
-          _this
+       _this
             .$https(
-              { url: "videoContentCat/update", method: "put", authType: this.backToken },
-              _this.$qs.stringify(_this.classForm)
-              // _this.classForm
+              { url: "audit/updateAuditAllById",
+               headers:{'Content-Type': 'application/json'},
+               method: "put", 
+               authType: this.backToken,
+
+              },
+              // _this.$qs.stringify(_this.classForm)
+              _this.classForm
             )
             .then(
               res => {
                 if (res.data.resultCode == 200 || res.data.resultCode == 201) {
                   _this.$message({
                     type: "success",
-                    message: '新建成功！'
+                    message: '操作成功！'
                   });
                   //跳回用户列表
                   _this.onSearch();
@@ -424,43 +453,11 @@ export default {
                 });
               }
             );
-        }
-      });
-    },
-    // 请填写驳回原因关闭
-    close() {
-      this.FormVisible1 = false;
-      for (let key in this.classForm) {
-        this.classForm[key] = null;
-      }
-      this.$refs["classForm"].resetFields();
-      // this.FormVisible = false;
-      // this.$refs["editform"].resetFields();
-    },
-    // 新增关闭
-    close1() {
-      this.FormVisible1 = false;
-      for (let key in this.classForm) {
-        this.classForm[key] = null;
-      }
-      this.$refs["classForm"].resetFields();
-    },
-    // 通过
-    adopt(row){
-        this.$message({type: 'success', message: '审核通过!'});
-    },
-    // 请填写驳回原因弹框
-    reject(row) {
-      this.type = false
-      $('.el-dialog__title').html('请填写驳回原因');
-      let  _this=this;
-      //成功之后清除数据
-      // for (let key in this.editform) {
-      //   _this.editform[key]=null;
-      // }
-      // _this.editform= Object.assign({}, row);
-      _this.FormVisible1 = true;
-    //   this.getAssetTypeInfo(row.id)
+      // _this.$refs.classForm.validate(valid => {
+      //   if (valid) {
+         
+      //   }
+      // });
     },
     // 获取视频分类详情
     getAssetTypeInfo(id){

src/page/content/components/dialog/videoDialog.vue

@@ -30,7 +30,7 @@
 export default {
   data() {
     return {
-      dialogVisible:true,
+      dialogVisible:false,
       videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4',
       videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb',
       playStatus: '',

src/page/content/components/uploadVue/uploadAudio--.vue

+<template>
+  <el-upload
+  class="upload-demo"
+  ref="upload"
+  action="http://192.168.110.67/mall/file/audio/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :file-list="fileList"
+  :on-success="handleAvatarSuccess"
+  :auto-upload="false">
+  <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+  <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+  <div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div>
+</el-upload>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        fileList: []
+      };
+    },
+    methods: {
+    handleAvatarSuccess(res, file) {
+        console.log(res)
+        console.log(res.data.fileList)
+         const data = res.data.fileList
+          let newArray = data.map((item) => {
+              return item.id;
+          })
+        this.$emit('audioList', newArray)
+       
+    },
+      submitUpload() {
+        this.$refs.upload.submit();
+      },
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+      handlePreview(file) {
+        console.log(file);
+      }
+    }
+  }
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/page/content/components/uploadVue/uploadAudio.vue

 <template>
+<div>
+<!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
+  <!-- :show-file-list="false" -->
+  <!-- :file-list="fileList" -->
+  <!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
   <el-upload
-  class="upload-demo"
-  ref="upload"
-  action="http://192.168.110.67/mall/file/audio/upload"
-  :on-preview="handlePreview"
-  :on-remove="handleRemove"
-  :file-list="fileList"
-  :on-success="handleAvatarSuccess"
-  :auto-upload="false">
-  <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-  <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
-  <div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div>
-</el-upload>
+    ref="upload"
+    :multiple="true"
+    :http-request="uploadFile"
+    :file-list="fileList"
+    action
+    :auto-upload="false"
+    :before-upload="beforeAvatarUpload"
+  >
+    <i class="el-icon-plus fileUpload"></i>
+
+  </el-upload>
+   <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+</div>
+
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        fileList: []
-      };
+export default {
+  data() {
+    return {
+      filedata:[],
+      fileArr: [],
+      fileList:[],
+    //   fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
+    };
+  },
+  methods: {
+    submitUpload() {  // 导入
+        let tempData =  this.filedata
+        this.filedata = new FormData()  //  用FormData存放上传文件
+        this.$refs.upload.submit()  // 会循环调用uploadFile方法，多个文件调用多次
+
+         let _this = this;
+      _this
+        .$https(
+          {
+            method: "post",
+            url: "file/audio/upload",
+            authType: this.backToken
+          },
+          this.filedata
+        )
+        .then(res => {
+          let resData = res.data;
+          console.log(res)
+
+          if (resData.resultCode == "200") {
+            // alert("上传成功");
+            console.log(resData.data.fileList)
+            const data = resData.data.fileList
+            console.log(data)
+            let newArray = data.map((item) => {
+                return item.id;
+            })
+            this.$emit('audioList', newArray)
+
+          } else {
+            _this.$message.error(resData.msg || resData.message);
+          }
+        })
+        .catch(err => {
+          console.log(err);
+          _this.$message.error(err.msg || err.message);
+        });
+
+
     },
-    methods: {
-    handleAvatarSuccess(res, file) {
-        console.log(res)
-        console.log(res.url)
-        this.$emit('audioList', res.urlList)
-       
+    uploadFile(file) {
+         this.filedata.append('file', file.file)
     },
-      submitUpload() {
-        this.$refs.upload.submit();
-      },
-      handleRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      handlePreview(file) {
-        console.log(file);
+    beforeAvatarUpload(file) {
+      const isLt5M = file.size / 1024 / 1024 < 5;
+      if (!isLt5M) {
+        this.$message.error("上传文件大小不能超过 5MB!");
       }
+      return isLt5M;
     }
   }
+};
 </script>
 
 <style>
-
-</style>
\ No newline at end of file
+.fileUpload {
+  width: 148px;
+  height: 148px;
+  line-height: 148px;
+  margin: 0 auto;
+  border: 1px dashed #c0ccda;
+  font-size: 24px;
+  font: #ccc;
+}
+</style>

src/page/content/components/uploadVue/uploadDatum--.vue

+<template>
+  <el-upload
+  class="upload-demo"
+  ref="upload"
+  action="http://192.168.110.67/mall/file/datum/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :file-list="fileList"
+  :on-success="handleAvatarSuccess"
+  :auto-upload="false">
+  <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+  <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+  <div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div>
+</el-upload>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        fileList: []
+      };
+    },
+    methods: {
+    handleAvatarSuccess(res, file) {
+        console.log(res)
+        // console.log(res.url)
+         const data = res.data.fileList
+          let newArray = data.map((item) => {
+              return item.id;
+          })
+        this.$emit('datumList', newArray)
+       
+    },
+      submitUpload() {
+        this.$refs.upload.submit();
+      },
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+      handlePreview(file) {
+        console.log(file);
+      }
+    }
+  }
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/page/content/components/uploadVue/uploadDatum.vue

 <template>
+<div>
+<!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
+  <!-- :show-file-list="false" -->
+  <!-- :file-list="fileList" -->
+  <!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
   <el-upload
-  class="upload-demo"
-  ref="upload"
-  action="http://192.168.110.67/mall/file/datum/upload"
-  :on-preview="handlePreview"
-  :on-remove="handleRemove"
-  :file-list="fileList"
-  :on-success="handleAvatarSuccess"
-  :auto-upload="false">
-  <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-  <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
-  <div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div>
-</el-upload>
+    ref="upload"
+    :multiple="true"
+    :http-request="uploadFile"
+    :file-list="fileList"
+    action
+    :auto-upload="false"
+    :before-upload="beforeAvatarUpload"
+  >
+    <i class="el-icon-plus fileUpload"></i>
+
+  </el-upload>
+   <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+</div>
+
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        fileList: []
-      };
+export default {
+  data() {
+    return {
+      filedata:[],
+      fileArr: [],
+      fileList:[],
+    //   fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
+    };
+  },
+  methods: {
+    submitUpload() {  // 导入
+        let tempData =  this.filedata
+        this.filedata = new FormData()  //  用FormData存放上传文件
+        this.$refs.upload.submit()  // 会循环调用uploadFile方法，多个文件调用多次
+
+         let _this = this;
+      _this
+        .$https(
+          {
+            method: "post",
+            url: "file/datum/upload",
+            authType: this.backToken
+          },
+          this.filedata
+        )
+        .then(res => {
+          let resData = res.data;
+          console.log(res)
+
+          if (resData.resultCode == "200") {
+            // alert("上传成功");
+            console.log(resData.data.fileList)
+            const data = resData.data.fileList
+            console.log(data)
+            let newArray = data.map((item) => {
+                return item.id;
+            })
+            this.$emit('datumList', newArray)
+
+          } else {
+            _this.$message.error(resData.msg || resData.message);
+          }
+        })
+        .catch(err => {
+          console.log(err);
+          _this.$message.error(err.msg || err.message);
+        });
+
+
     },
-    methods: {
-    handleAvatarSuccess(res, file) {
-        console.log(res)
-        console.log(res.url)
-        this.$emit('datumList', res.urlList)
-       
+    uploadFile(file) {
+         this.filedata.append('file', file.file)
     },
-      submitUpload() {
-        this.$refs.upload.submit();
-      },
-      handleRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      handlePreview(file) {
-        console.log(file);
+    beforeAvatarUpload(file) {
+      const isLt5M = file.size / 1024 / 1024 < 5;
+      if (!isLt5M) {
+        this.$message.error("上传文件大小不能超过 5MB!");
       }
+      return isLt5M;
     }
   }
+};
 </script>
 
 <style>
-
-</style>
\ No newline at end of file
+.fileUpload {
+  width: 148px;
+  height: 148px;
+  line-height: 148px;
+  margin: 0 auto;
+  border: 1px dashed #c0ccda;
+  font-size: 24px;
+  font: #ccc;
+}
+</style>

src/page/content/components/uploadVue/uploadFile--.vue

+<template>
+  <el-upload
+  class="upload-demo"
+  ref="upload"
+  action="http://192.168.110.67/mall/file/video/content/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :file-list="fileList"
+  :on-success="handleAvatarSuccess"
+  :auto-upload="false">
+  <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+  <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+  <div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div>
+</el-upload>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        fileList: []
+      };
+    },
+    methods: {
+    handleAvatarSuccess(res, file) {
+      const data = res.data.fileList
+      let newArray = data.map((item) => {
+          return item.id;
+      })
+      this.$emit('videoList', newArray)
+      // console.log(newArray,'----idArray')
+    },
+      submitUpload() {
+        this.$refs.upload.submit();
+      },
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+      handlePreview(file) {
+        console.log(file);
+      }
+    }
+  }
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/page/content/components/uploadVue/uploadFile.vue

 <template>
+<div>
+<!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
+  <!-- :show-file-list="false" -->
+  <!-- :file-list="fileList" -->
+  <!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
   <el-upload
-  class="upload-demo"
-  ref="upload"
-  action="http://192.168.110.67/mall/file/video/content/upload"
-  :on-preview="handlePreview"
-  :on-remove="handleRemove"
-  :file-list="fileList"
-  :on-success="handleAvatarSuccess"
-  :auto-upload="false">
-  <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-  <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
-  <div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div>
-</el-upload>
+    ref="upload"
+    :multiple="true"
+    :http-request="uploadFile"
+    :file-list="fileList"
+    action
+    :auto-upload="false"
+    :before-upload="beforeAvatarUpload"
+  >
+    <i class="el-icon-plus fileUpload"></i>
+
+  </el-upload>
+   <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+</div>
+
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        fileList: []
-      };
+export default {
+  data() {
+    return {
+      filedata:[],
+      fileArr: [],
+      fileList:[],
+    //   fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
+    };
+  },
+  methods: {
+    submitUpload() {  // 导入
+        let tempData =  this.filedata
+        this.filedata = new FormData()  //  用FormData存放上传文件
+        this.$refs.upload.submit()  // 会循环调用uploadFile方法，多个文件调用多次
+
+         let _this = this;
+      _this
+        .$https(
+          {
+            method: "post",
+            url: "file/video/content/upload",
+            authType: this.backToken
+          },
+          this.filedata
+        )
+        .then(res => {
+          let resData = res.data;
+          console.log(res)
+
+          if (resData.resultCode == "200") {
+            // alert("上传成功");
+            console.log(resData.data.fileList)
+            const data = resData.data.fileList
+            console.log(data)
+            let newArray = data.map((item) => {
+                return item.id;
+            })
+            this.$emit('videoList', newArray)
+
+          } else {
+            _this.$message.error(resData.msg || resData.message);
+          }
+        })
+        .catch(err => {
+          console.log(err);
+          _this.$message.error(err.msg || err.message);
+        });
+
+
     },
-    methods: {
-    handleAvatarSuccess(res, file) {
-      const data = res.data.fileList
-      let newArray = data.map((item) => {
-          return item.id;
-      })
-      this.$emit('videoList', newArray)
-      // console.log(newArray,'----idArray')
+    uploadFile(file) {
+         this.filedata.append('file', file.file)
     },
-      submitUpload() {
-        this.$refs.upload.submit();
-      },
-      handleRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      handlePreview(file) {
-        console.log(file);
+    beforeAvatarUpload(file) {
+      const isLt5M = file.size / 1024 / 1024 < 5;
+      if (!isLt5M) {
+        this.$message.error("上传文件大小不能超过 5MB!");
       }
+      return isLt5M;
+    },
+    handleRequest(file) {
+      //   let formData = new FormData();
+      //   this.fileArr.push(file.file)
+      //   console.log(this.fileArr,'文件数组')
+
+      //   formData.append("file", this.fileArr);
+      let formData = new FormData();
+      if (Array.isArray(file)) {
+        file.forEach(item => {
+          formData.append("file", item.file);
+        });
+      } else {
+        formData.append("file", file.file);
+      }
+
+      let _this = this;
+      _this
+        .$https(
+          {
+            method: "post",
+            url: "file/video/content/upload",
+            authType: this.backToken
+          },
+          formData
+        )
+        .then(res => {
+          let resData = res.data;
+
+          if (resData.resultCode == 200) {
+            alert("上传成功");
+            //   _this.getOrgTree();
+          } else {
+            _this.$message.error(resData.msg || resData.message);
+          }
+        })
+        .catch(err => {
+          console.log(err);
+          _this.$message.error(err.msg || err.message);
+        });
     }
   }
+};
 </script>
 
 <style>
-
-</style>
\ No newline at end of file
+.fileUpload {
+  width: 148px;
+  height: 148px;
+  line-height: 148px;
+  margin: 0 auto;
+  border: 1px dashed #c0ccda;
+  font-size: 24px;
+  font: #ccc;
+}
+</style>

src/page/content/components/uploadVue/uploadImg.vue

@@ -32,7 +32,7 @@ export default {
   methods: {
     // 图片上传成功的返回值
     handleAvatarSuccess(res, file) {
-  
+
         console.log(res)
         console.log(res.data.url)
         this.$emit('imgUrl', res.data.url)
@@ -51,4 +51,4 @@ export default {
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>

src/page/content/components/uploadVue/uploadQrcode.vue

@@ -33,7 +33,8 @@ export default {
     // 图片上传成功的返回值
     handleAvatarSuccess(res, file) {
         console.log(res)
-        console.log(res.url)
+        // console.log(res.url)
+        console.log(res.data.url)
         this.$emit('qrcodeUrl', res.data.url)
         // this.imageUrl = URL.createObjectURL(file.raw);
     },

src/page/content/display/classify/index.vue

@@ -13,6 +13,7 @@
         </el-form-item>
         <el-form-item label="版权方有效期">
           <el-date-picker
+            value-format="yyyy-MM-dd"
             v-model="value1"
             type="daterange"
             range-separator="至"
@@ -29,7 +30,7 @@
       </el-form>
       <div class="page-tip">
         <span class="page-tip-title">页面说明:</span>
-        <span class="page-tips">可通过创建时间、展板分类名称模糊搜索快速筛选展板分类信息，可对展板分类信息进行修改、删除。可新建展板分类。</span>
+        <span class="page-tips">可通过创建时间、展板分类名称模糊搜索快速筛选展板分类信息，可对展板分类信息进行修改、删除。可新增视频分类。</span>
       </div>
     </div>
     <div class="table-content">
@@ -45,27 +46,24 @@
           @selection-change="handleSelectionChange"
         >
         <el-table-column type="index" width="120" label="序号"></el-table-column>
-            <el-table-column label="展板分类" prop="name"></el-table-column>
-            <el-table-column label="版权方" prop="copyrightOwnerName"></el-table-column>
+            <el-table-column label="展板分类名称" prop="name"></el-table-column>
+            <el-table-column label="版权方" prop="copyrightOwnerNames"></el-table-column>
             <el-table-column label="创建时间" prop="createTime"></el-table-column>
             <el-table-column label="备注" prop="remarks"></el-table-column>
             <el-table-column label="操作" header-align="center" align="center">
               <template slot-scope="scope" width="220">
-                <el-button-group>
-                  <el-button
-                    title="删除"
-                    type="text"
-                    size="mini"
-                    @click="handleDelete(scope.row)"
-                  >删除&nbsp;&nbsp;</el-button>
-                  <el-button
-                    title="编辑"
-                    size="mini"
-                    type="text"
-                    @click="openEdit(scope.row)"
-                  >编辑&nbsp;&nbsp;</el-button>
-                  <!-- <el-button title="编辑" size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button> -->
-                </el-button-group>
+                <div class="table-btn-group">
+                <el-tooltip content="修改" placement="top">
+                  <el-button circle @click="openEdit(scope.row)">
+                    <i class="icon-table icon-edit"></i>
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip content="删除" placement="top">
+                  <el-button circle @click="handleDelete(scope.row)">
+                    <i class="icon-table icon-del"></i>
+                  </el-button>
+                </el-tooltip>
+              </div>
               </template>
             </el-table-column>
         </el-table>
@@ -273,7 +271,9 @@ export default {
       let searchObj = {
         _index: 1,
         _size: _this.page.pageSize,
-        nameOrCode: _this.form.nameOrCode
+        nameOrCode: _this.form.nameOrCode,
+        startDate:this.value1?this.value1[0]:"",
+        endDate:this.value1?this.value1[1]:"",
       };
       this.getTableData(searchObj);
     },

src/page/content/display/content/add.vue

@@ -74,7 +74,7 @@
               <el-form-item label="请选择视频版权方" class="w50">
                 <el-select
                   placeholder="请选择视频版权方"
-                  @focus="getAssetCopyrightData"
+                  @focus="getVideoContentCopyrightData"
                   v-model="ruleForm.videoContentCopyrightOwnerId"
                 >
                   <el-option
@@ -105,7 +105,7 @@
                   placeholder="请选择视频"
                   @focus="getVideoData"
                   v-model="ruleForm.videoContentId"
-                >
+                  >
                   <el-option
                     v-for="item in videoContentId"
                     :label="item.name"
@@ -114,12 +114,11 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item class="w50" prop="audioUrlList"></el-form-item>
+              <el-form-item class="w50" prop="audioIdList"></el-form-item>
               <el-form-item label="导览音频" class="w50">
-                <!-- <upload-img @imgUrl="imgUrl"></upload-img> -->
                 <upload-audio @audioList="audioList"></upload-audio>
               </el-form-item>
-              <el-form-item label="参考资料" class prop="materialUrlList">
+              <el-form-item label="参考资料" class prop="datumIdList">
                   <upload-datum @datumList="datumList"></upload-datum>
               </el-form-item>
             </el-form>
@@ -163,7 +162,6 @@ export default {
       boardCopyrightOwnerId:[],
       exhibitionBoardCatId:[],
       videoContentId:[],
-      type: this.$route.query.type,
       dialogVisible: false,
       formLabelWidth: "100px",
       form: {
@@ -176,7 +174,8 @@ export default {
         boardCopyrightOwnerId:"",
         videoContentCopyrightOwnerId: "",
         videoContentCatId: "",
-        videoUrlList: []
+        audioIdList: [],
+        datumIdList: []
       },
       videoContentCat: [
         {
@@ -225,12 +224,12 @@ export default {
     this.init()
   },
   methods: {
-      audioList(list){
-          this.ruleForm.audioUrlList = list;
-      },
-      datumList(list){
-          this.ruleForm.materialUrlList = list;
-      },
+    audioList(list){
+      this.ruleForm.audioIdList = list;
+    },
+    datumList(list){
+      this.ruleForm.datumIdList = list;
+    },
     // 视频版权方名称id
     videoCopyright(idlist) {
       this.ruleForm.videoContentCopyrightOwnerId = idlist;
@@ -244,11 +243,7 @@ export default {
     qrcodeUrl(url){
       this.ruleForm.qrcodeUrl = url
     },
-    // 视频列表地址
-    videoList(list) {
-      this.ruleForm.videoUrlList = list;
-    },
-     getVideoContentCat(data) {
+    getVideoContentCat(data) {
       console.log(data);
       console.log(this.ruleForm.videoContentCatId);
     },
@@ -256,7 +251,7 @@ export default {
       if (this.$route.query.type === "Update") {
         this.getInfo(this.$route.query.id);
         this.getVideoContentCatData();
-        this.getAssetCopyrightData();
+        this.getVideoContentCopyrightData();
         this.getExhibitionBoardCatId();
         this.getBoardCopyrightOwnerId();
         this.getVideoData();
@@ -272,8 +267,7 @@ export default {
           authType: this.backToken
         }
         // param
-      )
-        .then(res => {
+      ).then(res => {
           let data = res.data.data;
           // this.ruleForm = data;
           console.log(this.ruleForm)
@@ -284,24 +278,17 @@ export default {
             boardCopyrightOwnerId:data.boardCopyrightOwnerId,
             cover:data.cover,
             exhibitionBoardCatId:data.exhibitionBoardCatId,
-            guideAudioUrl:data.guideAudioUrl,
             id:data.id,
             name:data.name,
             qrcodeUrl:data.qrcodeUrl,
-            refMaterialUrl:data.refMaterialUrl,
             remarks:data.remarks,
-            audioUrlList:data.audioUrlList,
-            materialUrlList:data.materialUrlList
-            // videoUrlList:data.videoUrlList
-            // 字段对不上
+            audioIdList:data.audioIdList,
+            datumIdList:data.datumIdList
           }
-
-        })
-        .catch(function(err) {
+      }).catch(function(err) {
           console.log(err);
-        });
+      });
     },
-
     // 新建视频分类
     addVideoClass() {
       this.dialogVisible = true;
@@ -309,8 +296,8 @@ export default {
     // 弹窗保存
     save(formName) {
       this.$refs[formName].validate(valid => {
-        this.ruleForm.expireDateEnd = this.value1[1];
         this.ruleForm.expireDateStart = this.value1[0];
+        this.ruleForm.expireDateEnd = this.value1[1];
         if (valid) {
           this.$https(
             {
@@ -322,18 +309,16 @@ export default {
               authType: this.backToken
             },
             this.classForm
-          )
-            .then(res => {
+          ).then(res => {
               this.$message({ type: "success", message: "新增分类成功!" });
               this.dialogVisible = false;
-            })
-            .catch(function(err) {
+          }).catch(function(err) {
               this.$message({
                 type: "fail",
                 message: "新增失败!" + err.response.data.msg
               });
               console.log(err);
-            });
+          });
         } else {
           console.log("error submit!!");
           return false;
@@ -343,24 +328,21 @@ export default {
     // 新增
     submitForm(formName) {
       this.$refs[formName].validate(valid => {
-          console.log(this.ruleForm)
         if (valid) {
           this.$https(
             {
-              url: "/exhibitionBoard/save",
+              url: "exhibitionBoard/save",
               method: "post",
               authType: this.backToken
             },
             // this.ruleForm
             this.$qs.stringify(this.ruleForm)
-          )
-            .then(res => {
+          ).then(res => {
               this.$message({ type: "success", message: "新增成功!" });
               history.go(-1);
-            })
-            .catch(function(err) {
+          }).catch(function(err) {
               console.log(err);
-            });
+          });
         } else {
           console.log("error submit!!");
           return false;
@@ -378,15 +360,12 @@ export default {
               authType: this.backToken
             },
             this.$qs.stringify(this.ruleForm)
-            // this.ruleForm
-          )
-            .then(res => {
+          ).then(res => {
               this.$message({ type: "success", message: "修改成功!" });
               history.go(-1);
-            })
-            .catch(function(err) {
+          }).catch(function(err) {
               console.log(err);
-            });
+          });
         } else {
           console.log("error submit!!");
           return false;
@@ -398,7 +377,7 @@ export default {
       history.go(-1);
     },
     // 获取视频版权方
-    getAssetCopyrightData() {
+    getVideoContentCopyrightData() {
       let vm = this;
       vm.$https(
         {
@@ -409,8 +388,7 @@ export default {
         { copyrightOwnerType: "VIDEO_CONTENT" }
       )
         .then(res => {
-          let data = res.data.data;
-          this.copyrightOwner = data;
+          this.copyrightOwner = res.data.data;
         })
         .catch(function(err) {
           console.log(err);
@@ -419,22 +397,17 @@ export default {
     // 获取展板版权方
     getBoardCopyrightOwnerId() {
       let vm = this;
-      vm.$https(
-        {
+      vm.$https({
           url: "copyrightOwner/getList",
           method: "get",
           authType: this.backToken
         },
         { copyrightOwnerType: "EXHIBITION_BOARD" }
-      )
-        .then(res => {
-          let data = res.data.data;
-          this.boardCopyrightOwnerId = data;
-          console.log(this.boardCopyrightOwnerId)
-        })
-        .catch(function(err) {
+      ).then(res => {
+          this.boardCopyrightOwnerId = res.data.data;
+      }).catch(function(err) {
           console.log(err);
-        });
+      });
     },
     //获取展板分类
     getExhibitionBoardCatId(){
@@ -443,14 +416,11 @@ export default {
             url: "exhibitionBoardCat/getList",
             method: "get",
             authType: this.backToken
-        })
-            .then(res => {
-            let data = res.data.data;
-            this.exhibitionBoardCatId = data;
-            })
-            .catch(function(err) {
+        }).then(res => {
+            this.exhibitionBoardCatId = res.data.data;
+        }).catch(function(err) {
             console.log(err);
-            });
+        });
     },
     // 获取视频分类列表
     getVideoContentCatData() {
@@ -459,14 +429,11 @@ export default {
         url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
-      })
-        .then(res => {
-          let data = res.data.data;
-          this.videoContentCat = data;
-        })
-        .catch(function(err) {
+      }).then(res => {
+          this.videoContentCat = res.data.data;
+      }).catch(function(err) {
           console.log(err);
-        });
+      });
     },
      // 获取视频列表
     getVideoData() {
@@ -475,16 +442,12 @@ export default {
         url: "videoContent/getList",
         method: "get",
         authType: this.backToken
-      })
-        .then(res => {
-          let data = res.data.data;
-          this.videoContentId = data;
-        })
-        .catch(function(err) {
+      }).then(res => {
+          this.videoContentId = res.data.data;
+      }).catch(function(err) {
           console.log(err);
-        });
+      });
     },
-
     close() {
       history.go(-1);
     },

src/page/content/display/content/index.vue

@@ -13,6 +13,7 @@
         </el-form-item>
         <el-form-item label="版权方有效期">
           <el-date-picker
+            value-format="yyyy-MM-dd"
             v-model="value1"
             type="daterange"
             range-separator="至"
@@ -29,7 +30,7 @@
       </el-form>
       <div class="page-tip">
         <span class="page-tip-title">页面说明:</span>
-        <span class="page-tips">展示所有单位的互动频次统计图及统计表格</span>
+        <span class="page-tips">可通过展板名称、创建时间对展板信息进行快速检索。可对展板进行上架、下架、删除、修改及查看展板详情等操作。其中已上架的展板不能被删除。</span>
       </div>
     </div>
     <div class="table-content">
@@ -48,10 +49,10 @@
           <el-table-column type="index" width="120" label="序号"></el-table-column>
           <el-table-column show-overflow-tooltip label="展板名称" prop="name"></el-table-column>
           <el-table-column show-overflow-tooltip label="展板版权方" prop="boardCopyrightOwnerName"></el-table-column>
-          <el-table-column label="展板分类" prop="createTime"></el-table-column>
+          <el-table-column label="展板分类" prop="exhibitionBoardCatName"></el-table-column>
           <el-table-column show-overflow-tooltip label="展板简介" prop="remarks"></el-table-column>
-          <el-table-column label="关联视频名称" prop="createTime"></el-table-column>
-          <el-table-column label="视频版权方" prop="expireDateEnd"></el-table-column>
+          <el-table-column label="关联视频名称" prop="videoContentName"></el-table-column>
+          <el-table-column label="视频版权方" prop="videoContentCopyrightOwnerName"></el-table-column>
           <el-table-column label="创建时间" prop="createTime"></el-table-column>
            <el-table-column label="审核状态" prop="auditStatus">
               <template slot-scope="scope">
@@ -61,21 +62,41 @@
                 <span v-else-if="scope.row.auditStatus === 'APPROVED_FINAL'">通过</span>
               </template>
             </el-table-column>
-          <el-table-column label="是否上架" prop="createTime"></el-table-column>
-          <el-table-column label="操作" header-align="center" align="center">
-            <template slot-scope="scope" width="360">
-              <el-button-group>
-                <el-button
-                  title="编辑"
-                  size="mini"
-                  type="text"
-                  @click="openEdit(scope.row)"
-                >编辑&nbsp;&nbsp;</el-button>
-                <el-button type="text" size="mini" @click="displayInfo(scope.row)">展板详情</el-button>
-                <el-button type="text" size="mini" @click="handlePublish(scope.row ,'False')">下架&nbsp;&nbsp;</el-button>
-                <el-button type="text" size="mini" @click="handlePublish(scope.row,'True')">上架&nbsp;&nbsp;</el-button>
-                <el-button type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button>
-              </el-button-group>
+          <el-table-column label="是否上架" prop="published">
+            <template slot-scope="scope">
+            <span v-if="scope.row.published">是</span>
+            <span v-else>否</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="280" header-align="center" align="center">
+            <template slot-scope="scope" >
+               <div class="table-btn-group">
+                <el-tooltip content="修改" placement="top">
+                  <el-button circle @click="openEdit(scope.row)">
+                    <i class="icon-table icon-edit"></i>
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip content="上架" placement="top">
+                  <el-button circle @click="handlePublish(scope.row,'True')">
+                    <i class="icon-table icon-enable"></i>
+                  </el-button>
+                </el-tooltip>
+                 <el-tooltip content="下架" placement="top">
+                  <el-button circle @click="handlePublish(scope.row,'False')">
+                    <i class="icon-table icon-disable"></i>
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip content="删除" placement="top">
+                  <el-button circle @click="handleDelete(scope.row)">
+                    <i class="icon-table icon-del"></i>
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip content="详情" placement="top">
+                  <el-button circle @click="displayInfo(scope.row)">
+                    <i class="icon-table icon-detail"></i>
+                  </el-button>
+                </el-tooltip>
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -229,7 +250,9 @@ export default {
       let searchObj = {
         _index: 1,
         _size: _this.page.pageSize,
-        nameOrCode: _this.form.nameOrCode
+        nameOrCode: _this.form.nameOrCode,
+        startDate:this.value1?this.value1[0]:"",
+        endDate:this.value1?this.value1[1]:"",
       };
       this.getTableData(searchObj);
     },
@@ -370,7 +393,11 @@ export default {
             .then(
               res => {
                 // this.$message({ type: "success", message: "删除成功!" });
-                alert("已提交审核！")
+                // alert("已提交审核！")
+                this.msgInfo = {
+                  type: "wait",
+                  des: `申请已提交，待审核…`,
+                };
                 _this.Search();
               },
               error => {

src/page/content/display/copyright/index.vue

@@ -3,16 +3,17 @@
     <div class="search-container">
       <el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;">
         <el-form-item label="版权方名称">
-          <el-input
+         <el-input
             size="mini"
             placeholder="请输入版权方名称"
-            v-model="form.name"
+            v-model="form.nameOrCode"
             @keyup.enter.native="Search"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="版权方有效期">
           <el-date-picker
+            value-format="yyyy-MM-dd"
             v-model="value1"
             type="daterange"
             range-separator="至"
@@ -29,12 +30,12 @@
       </el-form>
       <div class="page-tip">
         <span class="page-tip-title">页面说明:</span>
-        <span class="page-tips">可通过创建时间、视频分类名称模糊搜索快速筛选视频分类信息，可对视频分类信息进行修改、删除。可新建视频分类。</span>
+        <span class="page-tips">可对展板版权方信息进行筛选、修改及删除。可新建版权方信息</span>
       </div>
     </div>
     <div class="table-content">
       <div class="btn-group">
-        <el-button type="primary" @click="addPermis()">新建视频分类</el-button>
+        <el-button type="primary" @click="addPermis()">新建版权方</el-button>
       </div>
       <div class="party-table">
         <el-table
@@ -45,27 +46,27 @@
           @selection-change="handleSelectionChange"
         >
         <el-table-column type="index" width="120" label="序号"></el-table-column>
-            <el-table-column label="视频分类" prop="name"></el-table-column>
-            <el-table-column label="版权方" prop="copyrightOwnerName"></el-table-column>
+            <el-table-column label="版权方名称" prop="name"></el-table-column>
+            <el-table-column label="展板分类" prop="videoContentCatNames"></el-table-column>
             <el-table-column label="创建时间" prop="createTime"></el-table-column>
+             <el-table-column label="版权方有效期" prop="expireDateEnd" width="200">
+            <template slot-scope="scope">{{scope.row.expireDateStart}} 至 {{scope.row.expireDateEnd}}</template>
+          </el-table-column>
             <el-table-column label="备注" prop="remarks"></el-table-column>
             <el-table-column label="操作" header-align="center" align="center">
               <template slot-scope="scope" width="220">
-                <el-button-group>
-                  <el-button
-                    title="删除"
-                    type="text"
-                    size="mini"
-                    @click="handleDelete(scope.row)"
-                  >删除&nbsp;&nbsp;</el-button>
-                  <el-button
-                    title="编辑"
-                    size="mini"
-                    type="text"
-                    @click="openEdit(scope.row)"
-                  >编辑&nbsp;&nbsp;</el-button>
-                  <!-- <el-button title="编辑" size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button> -->
-                </el-button-group>
+               <div class="table-btn-group">
+                <el-tooltip content="修改" placement="top">
+                  <el-button circle @click="openEdit(scope.row)">
+                    <i class="icon-table icon-edit"></i>
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip content="删除" placement="top">
+                  <el-button circle @click="handleDelete(scope.row)">
+                    <i class="icon-table icon-del"></i>
+                  </el-button>
+                </el-tooltip>
+              </div>
               </template>
             </el-table-column>
         </el-table>
@@ -289,7 +290,10 @@ export default {
       let searchObj = {
         _index: 1,
         _size: _this.page.pageSize,
-        name: _this.form.name
+        nameOrCode: _this.form.nameOrCode,
+        ownerType:'EXHIBITION_BOARD',
+        startDate:this.value1?this.value1[0]:"",
+        endDate:this.value1?this.value1[1]:"",
       };
       this.getTableData(searchObj);
     },
@@ -305,7 +309,7 @@ export default {
       let searchObj = {
         _index: _this.page.currentPage,
         _size: _this.page.pageSize,
-        ownerType:'EXHIBITION_BOARD'
+        
       };
       for (let key in _this.form) {
         if (_this.form[key]) {

src/page/content/learn/content/add.vue

 <template>
   <div class="info">
     <!-- <audio-play></audio-play> -->
-    <!-- <video-dialog></video-dialog> -->
+    <video-dialog ref="videoDialog"></video-dialog>
     <div class="info-header">新建学习内容</div>
     <div class="info-container">
       <div class="info-wrapper">
@@ -224,8 +224,12 @@ export default {
   },
   methods: {
     // 视频预览
-    videoPreview(){
-      alert("视频")
+    videoPreview(row){
+      // alert("视频")
+      // console.log(row,'222')
+      this.$refs.videoDialog.dialogVisible = true
+      this.$refs.videoDialog.videoImg = row.cover
+      this.$refs.videoDialog.videoSrc = row.videoList[0].fileUrl
     },
      // 展板预览
     displayPreview(row) {

src/page/content/learn/content/index.vue

@@ -2,17 +2,18 @@
   <div class="listPage H100">
     <div class="search-container">
       <el-form :inline="true" :model="form" class="search-form" onsubmit="return false;">
-        <el-form-item label="版权方名称">
+        <el-form-item >
           <el-input
             size="mini"
-            placeholder="请输入版权方名称"
+            placeholder="请输入学习内容名称"
             v-model="form.name"
             @keyup.enter.native="Search"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="版权方有效期">
+        <el-form-item >
           <el-date-picker
+          value-format="yyyy-MM-dd"
             v-model="value1"
             type="daterange"
             range-separator="至"
@@ -45,10 +46,24 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="index" width="120" label="序号"></el-table-column>
-          <el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
-          <el-table-column show-overflow-tooltip label="视频分类" prop="videoContentCatNames"></el-table-column>
+          <el-table-column show-overflow-tooltip label="学习内容名称" prop="name"></el-table-column>
           <el-table-column label="创建时间" prop="createTime"></el-table-column>
-          <el-table-column label="版权方有效期" prop="expireDateEnd"></el-table-column>
+          <el-table-column label="创建者" prop=""></el-table-column>
+          <el-table-column show-overflow-tooltip label="所含展板数量" prop="exhibitionBoardCount"></el-table-column>
+            <el-table-column label="审核状态" prop="auditStatus">
+              <template slot-scope="scope">
+                <span v-if="scope.row.auditStatus === 'TBC'">待初审</span>
+                <span v-else-if="scope.row.auditStatus === 'REFUSED'">已驳回</span>
+                <span v-else-if="scope.row.auditStatus === 'TBCA'">待复审</span>
+                <span v-else-if="scope.row.auditStatus === 'APPROVED_FINAL'">通过</span>
+              </template>
+            </el-table-column>
+          <el-table-column label="使用状态" prop="published">
+            <template slot-scope="scope">
+              <span v-if="scope.row.published">是</span>
+              <span v-else>否</span>
+            </template>
+        </el-table-column>
           <el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
           <el-table-column label="操作" width="240" header-align="center" align="center">
             <template slot-scope="scope"  >
@@ -200,7 +215,11 @@ export default {
             .then(
               res => {
                 // this.$message({ type: "success", message: "删除成功!" });
-                alert("已提交审核！")
+                // alert("已提交审核！")
+                this.msgInfo = {
+                  type: "wait",
+                  des: `申请已提交，待审核…`,
+                };
                 _this.Search();
               },
               error => {
@@ -256,7 +275,9 @@ export default {
       let searchObj = {
         _index: 1,
         _size: _this.page.pageSize,
-        name: _this.form.name
+        name: _this.form.name,
+         startDate:this.value1?this.value1[0]:"",
+        endDate:this.value1?this.value1[1]:"",
       };
       this.getTableData(searchObj);
     },

src/page/content/learn/project/index.vue

@@ -2,17 +2,18 @@
   <div class="listPage H100">
     <div class="search-container">
       <el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;">
-        <el-form-item label="版权方名称">
+        <el-form-item >
           <el-input
             size="mini"
-            placeholder="请输入版权方名称"
+            placeholder="请输入学习项目名称"
             v-model="form.name"
             @keyup.enter.native="Search"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="版权方有效期">
+        <el-form-item >
           <el-date-picker
+          value-format="yyyy-MM-dd"
             v-model="value1"
             type="daterange"
             range-separator="至"
@@ -45,9 +46,9 @@
           @selection-change="handleSelectionChange"
         >
         <el-table-column type="index" width="120" label="序号"></el-table-column>
-            <el-table-column label="视频分类" prop="name"></el-table-column>
-            <el-table-column label="版权方" prop="copyrightOwnerName"></el-table-column>
+            <el-table-column label="学习项目名称" prop="name"></el-table-column>
             <el-table-column label="创建时间" prop="createTime"></el-table-column>
+            <el-table-column label="相关学习内容" prop="learningContentNames"></el-table-column>
             <el-table-column label="备注" prop="remarks"></el-table-column>
             <el-table-column label="操作" header-align="center" align="center">
               <template slot-scope="scope" width="220">
@@ -290,7 +291,9 @@ export default {
       let searchObj = {
         _index: 1,
         _size: _this.page.pageSize,
-        name: _this.form.name
+        name: _this.form.name,
+         startDate:this.value1?this.value1[0]:"",
+        endDate:this.value1?this.value1[1]:"",
       };
       this.getTableData(searchObj);
     },

src/page/content/video/classify/index.vue

@@ -13,6 +13,7 @@
         </el-form-item>
         <el-form-item label="版权方有效期">
           <el-date-picker
+            value-format="yyyy-MM-dd"
             v-model="value1"
             type="daterange"
             range-separator="至"
@@ -292,7 +293,9 @@ export default {
       let searchObj = {
         _index: 1,
         _size: _this.page.pageSize,
-        name: _this.form.name
+        name: _this.form.name,
+        startDate:this.value1?this.value1[0]:"",
+        endDate:this.value1?this.value1[1]:"",
       };
       this.getTableData(searchObj);
     },
@@ -489,7 +492,11 @@ export default {
             })
             .then(
               res => {
-                this.$message({ type: "success", message: "删除成功!" });
+                // this.$message({ type: "success", message: "删除成功!" });
+                this.msgInfo = {
+                  type: "wait",
+                  des: `申请已提交，待审核…`,
+                };
                 _this.Search();
               },
               error => {

src/page/content/video/content/add.vue

@@ -27,9 +27,9 @@
           <el-form-item class="selectH100" label="请选择预设视频分类">
             <el-select
               placeholder="请选择预设视频分类"
-              @focus="getAssetTypeData"
+              @focus="getVideoContentCatData"
               multiple
-              v-model="ruleForm.assetTypeIdList"
+              v-model="ruleForm.videoContentCatIdList"
               @change="getSelectDep"
             >
               <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
@@ -44,7 +44,7 @@
             <el-form-item label="请选择视频版权方">
             <el-select
               placeholder="请选择视频版权方"
-              @focus="getAssetCopyrightData"
+              @focus="getVideoContentCopyrightData"
               v-model="ruleForm.videoContentCopyrightOwnerId"
             >
               <el-option
@@ -62,9 +62,9 @@
            <el-form-item label="请选择预设视频分类">
             <el-select
               placeholder="请选择预设视频分类"
-              @focus="getAssetTypeData"
-              v-model="ruleForm.assetTypeId"
-              @change="getAssetType"
+              @focus="getVideoContentCatData"
+              v-model="ruleForm.videoContentCatId"
+              @change="getVideoContentCat"
             >
               <el-option
                 v-for="item in videoContentCat"
@@ -143,7 +143,7 @@ import uploadDatum from '@/page/content/components/uploadVue/uploadDatum'
 import mulDisplay from '@/page/content/components/mulClassify/mulDisplay'
 import addCopyright from '@/page/content/components/dialog/addCopyright'
 export default {
-     components:{
+  components:{
     uploadImg,
     uploadFile,
     uploadDatum,
@@ -164,9 +164,9 @@ export default {
       ruleForm: {
         name: "",
         videoContentCopyrightOwnerId:"",
-        assetTypeId: "",
+        videoContentCatId: "",
         thumbnail:"",
-        videoUrlList:[]
+        videoFileIdList:[]
       },
       videoContentCat: [
         {
@@ -236,18 +236,18 @@ export default {
     },
     // 视频列表地址
     videoList(list){
-      this.ruleForm.videoUrlList = list
+      this.ruleForm.videoFileIdList = list
     },
     init() {
       if (this.$route.query.type === "Update") {
         this.getInfo(this.$route.query.id);
-        this.getAssetTypeData()
-        this.getAssetCopyrightData()
+        this.getVideoContentCatData()
+        this.getVideoContentCopyrightData()
       }
     },
-    getAssetType(data){
+    getVideoContentCat(data){
       console.log(data)
-      console.log(this.ruleForm.assetTypeId)
+      console.log(this.ruleForm.videoContentCatId)
     },
     //  获取版权方详情
     getInfo(id) {
@@ -259,20 +259,18 @@ export default {
           authType: this.backToken
         }
         // param
-      )
-        .then(res => {
+      ).then(res => {
           let data = res.data.data;
           // this.ruleForm = data;
           this.ruleForm.id = data.id
           this.ruleForm.name = data.name
           this.ruleForm.videoContentCopyrightOwnerId = data.videoContentCopyrightOwnerId
-          this.ruleForm.assetTypeId = data.assetTypeId
+          this.ruleForm.videoContentCatId = data.videoContentCatId
           this.ruleForm.thumbnail = data.thumbnail
-          this.ruleForm.videoUrlList = data.videoUrlList
-        })
-        .catch(function(err) {
+          this.ruleForm.videoFileIdList = data.videoFileIdList
+      }).catch(function(err) {
           console.log(err);
-        });
+      });
     },
 
     // 新建视频分类
@@ -295,18 +293,15 @@ export default {
               authType: this.backToken
             },
             this.classForm
-          )
-            .then(res => {
+          ).then(res => {
               this.$message({ type: "success", message: "新增分类成功!" });
               this.dialogVisible = false;
-            })
-            .catch(function(err) {
+          }).catch(function(err) {
               this.$message({
                 type: "fail",
                 message: "新增失败!" + err.response.data.msg
               });
-              console.log(err);
-            });
+          });
         } else {
           console.log("error submit!!");
           return false;
@@ -324,28 +319,20 @@ export default {
     // 新增
     submitForm(formName) {
       this.$refs[formName].validate(valid => {
-        // this.ruleForm.videoContentCopyrightOwnerId = ["1373225989501456385"]
-        // this.ruleForm.assetTypeIdList = []
-      //   this.ruleForm.videoUrlList = [
-      //   "http://111.203.232.175:8085/group1/M00/00/39/wKhuVWBgIvaANgtZAAAAAAAAAAA947.mp4"
-      //  ]
         if (valid) {
           this.$https(
             {
-              url: "/videoContent/save",
+              url: "videoContent/save",
               method: "post",
               authType: this.backToken
             },
-            // this.ruleForm
             this.$qs.stringify(this.ruleForm)
-          )
-            .then(res => {
+          ).then(res => {
               this.$message({ type: "success", message: "新增成功!" });
               history.go(-1);
-            })
-            .catch(function(err) {
+          }).catch(function(err) {
               console.log(err);
-            });
+          });
         } else {
           console.log("error submit!!");
           return false;
@@ -355,7 +342,6 @@ export default {
     // 修改版权方
     updateForm(formName) {
       this.$refs[formName].validate(valid => {
-
         if (valid) {
           this.$https(
             {
@@ -364,15 +350,12 @@ export default {
               authType: this.backToken
             },
             this.$qs.stringify(this.ruleForm)
-            // this.ruleForm
-          )
-            .then(res => {
+          ).then(res => {
               this.$message({ type: "success", message: "修改成功!" });
               history.go(-1);
-            })
-            .catch(function(err) {
+          }).catch(function(err) {
               console.log(err);
-            });
+          });
         } else {
           console.log("error submit!!");
           return false;
@@ -383,8 +366,8 @@ export default {
       this.$refs[formName].resetFields();
       history.go(-1);
     },
-    getAssetCopyrightData(){
-       let vm = this;
+    getVideoContentCopyrightData() {
+      let vm = this;
       vm.$https({
         url: "copyrightOwner/getList",
         method: "get",
@@ -400,37 +383,30 @@ export default {
         });
     },
     // 获取视频分类列表
-    getAssetTypeData() {
+    getVideoContentCatData() {
       let vm = this;
       vm.$https({
         url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
-      })
-        .then(res => {
-          let data = res.data.data;
-          this.videoContentCat = data;
-        })
-        .catch(function(err) {
+      }).then(res => {
+          this.videoContentCat = res.data.data;
+      }).catch(function(err) {
           console.log(err);
-        });
+      });
     },
-    getSelectDep(assetTypeIdList) {
-      if (assetTypeIdList.length === this.videoContentCat.length) {
-        this.checkedThing = true;
-      } else {
-        this.checkedThing = false;
-      }
+    getSelectDep(videoContentCatIdList) {
+      this.checkedThing = videoContentCatIdList.length === this.videoContentCat.length;
     },
     selectAllThing() {
       // debugger
-      this.ruleForm.assetTypeIdList = [];
+      this.ruleForm.videoContentCatIdList = [];
       if (this.checkedThing) {
         this.videoContentCat.map(item => {
-          this.ruleForm.assetTypeIdList.push(item.id);
+          this.ruleForm.videoContentCatIdList.push(item.id);
         });
       } else {
-        this.ruleForm.assetTypeIdList = [];
+        this.ruleForm.videoContentCatIdList = [];
       }
     }
   }

src/page/content/video/content/index.vue

@@ -11,15 +11,7 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="版权方有效期">
-          <el-date-picker
-            v-model="value1"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
+
         <el-form-item>
           <div class="btn-group">
             <el-button size="mini" type="primary" class="btn_form_search" @click="Search">查询</el-button>
@@ -59,19 +51,33 @@
             </el-table-column>
           <el-table-column label="操作" header-align="center" align="center">
             <template slot-scope="scope" width="220">
-              <el-button-group>
-                <el-button
-                  type="text"
-                  size="mini"
-                  @click="handleDelete(scope.row)"
-                >删除&nbsp;&nbsp;</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="openEdit(scope.row)"
-                >编辑&nbsp;&nbsp;</el-button>
-                <el-button size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button>
-              </el-button-group>
+              <div class="table-btn-group">
+                <el-tooltip content="修改" placement="top">
+                  <el-button circle @click="openEdit(scope.row)">
+                    <i class="icon-table icon-edit"></i>
+                  </el-button>
+                </el-tooltip>
+                <!-- <el-tooltip content="启用" placement="top">
+                  <el-button circle @click="handlePublish(scope.row,'True')">
+                    <i class="icon-table icon-enable"></i>
+                  </el-button>
+                </el-tooltip>
+                 <el-tooltip content="禁用" placement="top">
+                  <el-button circle @click="handlePublish(scope.row,'False')">
+                    <i class="icon-table icon-disable"></i>
+                  </el-button>
+                </el-tooltip>-->
+                <el-tooltip content="删除" placement="top">
+                  <el-button circle @click="handleDelete(scope.row)">
+                    <i class="icon-table icon-del"></i>
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip content="详情" placement="top">
+                  <el-button circle @click="openDetails(scope.row)">
+                    <i class="icon-table icon-detail"></i>
+                  </el-button>
+                </el-tooltip>
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -401,7 +407,7 @@ export default {
     openEdit(row) {
       this.$router.push({
         path: "videoContentUpdate",
-        query: { type: "Update" ,id:row.id }
+        query: { type: "Update", id: row.id }
       });
       // alert('编辑')
       // $('.el-dialog__title').html('编辑');
@@ -460,7 +466,11 @@ export default {
             })
             .then(
               res => {
-                this.$message({ type: "success", message: "删除成功!" });
+                this.msgInfo = {
+                  type: "wait",
+                  des: `申请已提交，待审核…`,
+                };
+                // this.$message({ type: "success", message: "删除成功!" });
                 _this.Search();
               },
               error => {
@@ -511,7 +521,7 @@ export default {
             })
             .then(
               res => {
-                if (res.data.status == 201 || res.data.status == 200) {
+                if (res.data.status === 201 || res.data.status === 200) {
                   this.$message({
                     type: "success",
                     message: "删除成功!"

src/page/content/video/copyright/index.vue

@@ -13,6 +13,7 @@
         </el-form-item>
         <el-form-item label="版权方有效期">
           <el-date-picker
+            value-format="yyyy-MM-dd"
             v-model="value1"
             type="daterange"
             range-separator="至"
@@ -39,7 +40,8 @@
       <div class="party-table">
         <el-table
           border
-          style="width: 100%;height:100%" height="100%"
+          style="width: 100%;height:100%"
+          height="100%"
           ref="multipleTable"
           :data="tableData"
           @selection-change="handleSelectionChange"
@@ -48,51 +50,29 @@
           <el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
           <el-table-column show-overflow-tooltip label="视频分类" prop="videoContentCatNames"></el-table-column>
           <el-table-column label="创建时间" prop="createTime"></el-table-column>
-          <el-table-column label="版权方有效期" prop="expireDateEnd"></el-table-column>
+          <el-table-column label="版权方有效期" prop="expireDateEnd" width="200">
+            <template slot-scope="scope">{{scope.row.expireDateStart}} 至 {{scope.row.expireDateEnd}}</template>
+          </el-table-column>
           <el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
           <el-table-column label="操作" header-align="center" align="center">
             <template slot-scope="scope" width="220">
               <div class="table-btn-group">
-                        <el-tooltip content="修改" placement="top">
-                            <el-button circle  @click="openEdit(scope.row)">
-                                <i class="icon-table icon-edit"></i>
-                            </el-button>
-                        </el-tooltip>
-                        <el-tooltip content="删除" placement="top">
-                            <el-button circle  @click="handleDelete(scope.row)">
-                                <i class="icon-table icon-del"></i>
-                            </el-button>
-                        </el-tooltip>
-
-                         <!-- <el-tooltip content="禁用" placement="top">
-                            <el-button
-                             circle
-                             :disabled="scope.row.status == 2 || scope.row.statusName == '待审核' "
-                             @click="handleOperate(scope.row,'disable')">
-                                <i class="icon-table icon-disable"></i>
-                            </el-button>
-                        </el-tooltip>
-                       <el-tooltip content="激活" placement="top">
-                            <el-button
-                             circle
-                             :disabled="scope.row.status == 1"
-                             @click="handleOperate(scope.row,'enable')">
-                                <i class="icon-table icon-enable"></i>
-                            </el-button>
-                        </el-tooltip>
-                        <el-tooltip content="审核详情" placement="top">
-                            <el-button
-                             circle
-                             @click="handleOperate(scope.row,'examine')">
-                                <i class="icon-table icon-detail"></i>
-                            </el-button>
-                        </el-tooltip> -->
-                    </div>
+                <el-tooltip content="修改" placement="top">
+                  <el-button circle @click="openEdit(scope.row)">
+                    <i class="icon-table icon-edit"></i>
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip content="删除" placement="top">
+                  <el-button circle @click="handleDelete(scope.row)">
+                    <i class="icon-table icon-del"></i>
+                  </el-button>
+                </el-tooltip>
+              </div>
             </template>
           </el-table-column>
         </el-table>
       </div>
-       <div class="partyt-pagination">
+      <div class="partyt-pagination">
         <el-pagination
           small
           background
@@ -102,7 +82,7 @@
           layout="prev, pager, next, jumper"
           :total="page.total"
         ></el-pagination>
-        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -127,7 +107,7 @@ export default {
       formLabelWidth: "100px",
       form: {
         nameOrCode: "",
-        ownerType:'VIDEO_CONTENT'
+        ownerType: "VIDEO_CONTENT"
       },
       editform: {
         menuName: "",
@@ -231,10 +211,10 @@ export default {
       _this.getTableData(param);
     },
     // 重置
-    Reset(){
+    Reset() {
       // this.$refs["form"].resetFields();
-      this.form = { ownerType:'VIDEO_CONTENT'}
-      this.Search()
+      this.form = { ownerType: "VIDEO_CONTENT" };
+      this.Search();
     },
     Search() {
       let _this = this;
@@ -243,7 +223,9 @@ export default {
         _index: 1,
         _size: _this.page.pageSize,
         nameOrCode: _this.form.nameOrCode,
-        ownerType:'VIDEO_CONTENT'
+        ownerType: "VIDEO_CONTENT",
+        startDate: this.value1 ? this.value1[0] : "",
+        endDate: this.value1 ? this.value1[1] : ""
       };
       this.getTableData(searchObj);
     },
@@ -325,7 +307,7 @@ export default {
     openEdit(row) {
       this.$router.push({
         path: "videoCopyrightUpdate",
-        query: { type: "Update" ,id :row.id}
+        query: { type: "Update", id: row.id }
       });
       // alert('编辑')
       // $('.el-dialog__title').html('编辑');
@@ -346,17 +328,28 @@ export default {
         type: "warning"
       })
         .then(() => {
-          _this.$https({
-            method: 'delete',
-            url: 'copyrightOwner/delete/'+ row.id,
-            authType: this.backToken
-          }).then((res) => {
-              this.$message({type: 'success', message: '删除成功!'});
-              _this.Search();
-            }, (error) => {
-              this.$message({type: 'fail', message: "删除失败!" + error.response.data});
-            }
-          )
+          _this
+            .$https({
+              method: "delete",
+              url: "copyrightOwner/delete/" + row.id,
+              authType: this.backToken
+            })
+            .then(
+              res => {
+                // this.$message({ type: "success", message: "删除成功!" });
+                this.msgInfo = {
+                  type: "wait",
+                  des: `删除申请已提交，待审核…`,
+                };
+                _this.Search();
+              },
+              error => {
+                this.$message({
+                  type: "fail",
+                  message: "删除失败!" + error.response.data
+                });
+              }
+            );
         })
         .catch(() => {});
     },
@@ -424,6 +417,6 @@ export default {
 <style lang="less">
 // @import "../../../../style/common";
 // @import "../../style/list";
-@import '../../../../style/table.less';
-@import '../../../../style/pagination.less';
+@import "../../../../style/table.less";
+@import "../../../../style/pagination.less";
 </style>

src/page/statistics/components/areas.vue

@@ -22,7 +22,8 @@
           </ul>
         </div>
         <div id="area2"></div>
-        <div id="area3">></div>
+        <div id="area3"></div>
+        <div id="area4"></div>
       </div>
     </div>
   </div>
@@ -42,9 +43,6 @@ export default {
   },
   mounted() {
     this.getList();
-    this.$nextTick((v) => {
-      this.initScroll();
-    });
   },
   methods: {
     initScroll() {
@@ -53,8 +51,10 @@ export default {
       this.con1 = document.getElementById("area1");
       let con2 = document.getElementById("area2");
       let con3 = document.getElementById("area3");
+      let con4 = document.getElementById("area4");
       con2.innerHTML = this.con1.innerHTML;
       con3.innerHTML = this.con1.innerHTML;
+      con4.innerHTML = this.con1.innerHTML;
       this.timer = setInterval(_this.scrollUp, _this.speed);
     },
     scrollUp() {
@@ -65,6 +65,7 @@ export default {
       }
     },
     getList() {
+      let _this = this;
       let requestparams = {};
       requestparams._index = 1;
       requestparams._size = 10;
@@ -80,6 +81,9 @@ export default {
           if (res.status == 200) {
             if (res.data.resultCode == 200) {
               this.list = res.data.data.records;
+              this.$nextTick(()=>{
+                _this.initScroll();
+              })
             } else {
               this.list = [];
             }

src/page/statistics/overview.vue

@@ -36,7 +36,7 @@ export default {
 
         }
     },
-     components:{demand, interaction , areas, top10, mapDiv, borderNums},
+     components:{demand, interact , areas, top10, mapDiv, borderNums},
 }
 </script>
 <style lang="less" scoped>

src/page/system/changePwd.vue

@@ -46,13 +46,13 @@
   </div>
 </template>
 <script>
+import { loginOut } from "@/config/loginOut.js";
 export default {
   data() {
     var validatePass = (rule, value, callback) => {
       if (value === "") {
         callback(new Error("请输入密码"));
       } else {
-        this.$refs.ruleForm.validateField("password");
         callback();
       }
     };
@@ -95,7 +95,7 @@ export default {
     },
     handleSubmit() {
       let _this = this;
-      this.$refs.validate((valid) => {
+      this.$refs.form.validate((valid) => {
         if (valid) {
           let requestParams = {};
           requestParams.oldPassWord = _this.form.oldPassWord;
@@ -105,6 +105,7 @@ export default {
               {
                 method: "put",
                 url: "tUser/editPwd",
+                authType: this.backToken,
               },
               requestParams
             )
@@ -117,7 +118,7 @@ export default {
                     type: "success",
                     message: res.data.message,
                   });
-                  _this.redirectLogin()
+                  _this.redirectLogin();
                 } else {
                   _this.$message.error(res.data.message);
                 }
@@ -132,10 +133,10 @@ export default {
         }
       });
     },
-    redirectLogin(){
-        this.$router.push('./login')
-        
-    }
+    redirectLogin() {
+      loginOut();
+      this.$router.push("./login");
+    },
   },
 };
 </script>

src/style/global.less

-@party-red:#9B1E23;
-@page-bg-white:#F9F9F9;
-@party-white:#FFFFFF;
-@font-color:#333333;
-@party-pink:pink;
-@party-border-color:#EEEEEE;
-@party-black:#000000;
-@party-bg-gray:#F8F8F8;
-@party-btn-color:#AC9374;
-@party-table-header-color:#FDFBF8;
-@party-page-border-color:#DDDDDD;
-@party-check-bg-color:#F5F5F5;
-.f14{ font-size: 14px; }
-.f16{ font-size: 14px; }
-.f18{ font-size: 18px; }
-.f24{ font-size: 24px; }
-.f0{font-size: 0px;}
-.inline-block{
-    display: inline-block;
-}
-.height100{
-    height: 100%;
+@party-red: #9B1E23;
+@page-bg-white: #F9F9F9;
+@party-white: #FFFFFF;
+@font-color: #333333;
+@party-pink: pink;
+@party-border-color: #EEEEEE;
+@party-black: #000000;
+@party-bg-gray: #F8F8F8;
+@party-btn-color: #AC9374;
+@party-table-header-color: #FDFBF8;
+@party-page-border-color: #DDDDDD;
+@party-check-bg-color: #F5F5F5;
+
+.f14 {
+  font-size: 14px;
 }
-@media screen and (max-width:1600px){
-    .search-container{
-        .el-input{
-            width: 180px;
-        }
-        .btn-group{
-            .el-button{ 
-                width: 80px;
-            }
-        }
+
+.f16 {
+  font-size: 14px;
+}
+
+.f18 {
+  font-size: 18px;
+}
+
+.f24 {
+  font-size: 24px;
+}
+
+.f0 {
+  font-size: 0px;
+}
+
+.inline-block {
+  display: inline-block;
+}
+
+.height100 {
+  height: 100%;
+}
+
+@media screen and (max-width:1600px) {
+  .search-container {
+    .el-input {
+      width: 180px;
     }
-    
-    .page-tips{
-        width: 365px;
+
+    .btn-group {
+      .el-button {
+        width: 80px;
+      }
     }
+  }
+
+  .page-tips {
+    width: 365px;
+  }
 }
-@media (min-width:1601px) and (max-width:1800px){
-    .search-container{
-        .el-input{
-            width: 220px;
-        }
-        .btn-group{
-            .el-button{ 
-                width: 96px;
-            }
-        }
+
+@media (min-width:1601px) and (max-width:1800px) {
+  .search-container {
+    .el-input {
+      width: 220px;
     }
-    .page-tips{
-        width: 460px;
+
+    .btn-group {
+      .el-button {
+        width: 96px;
+      }
     }
+  }
+
+  .page-tips {
+    width: 460px;
+  }
 }
-@media (min-width:1801px){
-    .search-container{
-        .el-input{
-            width: 280px;
-        }
-        .btn-group{
-            .el-button{ 
-                width: 128px;
-            }
-        }
+
+@media (min-width:1801px) {
+  .search-container {
+    .el-input {
+      width: 280px;
     }
-    .page-tips{
-        width: 480px;
+
+    .btn-group {
+      .el-button {
+        width: 128px;
+      }
     }
+  }
+
+  .page-tips {
+    width: 480px;
+  }
 }
-.search-container{
-    background:@party-white;
-    box-shadow: 0 4px 8px 0 rgba(0,0,0,0.10);
-    border-radius: 8px;
-    margin-bottom: 20px;
-    padding: 20px 24px;
-    height: 80px;
-    display: flex;
-    justify-content: space-between;
-    .el-form{
-        margin-bottom: 0;
-        .el-input{
-            .el-input__inner{
-                border-radius: 22px;
-                background-color:@party-bg-gray;
-                border-color: @party-border-color;
-            }
-        }
-        .el-range-editor.el-input__inner{
-            width: 280px;
-            border-radius: 22px;
-            background-color: @party-bg-gray;
-            .el-range-separator{
-                width: 20px;
-                padding: 0 2px;
-            }
-            .el-range-input{
-                background-color: @party-bg-gray;
-            }
-        }
-        .el-input__icon{
-            width: 40px;
-            font-size: 20px;
-            color: @party-btn-color;
-        }
-        .btn-group{
-            padding-left: 15px;
-            .el-button{
-                height: 40px;
-            }
-        }
+
+.search-container {
+  background: @party-white;
+  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.10);
+  border-radius: 8px;
+  margin-bottom: 20px;
+  padding: 20px 24px;
+  height: 80px;
+  display: flex;
+  justify-content: space-between;
+
+  .el-form {
+    margin-bottom: 0;
+
+    .el-input {
+      .el-input__inner {
+        border-radius: 22px;
+        background-color: @party-bg-gray;
+        border-color: @party-border-color;
+      }
     }
-    .page-tip{
-        display: flex;
-        font-size: 14px;
-        color: @font-color;
-        .page-tip-title{
-            font-weight: bold;
-            padding-right: 10px;     
-        }
+
+    .el-range-editor.el-input__inner {
+      width: 280px;
+      border-radius: 22px;
+      background-color: @party-bg-gray;
+
+      .el-range-separator {
+        width: 20px;
+        padding: 0 2px;
+      }
+
+      .el-range-input {
+        background-color: @party-bg-gray;
+      }
     }
-}
-.table-content{
-    height: calc(100% - 100px);
-    background:@party-white;
-    box-shadow: 0 4px 8px 0 rgb(0 0 0 / 10%);
-    border-radius: 8px;
-    padding: 20px 40px 0 40px;
-    .btn-group{
-       text-align: right;
-       margin-bottom: 12px;
-       .el-button{
-           min-width: 128px;
-       }
-    }
-}
-.btn-group{
-    .el-button{ 
-        height: 36px;
-        padding: 0;
-        border-radius: 28px;
-        span {
-            font-size: 16px;
-        }
+
+    .el-input__icon {
+      width: 40px;
+      font-size: 20px;
+      color: @party-btn-color;
     }
-    .el-button--primary{
-        background-color: @party-btn-color;
-        border-color: @party-btn-color;  
-        color:@party-white ;
+
+    .btn-group {
+      padding-left: 15px;
+
+      .el-button {
+        height: 40px;
+      }
     }
-    .el-button--default{
-        background: rgba(172,147,116,0.10);
-        border: 1px solid @party-btn-color;
-        color:@party-btn-color;
+  }
+
+  .page-tip {
+    display: flex;
+    font-size: 14px;
+    color: @font-color;
+
+    .page-tip-title {
+      font-weight: bold;
+      padding-right: 10px;
     }
+  }
 }
-// 系统form 表单样式
-.party-form{
-    .el-input__icon{
-        width: 40px;
-        font-size: 20px;
-        color: @party-btn-color;
+
+.table-content {
+  height: calc(100% - 100px);
+  background: @party-white;
+  box-shadow: 0 4px 8px 0 rgba(0,0,0,.3);
+  border-radius: 8px;
+  padding: 20px 40px 0 40px;
+
+  .btn-group {
+    text-align: right;
+    margin-bottom: 12px;
+
+    .el-button {
+      min-width: 128px;
     }
-    .el-range-separator{
-        width: 20px;
-        padding: 0 2px;
+  }
+}
+
+.btn-group {
+  .el-button {
+    height: 36px;
+    padding: 0;
+    border-radius: 28px;
+
+    span {
+      font-size: 16px;
     }
-    .el-input{
-        width: 280px;
-        .el-input__inner{
-            border-radius: 22px;
-            background-color: @party-bg-gray;
-            border: 1px solid @party-border-color;
-        }
+  }
+
+  .el-button--primary {
+    background-color: @party-btn-color;
+    border-color: @party-btn-color;
+    color: @party-white ;
+  }
+
+  .el-button--default {
+    background: rgba(172, 147, 116, 0.10);
+    border: 1px solid @party-btn-color;
+    color: @party-btn-color;
+  }
+}
+
+// 系统form 表单样式
+.party-form {
+  .el-input__icon {
+    width: 40px;
+    font-size: 20px;
+    color: @party-btn-color;
+  }
+
+  .el-date-editor {
+    .el-range-separator {
+      width: 20px;
+      padding: 0 2px;
     }
-    .el-textarea .el-textarea__inner{
-        background-color: @party-bg-gray;
-        border-radius: 8px;
+  }
+  .el-input {
+    width: 280px;
+    .el-input__inner {
+      border-radius: 22px;
+      background-color: @party-bg-gray;
+      border: 1px solid @party-border-color;
     }
-    .el-range-editor.el-input__inner{
-        width: 280px;
-        border-radius: 22px;
+  }
+
+  .el-textarea .el-textarea__inner {
+    background-color: @party-bg-gray;
+    border-radius: 8px;
+  }
+
+  .el-range-editor.el-input__inner {
+    width: 280px;
+    border-radius: 22px;
+  }
+
+  .mt16 {
+    margin-top: 16px;
+  }
+
+  .el-radio-group {
+    .el-radio__inner {
+      width: 24px;
+      height: 24px;
+      border-color: @party-border-color;
     }
-    .mt16{
-        margin-top: 16px;
+
+    .el-radio__label {
+      font-size: 16px;
     }
-    .el-radio-group{
-        .el-radio__inner{
-            width: 24px;
-            height: 24px;
-            border-color: @party-border-color;
+
+    .el-radio.is-checked {
+      .el-radio__input.is-checked {
+        .el-radio__inner {
+          background-color: transparent;
+          border-color: @party-border-color;
+
+          &:after {
+            width: 10px;
+            height: 10px;
+            background-color: @party-btn-color;
+          }
         }
-        .el-radio__label{
-            font-size: 16px;
+      }
+
+      .el-radio__label {
+        color: @font-color;
+      }
+    }
+
+  }
+
+  .el-checkbox-group {
+    .el-checkbox {
+      margin-right: 25px;
+
+      .el-checkbox__inner {
+        width: 22px;
+        height: 22px;
+
+        &:hover {
+          border-color: @party-border-color;
         }
-        .el-radio.is-checked{
-            .el-radio__input.is-checked{
-                .el-radio__inner{
-                    background-color: transparent;
-                    border-color: @party-border-color;
-                    &:after{
-                        width: 10px;
-                        height: 10px;
-                        background-color: @party-btn-color;
-                    }
-                }
-            }
-            .el-radio__label{
-                color: @font-color;
-            }
+      }
+
+      .el-checkbox__label {
+        color: @font-color
+      }
+
+      &+.el-checkbox {
+        margin-left: 0;
+      }
+
+      &.is-checked {
+        .el-checkbox__inner {
+          border-color: @party-border-color;
+          background-color: @party-check-bg-color;
+
+          &:after {
+            border: 2px solid #AC9374;
+            border-left: 0;
+            border-top: 0;
+            height: 11px;
+            left: 7px;
+            width: 5px;
+          }
         }
-       
-    }
-    .el-checkbox-group{
-        .el-checkbox{
-            margin-right: 25px;
-            .el-checkbox__inner{
-                width: 22px;
-                height: 22px;
-                &:hover{
-                    border-color: @party-border-color;
-                }
-            }
-           
-            .el-checkbox__label{
-                color: @font-color
-            }
-           & +.el-checkbox{
-               margin-left: 0;
-           }
-            &.is-checked{
-                .el-checkbox__inner{       
-                    border-color: @party-border-color;
-                    background-color: @party-check-bg-color;
-                    &:after{
-                        border: 2px solid #AC9374;
-                        border-left:0;
-                        border-top: 0;
-                        height: 11px;
-                        left:7px;
-                        width: 5px;
-                    }
-                }
-                .el-checkbox__label{
-                    color: @font-color
-                }
-            }
+
+        .el-checkbox__label {
+          color: @font-color
         }
+      }
     }
+  }
 }
+
 // 适用于修改密码  app 界面定义样式
-.page-form-box{
-    background: @party-white;
-    box-shadow: 0 4px 8px 0 rgba(0,0,0,0.10);
-    border-radius: 8px;
-    height: 100%;
-    .page-form-box-header{
-        height: 64px;
-        line-height: 64px;
-        text-align: center;
-        border-bottom: 1px solid @party-border-color;
-        font-size: 20px;
-        color: @font-color;
-        text-align: center;
-        font-weight: bold;
-    }
-    .page-form-box-content{
-        height: calc(100% - 148px);
-        padding: 20px;
-    }
-    .page-form-box-footer{
-        height: 84px;
-        line-height: 84px;
-        text-align: center;
-        border-top: 1px solid @party-border-color;
-        .el-button{
-            width: 160px;
-            height: 40px;
-        }
+.page-form-box {
+  background: @party-white;
+  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.10);
+  border-radius: 8px;
+  height: 100%;
+
+  .page-form-box-header {
+    height: 64px;
+    line-height: 64px;
+    text-align: center;
+    border-bottom: 1px solid @party-border-color;
+    font-size: 20px;
+    color: @font-color;
+    text-align: center;
+    font-weight: bold;
+  }
+
+  .page-form-box-content {
+    height: calc(100% - 148px);
+    padding: 20px;
+  }
+
+  .page-form-box-footer {
+    height: 84px;
+    line-height: 84px;
+    text-align: center;
+    border-top: 1px solid @party-border-color;
+
+    .el-button {
+      width: 160px;
+      height: 40px;
     }
+  }
 
 }
 
-.imgSize{
-    width: 160px;
-    height: 100px;
+.imgSize {
+  width: 160px;
+  height: 100px;
 }
-.iconImg{
-    height: 32px;
-    width: 32px;
-    margin-right: 8px;
+
+.iconImg {
+  height: 32px;
+  width: 32px;
+  margin-right: 8px;
 }
-.w50{
-   width: 50%;
+
+.w50 {
+  width: 50%;
 }
-.w100{
-    width:100%;
+
+.w100 {
+  width: 100%;
 }
-.selectH100{
-    height:100px;
-    overflow: auto;
+
+.selectH100 {
+  height: 100px;
+  overflow: auto;
 }
+
 // 内容、审核详情页
 .info {
-    height: 100%;
+  height: 100%;
+  width: 100%;
+  overflow: hidden;
+
+  .info-header {
+    font-size: 20px;
+    padding: 20px;
+    height: 68px;
     width: 100%;
-    overflow: hidden;
-    .info-header {
-      font-size: 20px;
-      padding: 20px;
-      height: 68px;
-      width: 100%;
-      vertical-align: middle;
-      text-align: center;
-  
-      border-bottom: 2px solid #eee;
-    }
-    .info-wrapper {
-      height: 100%;
-      width: 640px;
-      margin: 0 auto;
-      background: #fff;
-      .pageTips{
-          height: 72px;
-          padding:16px;
-          background: #F7F5F2;
-          border-radius: 8px;
-          margin:10px 0;
-      }
-      .el-collapse-item__header.is-active {
-        border-bottom-color: #eeeeee;
-    }
-    }
-    .info-container {
-      width: 100%;
-      height: calc(100% - 156px);
-      overflow-y: auto;
-      overflow-x: hidden;
-    }
-    .info-footer {
-      height: 88px;
-      border-top: 2px solid #eee;
-      padding: 20px;
-      text-align: center;
-      .el-button{
-        width: 160px;
-        height: 40px;
+    vertical-align: middle;
+    text-align: center;
+
+    border-bottom: 2px solid #eee;
+  }
+
+  .info-wrapper {
+    height: 100%;
+    width: 640px;
+    margin: 0 auto;
+    background: #fff;
+
+    .pageTips {
+      height: 72px;
+      padding: 16px;
+      background: #F7F5F2;
+      border-radius: 8px;
+      margin: 10px 0;
     }
+
+    .el-collapse-item__header.is-active {
+      border-bottom-color: #eeeeee;
+    }
+  }
+
+  .info-container {
+    width: 100%;
+    height: calc(100% - 156px);
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+
+  .info-footer {
+    height: 88px;
+    border-top: 2px solid #eee;
+    padding: 20px;
+    text-align: center;
+
+    .el-button {
+      width: 160px;
+      height: 40px;
     }
   }
-// 适用于统计详情样式
-.overview-detail{
-    .ecahrts-panel-box{
-        height: calc(50% + 20px);
-    }
-    .rank-panel-box{
-        height: calc(50% - 40px);
-        margin-top: 20px;
-    }
-    .ecahrts-panel-box,
-    .rank-panel-box{
-        background:@party-white;
-        box-shadow: 0 4px 8px 0 rgba(221,221,221,0.40);
-        border-radius: 8px;
-     }
-     .panel-box-header{
-         height: 64px;
-         line-height: 64px;
-         border-bottom: 1px solid @party-border-color;
-         padding: 0 24px;
-         .title{
-            font-weight: bold;
-            font-size: 20px;
-         }
-         .tip{
-             float: right;
-             color: @font-color;
-             .tip-title{
-                font-weight: bold;
-                padding-right: 10px;
-             }
-         }
-         .el-range-editor.el-input__inner{
-            width: 280px;
-            border-radius: 22px;
-            background-color: @party-bg-gray;
-            margin-left: 40px;
-            padding-left:15px;
-            .el-range-input{
-                background-color: @party-bg-gray;
-            }
-            .el-range-separator{
-                width: 20px;
-                padding: 0 2px;
-            }
-            .el-icon-date{
-                color: @party-btn-color;
-                font-size: 18px;
-            }
-        }
-     }
-     .panel-box-content{
-         height: calc(100% - 64px);
-         overflow: hidden;
-     }
-     .rank-box{
-         width: 50%;
-         &.left{
-             padding-right: 10px;
-         }
-         &.right{
-             padding-left: 10px;
-         }
-     }
-}
-.party-icon-20{
-    display:inline-block;
-    width: 20px;
-    height: 20px;
-    background-repeat: no-repeat;
-    background-size: cover;
-}
-.party-icon-24{
-    display:inline-block;
-    width: 24px;
-    height: 24px;
-    background-repeat: no-repeat;
-    background-size: cover;
-}
-
-.icon-add{
-    background-image: url("~@/assets/icons/add.png");
-}
-.icon-import{
-    background-image: url("~@/assets/icons/import.png");
-}
-.icon-detail{
-    background-image: url("~@/assets/icons/detail.png");
-}
-.icon-edit{
-    background-image: url("~@/assets/icons/edit.png");
-}
-.icon-reset{
-    background-image: url("~@/assets/icons/reset.png");
-}
-.icon-enable{
-    background-image: url("~@/assets/icons/enable.png");
-}
-.icon-disable{
-    background-image: url("~@/assets/icons/disable.png");
-}
-.icon-del{
-    background-image: url("~@/assets/icons/del.png");
-}
-.icon-org{
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    background-repeat: no-repeat;
-    background-size: cover;
-    background-image: url("~@/assets/icons/org.png");
-    margin-right: 8px;
 }
-// 组织树结构样式
-.org-tree{
-      // expand 三角icon
-    .el-tree-node__expand-icon{
-        position: absolute;
-        right: 10px;
-        top: 14px;
-        color: #000000;
-        font-size: 16px;
-        &.is-leaf{
-            color: transparent;
-        }
+
+// 适用于统计详情样式
+.overview-detail {
+  .ecahrts-panel-box {
+    height: calc(50% + 20px);
+  }
+
+  .rank-panel-box {
+    height: calc(50% - 40px);
+    margin-top: 20px;
+  }
+
+  .ecahrts-panel-box,
+  .rank-panel-box {
+    background: @party-white;
+    box-shadow: 0 4px 8px 0 rgba(221, 221, 221, 0.40);
+    border-radius: 8px;
+  }
+
+  .panel-box-header {
+    height: 64px;
+    line-height: 64px;
+    border-bottom: 1px solid @party-border-color;
+    padding: 0 24px;
+
+    .title {
+      font-weight: bold;
+      font-size: 20px;
     }
-    .el-tree-node{
-        background-color: @party-white;
-        &.is-current{
-            >.el-tree-node__content{
-                .custom-tree-node{
-                    background-color: @party-border-color;
-                }
-            }
-               
-        }
+
+    .tip {
+      float: right;
+      color: @font-color;
+
+      .tip-title {
+        font-weight: bold;
+        padding-right: 10px;
+      }
     }
-    .el-tree-node__content{
-        height: auto;
-        position: relative;
-        background-color: transparent  !important;
-        &:hover{
-            background-color: transparent;
-        }
+
+    .el-range-editor.el-input__inner {
+      width: 280px;
+      border-radius: 22px;
+      background-color: @party-bg-gray;
+      margin-left: 40px;
+      padding-left: 15px;
+
+      .el-range-input {
+        background-color: @party-bg-gray;
+      }
+
+      .el-range-separator {
+        width: 20px;
+        padding: 0 2px;
+      }
+
+      .el-icon-date {
+        color: @party-btn-color;
+        font-size: 18px;
+      }
     }
-    div[class*="tree-node-level"]{
-        width: 100%;
-        color: @font-color;
-        border-radius: 5px;
+  }
+
+  .panel-box-content {
+    height: calc(100% - 64px);
+    overflow: hidden;
+  }
+
+  .rank-box {
+    width: 50%;
+
+    &.left {
+      padding-right: 10px;
     }
-    .tree-node-level1,
-    .tree-node-level2{
-        span{
-            font-size: 16px;
-        }
-      
+
+    &.right {
+      padding-left: 10px;
     }
-    .tree-node-level3{
-        span{
-          font-size: 14px;
-        }
+  }
+}
+
+.party-icon-20 {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+
+.party-icon-24 {
+  display: inline-block;
+  width: 24px;
+  height: 24px;
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+
+.icon-add {
+  background-image: url("~@/assets/icons/add.png");
+}
+
+.icon-import {
+  background-image: url("~@/assets/icons/import.png");
+}
+
+.icon-detail {
+  background-image: url("~@/assets/icons/detail.png");
+}
+
+.icon-edit {
+  background-image: url("~@/assets/icons/edit.png");
+}
+
+.icon-reset {
+  background-image: url("~@/assets/icons/reset.png");
+}
+
+.icon-enable {
+  background-image: url("~@/assets/icons/enable.png");
+}
+
+.icon-disable {
+  background-image: url("~@/assets/icons/disable.png");
+}
+
+.icon-del {
+  background-image: url("~@/assets/icons/del.png");
+}
+
+.icon-org {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-image: url("~@/assets/icons/org.png");
+  margin-right: 8px;
+}
+
+// 组织树结构样式
+.org-tree {
+
+  // expand 三角icon
+  .el-tree-node__expand-icon {
+    position: absolute;
+    right: 10px;
+    top: 14px;
+    color: #000000;
+    font-size: 16px;
+
+    &.is-leaf {
+      color: transparent;
     }
-    .tree-node-level1{
-        height: 56px;
-        line-height: 56px;
-        border-bottom: 1px solid @party-border-color;
-        padding-left: 5px;
+  }
+
+  .el-tree-node {
+    background-color: @party-white;
+
+    &.is-current {
+      >.el-tree-node__content {
+        .custom-tree-node {
+          background-color: @party-border-color;
+        }
+      }
+
     }
-    .tree-node-level2,
-    .tree-node-level3{
-        height: 40px;
-        line-height: 40px;
-        margin: 5px 0;
-        border-radius: 20px;
-        padding-left: 10px;
+  }
+
+  .el-tree-node__content {
+    height: auto;
+    position: relative;
+    background-color: transparent !important;
+
+    &:hover {
+      background-color: transparent;
     }
-    .tree-node-level2:hover{
-        background-color: @party-table-header-color;
+  }
+
+  div[class*="tree-node-level"] {
+    width: 100%;
+    color: @font-color;
+    border-radius: 5px;
+  }
+
+  .tree-node-level1,
+  .tree-node-level2 {
+    span {
+      font-size: 16px;
     }
-    .tree-node-level3:hover{
-        background-color: @party-border-color;
+
+  }
+
+  .tree-node-level3 {
+    span {
+      font-size: 14px;
     }
+  }
+
+  .tree-node-level1 {
+    height: 56px;
+    line-height: 56px;
+    border-bottom: 1px solid @party-border-color;
+    padding-left: 5px;
+  }
+
+  .tree-node-level2,
+  .tree-node-level3 {
+    height: 40px;
+    line-height: 40px;
+    margin: 5px 0;
+    border-radius: 20px;
+    padding-left: 10px;
+  }
+
+  .tree-node-level2:hover {
+    background-color: @party-table-header-color;
+  }
+
+  .tree-node-level3:hover {
+    background-color: @party-border-color;
+  }
 }

src/style/pagination.less

@@ -20,6 +20,9 @@
         }
         .el-pager{
             padding-left: 20px;
+            li:hover {
+                color: @party-btn-color;
+            }
             li.number{
                 width: 40px;
                 height: 40px;

src/style/table.less

@@ -26,6 +26,10 @@
     .el-button{
         border: none;
         padding: 0;
+        &.is-circle{
+            padding: 0;
+            background-color: transparent;
+        }
     }
 }
 .icon-table{