yumoqing/kboss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.opencomputing.cn/yumoqing/kboss

Browse Source
This commit is contained in:
ping 2025-09-15 17:09:27 +08:00
commit d8b57bc6d2
15 changed files with 326 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
f/web-kboss/src/babelrc.js
View File

@ -1,3 +1,3 @@
{
"plugins": ["@babel/plugin-syntax-dynamic-import"]
}
}

5
f/web-kboss/src/components/FloatingBox/FloatingBox.vue
View File

@ -24,7 +24,7 @@
<!-- </div>-->
<div @click="open2"
style="position:absolute;bottom:-40px;display: flex;justify-content: center;align-items: center;cursor: pointer">
<el-tooltip v-if="getHomePath()!=='/ncmatchHome/index'" class="item" effect="light" content="联系销售" placement="left">
<span class="el-icon-video-camera"
@ -88,7 +88,7 @@
class="cloud-contact-us-icon"></span>
<p class="cloud-contact-us-tit" style="font-size: 14px;">售前咨询</p>
</div>
<div style=";display: flex;justify-content: center;align-items: center;"
<div style="display: flex;justify-content: center;align-items: center;"
>
<div v-if="!phone"
style="width: 80px;height: 25px;display: flex!important;justify-content: center;align-items: center">
@ -991,6 +991,7 @@ export default {
background-color: white;
box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.5);
padding: 10px;
z-index: 11;
}
@keyframes slideInRight {

1
f/web-kboss/src/mixin/globalMixin.js
View File

@ -5,3 +5,4 @@ export default {
document.body.style.userSelect = 'none';
},
};

2
f/web-kboss/src/views/finance/customerRechargeManagement/customersRechargeOnffline/index.vue
View File

@ -10,7 +10,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="充值金额:" prop="balance">
<el-form-item label="充值金额:" prop="balance" label-width="130px">
<el-input v-model="form.balance"></el-input>
</el-form-item>
<el-form-item>

2
f/web-kboss/src/views/homePage/about/index.vue
View File

@ -63,7 +63,7 @@
</li>
<li>
<span class="icon"><img
src="./img/3.png"
src="./img/3.png"
alt=""></span>
<div class="title">价值观</div>
<div class="description">

632
f/web-kboss/src/views/homePage/mainPage/index.vue
View File

File diff suppressed because it is too large Load Diff

4
f/web-kboss/src/views/login/indexNew.vue
View File

