优化

MrShi

8 天以前 c0f0e756e9d61c27e358c798c91042e35711028b

优化

 admin/.env

@@ -5,9 +5,6 @@

# è·¯ç”±æ–¹å¼
VUE_APP_ROUTER_MODE = 'hash'

# é¡¹ç›®ä¸Šä¸‹æ–‡è·¯å¾„
VUE_APP_CONTEXT_PATH = './'

ddd
# æŽ¥å£å‰ç¼€
VUE_APP_API_PREFIX = '/dianjiang_admin_api'

 admin/.env.development

@@ -1,3 +1,10 @@
# å¼€å‘环境配置
NODE_ENV = 'development'
<<<<<<< HEAD
VUE_APP_API_URL = 'http://192.168.0.7/dianjiang_admin_api/'
=======

# é¡¹ç›®ä¸Šä¸‹æ–‡è·¯å¾„
VUE_APP_CONTEXT_PATH = '/'
VUE_APP_API_URL = 'http://localhost:11010'
>>>>>>> d5810177a4e77ea273971e51dd150bd84906de6f

 admin/.env.production

@@ -3,5 +3,5 @@

# å…³é—­DEBUG
VUE_APP_DEBUG = 'off'

VUE_APP_CONTEXT_PATH = '/dianjiang_admin'
VUE_APP_API_URL = 'https://jinkuai.832smartfarm.com/jinkuai_admin'

 admin/.env.test

@@ -1,3 +1,5 @@
# å¼€å‘环境配置
NODE_ENV = 'development'

VUE_APP_CONTEXT_PATH = '/dianjiang_admin'
VUE_APP_API_URL = 'http://192.168.0.7:10010/dianjiang_admin_interface'

 admin/admin/avatar/man.png

Binary files differ

 admin/admin/avatar/woman.png

Binary files differ

 admin/admin/favicon.ico

Binary files differ

 admin/admin/index.html

ÎļþÒÑɾ³ý

 admin/admin/static/css/chunk-vendors.d9e68312.css

ÎļþÒÑɾ³ý

 admin/admin/static/fonts/element-icons.535877f5.woff

Binary files differ

 admin/admin/static/fonts/element-icons.732389de.ttf

Binary files differ

 admin/admin/static/img/404-tip.4d90651f.png

Binary files differ

 admin/admin/static/img/404.5c17595f.png

Binary files differ

 admin/admin/static/img/department.1754fad3.svg

ÎļþÒÑɾ³ý

 admin/admin/static/img/dictionary.0c28d143.svg

ÎļþÒÑɾ³ý

 admin/admin/static/img/listener.23a71b9d.svg

ÎļþÒÑɾ³ý

 admin/admin/static/img/log-login.04516c69.svg

ÎļþÒÑɾ³ý

 admin/admin/static/img/log-opera.c9e49c6d.svg

ÎļþÒÑɾ³ý

 admin/admin/static/img/log.f30b4ce3.svg

ÎļþÒÑɾ³ý

 admin/admin/static/img/login.97bc0f97.png

Binary files differ

 admin/admin/static/img/logo.6385c17b.png

Binary files differ

 admin/admin/static/img/man.6eaa0e37.png

Binary files differ

 admin/admin/static/img/permission.8e6d7d41.svg

ÎļþÒÑɾ³ý

 admin/admin/static/img/position.b31ebe59.svg

ÎļþÒÑɾ³ý

 admin/admin/static/img/pwd.f73be658.svg

ÎļþÒÑɾ³ý

 admin/admin/static/img/role.175bee67.svg

ÎļþÒÑɾ³ý

 admin/admin/static/img/shield.54851228.svg

ÎļþÒÑɾ³ý

 admin/admin/static/img/woman.e651ccdb.png

Binary files differ

 admin/admin/static/js/chunk-vendors.2417847b.js

ÎļþÒÑɾ³ý

 admin/admin/static/js/chunk-vendors.2417847b.js.map

ÎļþÒÑɾ³ý

 admin/src/components/business/OperaCasesListWindow.vue

