sunny 1 tahun lalu
induk
melakukan
5bf973db36

+ 3 - 17
src/api/rankingList.js

@@ -1,25 +1,11 @@
 import request from '@/utils/request'
 import request from '@/utils/request'
 
 
-export function complete(query) {
-  return request({
-    url: '/mall-order/complete',
-    method: 'post',
-    params:query
-  })
-}
+
 
 
 export function list(query) {
 export function list(query) {
   return request({
   return request({
-    url: '/mall-order/page',
-    method: 'post',
+    url: '/mall-integral/sys/top',
+    method: 'get',
     params:query
     params:query
   })
   })
 }
 }
-
-export function detail(query) {
-  return request({
-    url: '/mall-order/info',
-    method: 'post',
-    params:query
-  })
-}

+ 1 - 1
src/views/activityManage/activityList.vue

@@ -154,7 +154,7 @@ export default {
                 endTime: '',
                 endTime: '',
                 participants: [],
                 participants: [],
                 content: '',
                 content: '',
-                images: [],startTime
+                images: [],
             },
             },
             dialogFormVisible: false,
             dialogFormVisible: false,
             dialogStatus: '',
             dialogStatus: '',

+ 1 - 1
src/views/festivalManage/festivalList.vue

@@ -59,7 +59,7 @@
         :title="textMap[dialogStatus]"
         :title="textMap[dialogStatus]"
         :visible.sync="dialogFormVisible"
         :visible.sync="dialogFormVisible"
         width="40%"
         width="40%"
-      >startTime
+      >
         <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="50px" style='width: 700px; margin-left:50px;'>
         <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="50px" style='width: 700px; margin-left:50px;'>
          <el-form-item  label="节日" prop="title">
          <el-form-item  label="节日" prop="title">
               <el-input style="width: 350px" v-model="dataForm.title"></el-input>
               <el-input style="width: 350px" v-model="dataForm.title"></el-input>

+ 13 - 17
src/views/ranking/rankingList.vue

@@ -3,17 +3,13 @@
         <!-- 查询和其他操作 -->
         <!-- 查询和其他操作 -->
         <div class="filter-container">
         <div class="filter-container">
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="员工名称"
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="员工名称"
-                v-model="listQuery.purchaser"></el-input>
-            <!-- <el-input clearable class="filter-item" style="width: 200px;" placeholder="公司主体"
-                v-model="listQuery.orderSeq"></el-input>
-                <el-input clearable class="filter-item" style="width: 200px;" placeholder="部门"
-                v-model="listQuery.orderSeq"></el-input> -->
+                v-model="listQuery.userName"></el-input>
             <el-select v-model="listQuery.type" clearable placeholder="排行类型" style="top: -4px;width: 200px;">
             <el-select v-model="listQuery.type" clearable placeholder="排行类型" style="top: -4px;width: 200px;">
                 <el-option :key="item.type" v-for="item in orderTypeList" :label="item.name" :value="item.type">
                 <el-option :key="item.type" v-for="item in orderTypeList" :label="item.name" :value="item.type">
                 </el-option>
                 </el-option>
             </el-select>
             </el-select>
             <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
             <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
-            <el-button class="filter-item" type="primary" v-waves icon="el-icon-download" @click="handleDownLoad">导出</el-button>
+            <!-- <el-button class="filter-item" type="primary" v-waves icon="el-icon-download" @click="handleDownLoad">导出</el-button> -->
 
 
         </div>
         </div>
 
 
@@ -24,12 +20,12 @@
             </el-table-column>
             </el-table-column>
             <el-table-column align="center" min-width="60px" label="头像">
             <el-table-column align="center" min-width="60px" label="头像">
                 <template slot-scope="props">
                 <template slot-scope="props">
-                    <img style="width: 50px; height: 50px" :src="props.row.avatarUrl">
+                    <img style="width: 50px; height: 50px;border-radius: 50%;" :src="httpFile + props.row.headImage">
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="员工名称" prop="purchaser">
+            <el-table-column align="center" min-width="80px" label="员工名称" prop="userName">
             </el-table-column>
             </el-table-column>
-            <el-table-column align="center" min-width="150px" label="公司主体" prop="company">
+            <el-table-column align="center" min-width="160px" label="公司主体" prop="companyName">
             </el-table-column>
             </el-table-column>
             <el-table-column align="center" min-width="150px" label="部门名称" prop="deptName">
             <el-table-column align="center" min-width="150px" label="部门名称" prop="deptName">
             </el-table-column>
             </el-table-column>
@@ -73,6 +69,7 @@ export default {
     directives: { waves },
     directives: { waves },
     data() {
     data() {
         return {
         return {
+            httpFile:'http://dgt.dgtis.com/oneportal',
             orderTypeList: [
             orderTypeList: [
                 {
                 {
                     type: 0,
                     type: 0,
@@ -87,7 +84,7 @@ export default {
                 {
                 {
                     id:'1',
                     id:'1',
                     avatarUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
                     avatarUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
-                    purchaser:'张三',
+                    userName:'张三',
                     company:'神州通誉(洛阳)科技有限公司',
                     company:'神州通誉(洛阳)科技有限公司',
                     deptName:'软件工程院',
                     deptName:'软件工程院',
                     integral:'12000'
                     integral:'12000'
@@ -95,7 +92,7 @@ export default {
                 {
                 {
                     id:'2',
                     id:'2',
                     avatarUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
                     avatarUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
-                    purchaser:'张三',
+                    userName:'张三',
                     company:'神州通誉(洛阳)科技有限公司',
                     company:'神州通誉(洛阳)科技有限公司',
                     deptName:'软件工程院',
                     deptName:'软件工程院',
                     integral:'12000'
                     integral:'12000'
@@ -103,7 +100,7 @@ export default {
                 {
                 {
                     id:'3',
                     id:'3',
                     avatarUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
                     avatarUrl:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
-                    purchaser:'张三',
+                    userName:'张三',
                     company:'神州通誉(洛阳)科技有限公司',
                     company:'神州通誉(洛阳)科技有限公司',
                     deptName:'软件工程院',
                     deptName:'软件工程院',
                     integral:'12000'
                     integral:'12000'
@@ -114,23 +111,22 @@ export default {
             listQuery: {
             listQuery: {
                 page: 1,
                 page: 1,
                 limit: 10,
                 limit: 10,
-                // purchaser: '',
-                // orderSeq: '',
                 type: 0,
                 type: 0,
-                title: '',
+                userName: '',
             },
             },
         }
         }
     },
     },
     created() {
     created() {
-        // this.getList();
+        this.getList();
     },
     },
     methods: {
     methods: {
         handleDownLoad(){
         handleDownLoad(){
-            window.location.href = process.env.BASE_API + '/mall-order/exportOrderLog?purchaser=' + this.listQuery.purchaser + '&orderSeq=' + this.listQuery.orderSeq + '&orderType=' + this.listQuery.orderType + '&title=' + this.listQuery.title;
+            window.location.href = process.env.BASE_API + '/mall-order/exportOrderLog?userName=' + this.listQuery.userName + '&orderSeq=' + this.listQuery.orderSeq + '&orderType=' + this.listQuery.orderType + '&title=' + this.listQuery.title;
         },
         },
         getList() {
         getList() {
             this.listLoading = true
             this.listLoading = true
             list(this.listQuery).then(response => {
             list(this.listQuery).then(response => {
+                this.httpFile = response.data.data.httpFile
                 this.list = response.data.data.items
                 this.list = response.data.data.items
                 this.total = response.data.data.total
                 this.total = response.data.data.total
                 this.listLoading = false
                 this.listLoading = false