@ -98,7 +98,7 @@
<!-- </div>-->
<div style="display:flex;">
<el-button @keyup.enter.native="handleLogin('loginForm')" :loading="loading" type="primary"
style="width: 300px;margin-top: 30px;margin-bottom: 30px" class="login-btn"
style="width: 300px;margin-top: 30px;margin-bottom: 10px" class="login-btn"
@click.native.prevent="handleLogin('loginForm')">立即登录
</el-button>
</div>
@ -846,7 +846,7 @@ export default {
if (this.$route.query.fromPath === 'homePage') {
// this.$router.push({path: "/homePage/index"});
if (this.$route.query.type === 'bd') {
// this.$router.push('/product/baiduProduct')
// this.$router.push('/product/baiduProduct')
this.goBaidu(this.$route.query.listUrl, this.$route.query.url)
} else if (this.$route.query.type === 'ali') {

8
f/web-kboss/src/views/operation/channelCustomer/index.vue
View File

@ -9,21 +9,21 @@
fixed
prop="username"
label="用户名"
width="150">
>
</el-table-column>
<el-table-column
prop="orgname"
label="用户机构"
width="120">
>
</el-table-column>
<el-table-column
prop="create_at"
label="申请时间"
width="180">
>
</el-table-column>
<el-table-column
label="操作"
width="150">
>
<template slot-scope="scope">
<div v-if="scope.row.type==='0'">
<el-button @click="handleClick(scope.row)" size="mini" type="primary">同意</el-button>

1
f/web-kboss/src/views/operation/deviceMangement/deviceGrid/machineRoomGrid.vue
View File

@ -220,6 +220,7 @@ export default {
justify-content: flex-start;
flex-wrap: wrap;
background-color: white;
padding: 20px;
}
.itemStyle {

6
f/web-kboss/src/views/operation/saleActives/index.vue
View File

@ -4,7 +4,7 @@
<el-row class="customerList">
<el-col :span="10">
<div style="display:flex;">
<el-button size="small" type="success" @click="addSaleActives">添加促销活动</el-button>
<el-button size="small" type="success" @click="addSaleActives" style="margin-bottom: 10px;">添加促销活动</el-button>
</div>
<div class="leftTable">
<el-table :data="leftTableData" row-key="id" border height="calc(100vh - 200px)" @row-click="getProduct"
@ -24,7 +24,7 @@
<el-col :span="14">
<div style="display:flex; flex-direction: row;">
<div style="display:flex;padding-right:20px">
<el-button size="small" type="success" @click="addProduct()" :disabled="isAddProduct">添加折扣产品
<el-button size="small" type="success" @click="addProduct()" :disabled="isAddProduct" style="margin-bottom: 10px;">添加折扣产品
</el-button>
</div>
<div>
@ -97,7 +97,7 @@
<!-- 添加折扣产品弹窗 -->
<el-dialog class="addSaleProduct" :title="'请为'+ this.tableTitle+'添加促销产品'" :visible.sync="addProductDialog"
width="45%" :before-close="handleClose1" :isEdit="isEdit">
width="45%" :before-close="handleClose1" :isEdit="isEdit" >
<el-form ref="productForm" :model="productForm" label-width="120px" :rules="ProductRules" style="width: 80%">
<div class="treeSelect">
<el-form-item label="促销产品:" prop="" required="">

4
f/web-kboss/src/views/operationAndMaintenance/documentManagement/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<div style="display:flex;">
<el-button type="primary" size="small" @click="addDocument">新增文档</el-button>
<el-button type="primary" size="small" @click="addDocument" style="margin:10px 0;">新增文档</el-button>
</div>
<el-table :data="tableData" style="width: 100%" height="720">
<el-table-column prop="title" label="标题"> </el-table-column>
@ -266,4 +266,4 @@ export default {
</script>
<style>
</style>
</style>

2
f/web-kboss/src/views/product/productHome/index.vue
View File

@ -804,7 +804,7 @@ export default {
}
.jd-code {
//border:1px solid red;
/* border:1px solid red; */
.el-dialog__body {
display: flex;

2
f/web-kboss/src/views/sales/distributorManagement/index.vue
View File

@ -2,7 +2,7 @@
<div class="box">
<div class="left_box">
<div style="background-color: white;display:flex;">
<el-button @click="drawer = true" type="primary" size="small">添加分销商</el-button>
<el-button @click="drawer = true" type="primary" size="small" style="margin: 10px 20px;">添加分销商</el-button>
</div>
<div class="distributor_box">
<el-table :data="distributorList" style="width: 100%" :unique-opened="true" height="calc(100vh - 130px)"

1
f/web-kboss/src/views/sales/distributorManagement/lodIndex.vue
View File

@ -919,4 +919,5 @@ export default {
.drawer_style {
padding: 0px 30px 0px 30px !important;
}
</style>

42
f/web-kboss/vue.config.js
View File

@ -141,28 +141,28 @@ module.exports = {
.end()
config
.optimization.splitChunks({
chunks: 'all',
cacheGroups: {
libs: {
name: 'chunk-libs',
test: /[\\/]node_modules[\\/]/,
priority: 10,
chunks: 'initial' // only package third parties that are initially dependent
},
elementUI: {
name: 'chunk-elementUI', // split elementUI into a single package
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
},
commons: {
name: 'chunk-commons',
test: resolve('src/components'), // can customize your rules
minChunks: 3, // minimum common number
priority: 5,
reuseExistingChunk: true
chunks: 'all',
cacheGroups: {
libs: {
name: 'chunk-libs',
test: /[\\/]node_modules[\\/]/,
priority: 10,
chunks: 'initial' // only package third parties that are initially dependent
},
elementUI: {
name: 'chunk-elementUI', // split elementUI into a single package
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
},
commons: {
name: 'chunk-commons',
test: resolve('src/components'), // can customize your rules
minChunks: 3, // minimum common number
priority: 5,
reuseExistingChunk: true
}
}
}
})
})
// https:// webpack.js.org/configuration/optimization/#optimizationruntimechunk
config.optimization.runtimeChunk('single')
}