Browse Source

master merge middle 代码

jiayufei 3 năm trước cách đây
mục cha
commit
3097ea864e

+ 4 - 1
src/views/modules/Statistics/KSAccountReport.vue

@@ -275,6 +275,8 @@
 
 <script>
 import moment from 'moment';
+import {mapGetters} from 'vuex';
+
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 
 import { TreeSelect } from 'ant-design-vue';
@@ -585,6 +587,7 @@ export default {
     },
   },
   methods: {
+    ...mapGetters(['userInfo']),
     treeSearch(){
       console.log(arguments);
     },
@@ -909,7 +912,7 @@ export default {
    accountHttp(){
      this.treeData=[];
      this.treeValue=[];
-     getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=2', {}).then(res => {
+     getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=2&userId=' + this.userInfo().id, {}).then(res => {
        if(res.success){
             // console.log(res);
             if(res.result){

+ 3 - 5
src/views/modules/material/accountCheck.vue

@@ -67,17 +67,15 @@ export default {
       this.autoExpandParent = false
     },
     onCheck(checkedKeys) {
-      console.log('onCheck', checkedKeys)
       this.checkedKeys = checkedKeys
     },
     onSelect(selectedKeys, info) {
-      console.log('onSelect', info)
       this.selectedKeys = selectedKeys
     },
     handleOk(e) {
-      console.log(e)
+	  let defaultData = this.checkedKeys.filter(item => item.toString().indexOf('-') === -1);
       this.showEdit = false
-      this.$emit('synchro', this.checkedKeys)
+      this.$emit('synchro', defaultData)
     },
     close() {
       this.showEdit = false
@@ -117,7 +115,7 @@ export default {
           this.treeData = res.result.map(item=>{
             return {
               title: item.projectName,
-              key: item.projectId,
+              key: item.projectId + '-',
               children:item.userAllocationList.map(i=>{
                   return {
                     title: i.authName+'\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0'+(i.userName?i.userName:'管理员'), 

+ 1 - 1
src/views/modules/policy-management/policy-management-server.js

@@ -5,7 +5,7 @@
 
  export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
- // export const urlAcount = 'http://192.168.1.43:8808'; // 子安
+ // export const urlAcount = 'http://192.168.1.43:9999'; // 子安
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 //  export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  

+ 2 - 2
vue.config.js

@@ -114,9 +114,9 @@ module.exports = {
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',
-        // target: 'http://192.168.1.43:9090', // 子安
+        target: 'http://192.168.1.43:9999', // 子安
         // target: 'http://192.168.1.8:8806', // 学超
-        target:'http://gateway.tjyourong.com.cn', //测试
+        // target:'http://gateway.tjyourong.com.cn', //测试
         // target:'http://apipre.tjyourong.com.cn', //预生产
         // target: 'http://192.168.1.134:8080', //请求本地 需要jeecg-boot后台项目  周泽宇