Prechádzať zdrojové kódy

拉取代码,发版测试

zhuxinbo 4 rokov pred
rodič
commit
30ffcaaff7

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 9053 - 9053
public/color.less


+ 5 - 5
src/components/tools/setting.js

@@ -62,10 +62,10 @@ const updateTheme = primaryColor => {
 
   if (!lessNodesAppended) {
     // insert less.js and color.less
-    const lessStyleNode = document.createElement('link');
-    const lessConfigNode = document.createElement('script');
-    const lessScriptNode = document.createElement('script');
-    lessStyleNode.setAttribute('rel', 'stylesheet/less');
+    // const lessStyleNode = document.createElement('link');
+    // const lessConfigNode = document.createElement('script');
+    // const lessScriptNode = document.createElement('script');
+    // lessStyleNode.setAttribute('rel', 'stylesheet/less');
     // lessStyleNode.setAttribute('href', '/color.less');
     lessConfigNode.innerHTML = `
       window.less = {
@@ -91,7 +91,7 @@ const updateTheme = primaryColor => {
 
 const updateColorWeak = colorWeak => {
   // document.body.className = colorWeak ? 'colorWeak' : '';
-  colorWeak ? document.body.classList.add('colorWeak') : document.body.classList.remove('colorWeak')
+//   colorWeak ? document.body.classList.add('colorWeak') : document.body.classList.remove('colorWeak')
 };
 
 export {updateTheme, colorList, updateColorWeak}

+ 20 - 6
src/views/modules/advertiser/ProjectMemberList.vue

@@ -506,7 +506,8 @@
         getAction('/ctop/project/responsibleListV2', {
           userId: this.userInfo().id,
           pageSize: this.ipagination.pageSize,
-          pageNo: this.ipagination.current
+          pageNo: this.ipagination.current,
+          projectName: this.keyWord
         }).then(res => {
           if (res.code == 0) {
             this.loading = false
@@ -524,7 +525,8 @@
         getAction('/ctop/projectMember/participateListV2', {
           userId: this.userInfo().id,
           pageSize: this.ipagination.pageSize,
-          pageNo: this.ipagination.current
+          pageNo: this.ipagination.current,
+          projectName: this.keyWord
         }).then(res => {
           if (res.code == 0) {
             this.dataSource = res.result.records
@@ -670,12 +672,24 @@
       },
       searchReset() {
         this.keyWord = ''
-        this.dataSource = this.dataElse
+        // this.dataSource = this.dataElse
+        if (this.noTitleKey == 'participation') {
+          this.getParticipateList()
+        } else {
+          this.getResponsibleList()
+        }
       },
       searchQuery() {
-        this.dataSource = this.dataElse.filter(item => {
-          return item.projectName.toLowerCase().indexOf(this.keyWord.toLowerCase()) > -1
-        })
+
+        if (this.noTitleKey == 'participation') {
+          this.getParticipateList()
+        } else {
+          this.getResponsibleList()
+        }
+
+        // this.dataSource = this.dataElse.filter(item => {
+        //   return item.projectName.toLowerCase().indexOf(this.keyWord.toLowerCase()) > -1
+        // })
       },
       handleChange(value, options) {
         //   this.appId = value

+ 2 - 2
vue.config.js

@@ -56,14 +56,14 @@ module.exports = {
     port: 3000,
     proxy: {
       '/jeecg-boot': {
-        target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        // target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.94:8804', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.0.230:8088', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.1.51:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.165:8848', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        // target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
+        target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目