@@ -137,7 +137,10 @@
    },
    getTableHeight(){
      this.$nextTick(() => {
        this.tableHeight = window.innerHeight - 180- document.getElementById('curSearchForm').clientHeight
        this.tableHeight = window.innerHeight - 180;
        if(document.getElementById('curSearchForm')){
          this.tableHeight = this.tableHeight - document.getElementById('curSearchForm').clientHeight
        }
      })
    },
    open (title, memberId, importId) {
@@ -174,9 +177,9 @@
</style>
<style  >
.success-row {
  background: #f0f9eb; /* æµ…绿色背景 */
  background: #f0f9eb  !important; /* æµ…绿色背景 */
}
.warning-row {
  background: rgba(161, 14, 14, 0.35); /* æµ…红色背景 */
  background: rgba(161, 14, 14, 0.35)  !important; /* æµ…红色背景 */
}
</style>

 admin/src/components/business/OperaMemberListWindow.vue

@@ -230,7 +230,10 @@
  methods: {
    getTableHeight () {
      this.$nextTick(() => {
        this.tableHeight = window.innerHeight - 180- document.getElementById('curSearchForm').clientHeight
        this.tableHeight = window.innerHeight - 180;
        if(document.getElementById('curSearchForm')){
          this.tableHeight = this.tableHeight - document.getElementById('curSearchForm').clientHeight
        }
      })

    },
@@ -280,9 +283,9 @@
</style>
<style  >
.success-row {
  background: #f0f9eb; /* æµ…绿色背景 */
  background: #f0f9eb  !important; /* æµ…绿色背景 */
}
.warning-row {
  background: rgba(161, 14, 14, 0.35); /* æµ…红色背景 */
  background: rgba(161, 14, 14, 0.35)  !important; /* æµ…红色背景 */
}
</style>

 admin/vue.config.js

@@ -7,7 +7,7 @@
}
module.exports = {
  publicPath: process.env.VUE_APP_CONTEXT_PATH,
  outputDir: 'admin',
  outputDir: 'dianjiang_admin',
  assetsDir: 'static',
  lintOnSave: false,
  devServer: {

 server/admin/pom.xml

@@ -54,6 +54,7 @@
                    <fork>true</fork>
                    <mainClass>com.doumee.DJAdminApplication</mainClass>
                    <layout>ZIP</layout>
                    <includeSystemScope>true</includeSystemScope>
                </configuration>
                <executions>
                    <execution>

 server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java

@@ -22,7 +22,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.sun.xml.internal.messaging.saaj.util.ByteInputStream;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.CellType;
@@ -509,7 +508,7 @@
            List<ImportRecord> records = importRecordMapper.selectList(new QueryWrapper<ImportRecord>()
                    .select("id,total_num,(select count(c.id) from cases c where c.import_id= import_record.id) as doneNum")
                    .lambda()
                    .eq(ImportRecord::getDetail,Constants.ZERO)
                    .eq(ImportRecord::getDeleted,Constants.ZERO)
                    .ne(ImportRecord::getStatus,Constants.TWO)
            );
            for(ImportRecord importRecord : records){

 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -280,6 +280,7 @@

    private void dealMemberCategoryList(Member member, List<Category> categoryList, Integer queryFlag) {
        member.setFieldList(new ArrayList<>());
        member.setFieldIdList(new ArrayList<>());
        member.setTypeList(new ArrayList<>());
        member.setZqList(new ArrayList<>());
        member.setBustypeIdList(new ArrayList<>());

 server/web/pom.xml

@@ -53,7 +53,8 @@
                <configuration>
                    <fork>true</fork>
                    <mainClass>com.doumee.DJWebApplication</mainClass>
                    <layout>ZIP</layout>
                    <layout>ZIP</layout><layout>ZIP</layout>
                    <includeSystemScope>true</includeSystemScope>
                </configuration>
                <executions>
                    <execution>

 server/web/src/main/java/com/doumee/api/web/LoginController.java

@@ -25,7 +25,6 @@
import com.doumee.dao.vo.WebLoginUserVO;
import com.doumee.service.business.CategoryService;
import com.doumee.service.business.MemberService;
import com.sun.deploy.net.HttpUtils;
import com.taobao.api.ApiException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

 server/web/src/main/resources/application.yml

@@ -1,6 +1,6 @@
# ç«¯å£å™¨é…ç½®
server:
  port: 10011
  port: 11011
# é¡¹ç›®ä¿¡æ¯é…ç½®
project:
  name: å¿—邦点将