Browse Source

V1.1.5测试提交

朱鑫波 4 years ago
parent
commit
d2c052b333

+ 2 - 2
src/utils/request.js

@@ -16,8 +16,8 @@ else if (process.env.NODE_ENV == 'debug') {
 else if (process.env.NODE_ENV == 'production') { 
 else if (process.env.NODE_ENV == 'production') { 
   
   
   // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
   // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
-  // axios.defaults.baseURL = 'http://139.186.151.174:8804/jeecg-boot';     
-  axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
+  axios.defaults.baseURL = 'http://139.186.151.174:8804/jeecg-boot';     
+  // axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
 }
 }
 const service = axios.create({
 const service = axios.create({
 //   baseURL: '/jeecg-boot', // api base_url
 //   baseURL: '/jeecg-boot', // api base_url

+ 6 - 4
src/views/modules/Statistics/yicheStatistics/dayStatistics.vue

@@ -527,11 +527,13 @@ export default {
     },
     },
     ...mapGetters(['nickname', 'avatar', 'userInfo']),
     ...mapGetters(['nickname', 'avatar', 'userInfo']),
     getParticipateList() {
     getParticipateList() {
-      getAction('/ctop/projectMember/participateList', {
-        userId: this.userInfo().id
+      getAction('/ctop/projectMember/participateListV2', {
+        userId: this.userInfo().id,
+        pageSize:1000,
+        pageNo:1
       }).then(res => {
       }).then(res => {
-        if (res.code == 0) {
-          this.dataElse = res.result
+        if (res.success) {
+          this.dataElse = res.result.records
         }
         }
       })
       })
     },
     },

+ 3 - 0
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -2214,6 +2214,7 @@ export default {
                     //     cpaBid:res.result.cpaBid/1000,
                     //     cpaBid:res.result.cpaBid/1000,
                     //     appId:res.singleAppid?JSON.parse(res.result.appIdArray)[0]:JSON.parse(res.result.appIdArray)
                     //     appId:res.singleAppid?JSON.parse(res.result.appIdArray)[0]:JSON.parse(res.result.appIdArray)
                     // })
                     // })
+                    if(this.whiteList.creative_category_switch){
                     this.$nextTick(()=>{
                     this.$nextTick(()=>{
                         res.result.creativeCategory=res.result.creativeCategory?[parseInt(res.result.creativeCategory/10000),parseInt(res.result.creativeCategory/100),res.result.creativeCategory]:[]
                         res.result.creativeCategory=res.result.creativeCategory?[parseInt(res.result.creativeCategory/10000),parseInt(res.result.creativeCategory/100),res.result.creativeCategory]:[]
                         this.form.setFieldsValue({
                         this.form.setFieldsValue({
@@ -2225,6 +2226,8 @@ export default {
                             appId:res.singleAppid?JSON.parse(res.result.appIdArray)[0]:JSON.parse(res.result.appIdArray)
                             appId:res.singleAppid?JSON.parse(res.result.appIdArray)[0]:JSON.parse(res.result.appIdArray)
                         })
                         })
                     })
                     })
+                    }
+                   
                     if((this.getFormData('ocpxActionType') == 180 || this.getFormData('ocpxActionType') == 53) && this.groupTypeData.deepConversionTypes&&this.groupTypeData.deepConversionTypes.length > 0){
                     if((this.getFormData('ocpxActionType') == 180 || this.getFormData('ocpxActionType') == 53) && this.groupTypeData.deepConversionTypes&&this.groupTypeData.deepConversionTypes.length > 0){
                         setTimeout(()=>{
                         setTimeout(()=>{
                         this.form.setFieldsValue({
                         this.form.setFieldsValue({

+ 79 - 7
src/views/system/UserList.vue

@@ -15,7 +15,7 @@
               <a-input placeholder="请输入姓名查询" v-model="queryParam.realname"></a-input>
               <a-input placeholder="请输入姓名查询" v-model="queryParam.realname"></a-input>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
-          <a-col :md="6" :sm="8">
+          <!-- <a-col :md="6" :sm="8">
             <a-form-item label="性别">
             <a-form-item label="性别">
               <a-select v-model="queryParam.sex" placeholder="请选择性别查询">
               <a-select v-model="queryParam.sex" placeholder="请选择性别查询">
                 <a-select-option value="">请选择性别查询</a-select-option>
                 <a-select-option value="">请选择性别查询</a-select-option>
@@ -23,6 +23,28 @@
                 <a-select-option value="2">女性</a-select-option>
                 <a-select-option value="2">女性</a-select-option>
               </a-select>
               </a-select>
             </a-form-item>
             </a-form-item>
+          </a-col> -->
+          <a-col :md="6" :sm="12">
+            <a-form-item label="汇报上级">
+              <a-input placeholder="请输入姓名查询" v-model="queryParam.leaderName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="用户角色">
+              <a-input placeholder="请输入用户角色" v-model="queryParam.roleName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="部门分配">
+              <a-tree-select
+                style="width: 100%"
+                :dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }"
+                :treeData="treeData"
+                v-model="queryParam.departId"
+                placeholder="无"
+              >
+              </a-tree-select>
+            </a-form-item>
           </a-col>
           </a-col>
 
 
           <a-col :md="6" :sm="8">
           <a-col :md="6" :sm="8">
@@ -31,18 +53,18 @@
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
 
 
-          <a-col :md="6" :sm="8">
+          <!-- <a-col :md="6" :sm="8">
             <a-form-item label="手机号码">
             <a-form-item label="手机号码">
               <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
               <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
             </a-form-item>
             </a-form-item>
-          </a-col>
+          </a-col> -->
 
 
           <a-col :md="6" :sm="8">
           <a-col :md="6" :sm="8">
             <a-form-item label="状态">
             <a-form-item label="状态">
               <a-select v-model="queryParam.status" placeholder="请选择用户状态查询">
               <a-select v-model="queryParam.status" placeholder="请选择用户状态查询">
                 <a-select-option value="">请选择用户状态</a-select-option>
                 <a-select-option value="">请选择用户状态</a-select-option>
                 <a-select-option value="1">正常</a-select-option>
                 <a-select-option value="1">正常</a-select-option>
-                <a-select-option value="2">冻</a-select-option>
+                <a-select-option value="2">冻</a-select-option>
               </a-select>
               </a-select>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
@@ -85,6 +107,16 @@
             {{ text ? text : '-' }}
             {{ text ? text : '-' }}
           </span>
           </span>
         </template>
         </template>
+        <template slot="sex" slot-scope="text, record">
+          <span>
+            {{ text ? (text == 1 ? '男' : '女') : '未填写' }}
+          </span>
+        </template>
+        <template slot="status" slot-scope="text, record">
+          <span>
+            {{ text ? (text == 1 ? '正常' : '冻结') : '未填写' }}
+          </span>
+        </template>
 
 
         <span slot="action" slot-scope="text, record">
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
           <a @click="handleEdit(record)">编辑</a>
@@ -141,7 +173,7 @@
 import UserModal from './modules/UserModal'
 import UserModal from './modules/UserModal'
 import PasswordModal from './modules/PasswordModal'
 import PasswordModal from './modules/PasswordModal'
 import { putAction } from '@/api/manage'
 import { putAction } from '@/api/manage'
-import { frozenBatch } from '@/api/api'
+import { frozenBatch, queryIdTree } from '@/api/api'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import SysUserAgentModal from './modules/SysUserAgentModal'
 import SysUserAgentModal from './modules/SysUserAgentModal'
 
 
@@ -156,6 +188,7 @@ export default {
   data() {
   data() {
     return {
     return {
       description: '这是用户管理页面',
       description: '这是用户管理页面',
+      treeData: [],
       queryParam: {},
       queryParam: {},
       columns: [
       columns: [
         /*{
         /*{
@@ -192,7 +225,8 @@ export default {
           title: '性别',
           title: '性别',
           align: 'center',
           align: 'center',
           width: 80,
           width: 80,
-          dataIndex: 'sex_dictText',
+          dataIndex: 'sex',
+          scopedSlots: { customRender: 'sex' },
           sorter: true,
           sorter: true,
         },
         },
         // {
         // {
@@ -235,7 +269,8 @@ export default {
           title: '状态',
           title: '状态',
           align: 'center',
           align: 'center',
           width: 80,
           width: 80,
-          dataIndex: 'status_dictText',
+          dataIndex: 'status',
+          scopedSlots: { customRender: 'status' },
         },
         },
         /* {
         /* {
              title: '创建时间',
              title: '创建时间',
@@ -268,7 +303,44 @@ export default {
       return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
       return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     },
     },
   },
   },
+  created() {
+    this.$nextTick(() => {
+      this.loadTreeData()
+    })
+  },
   methods: {
   methods: {
+    // loadTree() {
+    //   var that = this
+    //   that.treeData = []
+    //   that.departTree = []
+    //   queryDepartTreeList().then((res) => {
+    //     if (res.success) {
+    //       //部门全选后,再添加部门,选中数量增多
+    //       this.allTreeKeys = []
+    //       for (let i = 0; i < res.result.length; i++) {
+    //         let temp = res.result[i]
+    //         that.treeData.push(temp)
+    //         that.departTree.push(temp)
+    //         that.setThisExpandedKeys(temp)
+    //         that.getAllKeys(temp)
+    //         // console.log(temp.id)
+    //       }
+    //       this.loading = false
+    //     }
+    //   })
+    // },
+    loadTreeData() {
+      var that = this
+      queryIdTree().then((res) => {
+        if (res.success) {
+          that.treeData = []
+          for (let i = 0; i < res.result.length; i++) {
+            let temp = res.result[i]
+            that.treeData.push(temp)
+          }
+        }
+      })
+    },
     getAvatarView: function (avatar) {
     getAvatarView: function (avatar) {
       return this.url.imgerver + '/' + avatar
       return this.url.imgerver + '/' + avatar
     },
     },

+ 2 - 2
vue.config.js

@@ -68,7 +68,7 @@ module.exports = {
     open : true,
     open : true,
     proxy: {
     proxy: {
       '/jeecg-boot': {
       '/jeecg-boot': {
-        //  target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+         target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
@@ -85,7 +85,7 @@ module.exports = {
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',
         // target:'http://118.24.244.213:8804',
-       target:'http://139.186.151.174:8804', //测试
+      //  target:'http://139.186.151.174:8804', //测试
 
 
         ws: false,
         ws: false,