mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request '更新自贡' (#410) from projects/zg-zwq into projects/zg-test

Browse Source 
Reviewed-on: #410
This commit is contained in:
朱文强 2024-12-26 13:58:15 +08:00
commit d764eae48d
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.env.dev
View File

@ -1,7 +1,7 @@
### ###
# @Author: Do not edit # @Author: Do not edit
# @Date: 2023-08-29 09:40:39 # @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-09-10 14:43:39 # @LastEditTime: 2024-12-18 09:02:56
# @LastEditors: zwq # @LastEditors: zwq
# @Description: # @Description:
### ###
@ -13,9 +13,9 @@ VUE_APP_TITLE = 成本管理系统
# 芋道管理系统/开发环境 # 芋道管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.1.49:48080' # VUE_APP_BASE_API = 'http://192.168.1.49:48080'
VUE_APP_BASE_API = 'http://line.kszny.picaiba.com' # VUE_APP_BASE_API = 'http://line-sczg.kszny.picaiba.com'
# VUE_APP_BASE_API = 'http://192.168.1.40:48080' VUE_APP_BASE_API = 'http://100.64.0.45:48080'
# VUE_APP_BASE_API = 'http://192.168.1.188:48080' # VUE_APP_BASE_API = 'http://172.16.33.10:48080'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

4
src/views/cost/costStatistics/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<div style="background: #f2f4f9; height: 40px; width: 100%"> <!-- <div style="background: #f2f4f9; height: 40px; width: 100%">
<ButtonNav :menus="['按日期', '按规格']" @change="currentMenu"> <ButtonNav :menus="['按日期', '按规格']" @change="currentMenu">
<template v-slot:tab1> <template v-slot:tab1>
<div>按日期</div> <div>按日期</div>
@ -9,7 +9,7 @@
<div>按规格</div> <div>按规格</div>
</template> </template>
</ButtonNav> </ButtonNav>
</div> </div> -->
<div class="app-container energyOverlimitLog"> <div class="app-container energyOverlimitLog">
<div v-show="activeName === 'his'"> <div v-show="activeName === 'his'">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->

4
src/views/cost/deep/costDeepOthercostRule/typeRule.vue
View File

@ -10,9 +10,9 @@
<span> <span>
{{ {{
injectData.type == 1 injectData.type == 1
? `每天等价,${injectData.price}元` ? `每天等价,${Number(injectData.price)}元`
: injectData.type == 2 : injectData.type == 2
? `总价${injectData.price}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年` ? `总价${Number(injectData.price)}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
: '-' : '-'
}} }}
</span> </span>

6
src/views/cost/index.vue
View File

@ -360,7 +360,7 @@ export default {
position: absolute; position: absolute;
left: 42px; left: 42px;
top: 5px; top: 5px;
font-size: 24px; font-size: calc(100vw *20 / 1920);
} }
} }
.box { .box {
@ -376,11 +376,11 @@ export default {
text-align: center; text-align: center;
.num-style { .num-style {
color: #000; color: #000;
font-size: 40px; font-size: calc(100vw *40 / 1920);
} }
.unit-style { .unit-style {
color: rgba(0, 0, 0, 0.7); color: rgba(0, 0, 0, 0.7);
font-size: 18px; font-size: calc(100vw *18 / 1920);
} }
} }
.shadow { .shadow {

6
src/views/cost/raw/costOthercostRule/typeRule.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-12-05 13:45:59 * @Date: 2023-12-05 13:45:59
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2024-04-15 17:12:03 * @LastEditTime: 2024-12-25 16:20:38
* @Description * @Description
--> -->
<template> <template>
@ -10,9 +10,9 @@
<span> <span>
{{ {{
injectData.type == 1 injectData.type == 1
? `每天等价,${injectData.price}元` ? `每天等价,${Number(injectData.price)}元`
: injectData.type == 2 : injectData.type == 2
? `总价${injectData.price}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年` ? `总价${Number(injectData.price)}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
: '-' : '-'
}} }}
</span> </span>

2
src/views/energy/base/energyQuantityManual/index.vue
View File

@ -63,7 +63,7 @@ const tableProps = [
{ {
prop: 'unit', prop: 'unit',
label: '单位', label: '单位',
filter: publicFormatter('unit_dict'), filter: publicFormatter('energy_unit'),
minWidth: 110, minWidth: 110,
}, },
{ {

8
src/views/login.vue
View File

@ -114,7 +114,7 @@
v-model="loginForm.loginType" v-model="loginForm.loginType"
style="float: none"> style="float: none">
<el-tab-pane label="账号密码登录" name="uname"></el-tab-pane> <el-tab-pane label="账号密码登录" name="uname"></el-tab-pane>
<el-tab-pane label="短信验证码登录" name="sms"></el-tab-pane> <!-- <el-tab-pane label="短信验证码登录" name="sms"></el-tab-pane> -->
</el-tabs> </el-tabs>
<div style=""> <div style="">
<el-form <el-form
@ -297,13 +297,13 @@ export default {
mobileCodeTimer: 0, mobileCodeTimer: 0,
loginForm: { loginForm: {
loginType: 'uname', loginType: 'uname',
username: 'admin', username: '',//admin
password: 'admin123', password: '',//admin123
captchaVerification: '', captchaVerification: '',
mobile: '', mobile: '',
mobileCode: '', mobileCode: '',
rememberMe: false, rememberMe: false,
tenantName: '技术中心', tenantName: '',//技术中心
}, },
scene: 21, scene: 21,