From 64b3ee8aebe765c668b7f04b2bc1ee9a3919bdfb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 24 八月 2023 14:31:01 +0800
Subject: [PATCH] 大屏
---
h5_standard/src/views/workOrder/reportingForWork.vue | 1
minipro_standard/manifest.json | 11
screen_standard/.env.staging | 2
h5_standard/src/views/plannedProgress/details.vue | 104 ++++++
minipro_standard/pages/index/index.vue | 8
screen_standard/src/views/index.vue | 10
screen_standard/vite.config.js | 16 +
screen_standard/src/components/AppLayout.vue | 29 -
minipro_standard/pages.json | 12
h5_standard/.env.production | 4
platform_web/src/views/business/clientRecord.vue | 2
h5_standard/src/views/workOrder/workOrderReporting.vue | 3
minipro_standard/components/myTabber.vue | 2
screen_standard/.env.development | 7
screen_standard/src/router/index.js | 7
minipro_standard/main.js | 13
h5_standard/src/components/newCom/user.vue | 2
minipro_standard/pages/workbench/workbench.vue | 133 +++++++
screen_standard/src/views/process.vue | 96 +++---
server/src/main/java/doumeemes/dao/business/model/CompanyLog.java | 1
minipro_standard/App.vue | 6
platform_web/.env.development | 5
/dev/null | 277 -----------------
minipro_standard/pages/mine/mine.vue | 168 +++++++--
screen_standard/src/stores/counter.js | 4
minipro_standard/util/request/responseInterceptors.js | 24
screen_standard/.env.production | 4
27 files changed, 487 insertions(+), 464 deletions(-)
diff --git a/h5_standard/.env.production b/h5_standard/.env.production
index c874a31..af03e19 100644
--- a/h5_standard/.env.production
+++ b/h5_standard/.env.production
@@ -18,7 +18,7 @@
# VUE_APP_API = 'https://hsky.doumee.com/doumeeplant_api/'
# 娴嬭瘯
-# VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
+VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
# 婕旂ず
-VUE_APP_API = 'https://www.mes.red/doumeeplant/'
+# VUE_APP_API = 'https://www.mes.red/doumeeplant/'
diff --git a/h5_standard/src/components/newCom/user.vue b/h5_standard/src/components/newCom/user.vue
index 55d4505..7ae8a6a 100644
--- a/h5_standard/src/components/newCom/user.vue
+++ b/h5_standard/src/components/newCom/user.vue
@@ -17,7 +17,7 @@
<div class="content_total">鍏眥{form.total}}鏉℃暟鎹�</div>
<div class="content_list">
<div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)">
- <div class="content_list_item_name">{{item.name}} | {{item.dmodel.name}}</div>
+ <div class="content_list_item_name" v-if="item.dmodel">{{item.name}} | {{item.dmodel.name}}</div>
</div>
</div>
</div>
diff --git a/h5_standard/src/views/plannedProgress/details.vue b/h5_standard/src/views/plannedProgress/details.vue
index d1e61af..29d7c25 100644
--- a/h5_standard/src/views/plannedProgress/details.vue
+++ b/h5_standard/src/views/plannedProgress/details.vue
@@ -51,12 +51,33 @@
<div class="content_list_item_content_item_label">璁″垝浜哄憳锛�</div>
<div class="content_list_item_content_item_nr">{{info.usermodel.realname}}</div>
</div>
+ <div class="content_list_item_content_item">
+ <div class="content_list_item_content_item_label">鍒嗛厤鏁伴噺锛�</div>
+ <div class="content_list_item_content_item_nr">{{info.createTime}}</div>
+ </div>
+ <div class="content_list_item_content_item">
+ <div class="content_list_item_content_item_label">瀹屽伐鏁伴噺锛�</div>
+ <div class="content_list_item_content_item_nr" v-if="info.umodel">{{info.doneNum}}{{info.umodel.name}}</div>
+ </div>
</div>
</div>
</div>
<NotFound info="鏆傛湭鍒嗛厤宸ュ崟" v-if="info.workorderList && info.workorderList.length === 0" />
<template v-else>
- <div class="details_timeline" v-for="(item, i) in info.workorderList" :key="i">
+ <div class="details_list">
+ <div class="details_list_item" v-for="(item, i) in info.workorderList" :key="i" @click="jump(item.id)">
+ <div class="details_list_item_top">
+ <span>{{ item.createUserName }}</span><span>{{ item.code }}</span>
+ </div>
+ <div class="details_list_item_center">
+ <span>鑹搧鏁帮細{{ item.qualifiedNum }}</span><span>涓嶈壇鏁帮細<span class="red">{{ item.unqualifiedNum }}</span></span>
+ </div>
+ <div class="details_list_item_bottom">
+ <span>{{ item.createTime }}</span>
+ </div>
+ </div>
+ </div>
+ <!-- <div class="details_timeline" v-for="(item, i) in info.workorderList" :key="i">
<div class="details_timeline_header">
<div class="details_timeline_header_code">
<span>宸ュ崟缂栧彿锛歿{item.code}}</span>
@@ -68,10 +89,10 @@
<span v-if="item.status === 3" class="purple">宸叉楠�</span>
<span v-if="item.status === 4">宸叉姤宸�</span>
<span v-if="item.status === 5">宸插叆搴�</span>
- <span v-if="item.status === 6">宸插彇娑�</span>
+ <span v-if="item.status === 6">宸插彇娑�</span> -->
<!-- <span v-if="item.status === 7">宸插彇娑�</span>-->
<!-- <span v-if="item.status === 8">宸插叧闂�</span>-->
- </div>
+ <!-- </div>
<div class="details_timeline_item" v-if="item.produceDate">
<div class="activedian"></div>
<div class="dian active"></div>
@@ -132,21 +153,22 @@
</div>
</div>
</div>
- </div>
+ </div> -->
</template>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted, watch } from 'vue'
- import { useRoute } from "vue-router"
+ import { useRoute, useRouter } from "vue-router"
import { queryByID } from '@/apis/PlanningAPI'
import NotFound from '@/components/common/NotFound.vue'
const route = useRoute()
+ const router = useRouter()
// 璇︽儏鏁版嵁
- let info = ref({})
+ let info:any = ref({})
let loading = ref<boolean>(true)
@@ -158,6 +180,10 @@
info.value = res.data
}
})
+ }
+
+ const jump = (id: any) => {
+ router.push({ name: 'workOrderReporting', query: { id } })
}
const proUserStr = (item: any) => {
@@ -296,6 +322,72 @@
}
}
}
+ .details_list {
+ width: 100%;
+ height: auto;
+ background-color: #FFFFFF;
+ margin-top: 20px;
+ .details_list_item {
+ width: 100%;
+ padding: 24px 30px;
+ box-sizing: border-box;
+ background-color: #FFFFFF;
+ border-bottom: 2px solid #F7F7F7;
+ &:last-child {
+ border: none !important;
+ }
+ .details_list_item_top {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ span {
+ &:first-child {
+ font-size: 30px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #222222;
+ margin-right: 16px;
+ }
+ &:last-child {
+ font-size: 24px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #666666;
+ }
+ }
+ }
+ .details_list_item_center {
+ width: 100%;
+ margin: 16px 0 20px 0;
+ .red {
+ color: #DE5243;
+ }
+ span {
+ &:first-child {
+ font-size: 26px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #333333;
+ margin-right: 100px;
+ }
+ &:last-child {
+ font-size: 26px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #333333;
+ }
+ }
+ }
+ .details_list_item_bottom {
+ span {
+ font-size: 24px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #999999;
+ }
+ }
+ }
+ }
.details_timeline {
padding: 30px;
background: #ffffff;
diff --git a/h5_standard/src/views/workOrder/reportingForWork.vue b/h5_standard/src/views/workOrder/reportingForWork.vue
index 256d10c..241b071 100644
--- a/h5_standard/src/views/workOrder/reportingForWork.vue
+++ b/h5_standard/src/views/workOrder/reportingForWork.vue
@@ -697,6 +697,7 @@
getDeviceByCondition({ procedureId: res.procedureId })
.then(res1 => {
if (res1.code === 200) {
+ if (res1.data && res1.data.length > 0)
deviceId.value = res1.data[0].id
from.deviceId = res1.data[0].id
from.deviceName = res1.data[0].name
diff --git a/h5_standard/src/views/workOrder/workOrderReporting.vue b/h5_standard/src/views/workOrder/workOrderReporting.vue
index 531d7fd..b24be91 100644
--- a/h5_standard/src/views/workOrder/workOrderReporting.vue
+++ b/h5_standard/src/views/workOrder/workOrderReporting.vue
@@ -311,7 +311,8 @@
<div class="bh_zw"></div>
<div class="bg_footer">
<div class="bg_footer_submit" v-if="typeView == 0" @click="submit">纭鎶ュ伐</div>
- <div class="bg_footer_submit1" @click="jumpdj" v-if="proxy.$auth('h5:workorder:processRecord') && typeView == 1">
+ <!-- proxy.$auth('h5:workorder:processRecord') && -->
+ <div class="bg_footer_submit1" @click="jumpdj" v-if="typeView == 1">
<img src="@/assets/icon/gongdan_ic_shoudong@2x.png" alt="" />
<span>鏂板鐐规</span>
</div>
diff --git a/minipro_standard/App.vue b/minipro_standard/App.vue
index 000f628..d1aed6d 100644
--- a/minipro_standard/App.vue
+++ b/minipro_standard/App.vue
@@ -16,7 +16,7 @@
/*姣忎釜椤甸潰鍏叡css */
@import "@/uni_modules/uview-ui/index.scss";
@import "common/css/lib.css";
- page {
- background-color: #F3F6F9 !important;
- }
+ // page {
+ // background-color: #F3F6F9 !important;
+ // }
</style>
diff --git a/minipro_standard/components/myTabber.vue b/minipro_standard/components/myTabber.vue
index 5fdc680..b8b5250 100644
--- a/minipro_standard/components/myTabber.vue
+++ b/minipro_standard/components/myTabber.vue
@@ -6,7 +6,7 @@
fixed
activeColor="#222"
inactiveColor="#666"
- >
+ :safeAreaInsetBottom="true">
<u-tabbar-item text="寰呭姙">
<view class="" slot="active-icon">
<image src="@/static/nav_daiban_sel@2x.png" class="icon-style" mode=""></image>
diff --git a/minipro_standard/main.js b/minipro_standard/main.js
index 06bb2a0..a8ee7ad 100644
--- a/minipro_standard/main.js
+++ b/minipro_standard/main.js
@@ -1,32 +1,23 @@
import Vue from 'vue'
import App from './App'
-
-
import mixin from './common/mixin'
-
// 寮曞叆鍏ㄥ眬uView
import uView from '@/uni_modules/uview-ui'
Vue.use(uView)
-
// vuex
import store from './store'
Vue.prototype.$store = store
store.dispatch('getHeight')
-
Vue.config.productionTip = false
-
-App.mpType = 'app'
-
+App.mpType = 'app'
console.log(uni.$u);
// #ifdef MP
// 寮曞叆uView瀵瑰皬绋嬪簭鍒嗕韩鐨刴ixin灏佽
const mpShare = require('@/uni_modules/uview-ui/libs/mixin/mpShare.js')
Vue.mixin(mpShare)
// #endif
-
Vue.mixin(mixin)
-// 寮曞叆璇锋眰灏佽
-
+// 寮曞叆璇锋眰灏佽
const app = new Vue({
store,
...App
diff --git a/minipro_standard/manifest.json b/minipro_standard/manifest.json
index 2188567..a25c0b8 100644
--- a/minipro_standard/manifest.json
+++ b/minipro_standard/manifest.json
@@ -50,14 +50,15 @@
"quickapp" : {},
/* 灏忕▼搴忕壒鏈夌浉鍏� */
"mp-weixin" : {
- "appid" : "wxf8f2d1ee4b273688",
+ "appid" : "wxcd2b89fd2ff065f8",
"setting" : {
- "urlCheck" : false
+ "urlCheck" : false,
+ "es6" : true,
+ "postcss" : true,
+ "minified" : true
},
"usingComponents" : true,
- "requiredPrivateInfos": [
- "getLocation"
- ],
+ "requiredPrivateInfos" : [ "getLocation" ],
"permission" : {
"scope.userLocation" : {
"desc" : "瀹炴椂涓婁紶鍥剧墖"
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 5641535..cb37cc6 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -1,12 +1,11 @@
{
- "pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
+ "pages": [
{
"path": "pages/workbench/workbench",
"style": {
"navigationBarTitleText": "宸ヤ綔鍙�",
"enablePullDownRefresh": false
}
-
},
{
"path": "pages/index/index",
@@ -26,16 +25,15 @@
{
"navigationBarTitleText": "鐧诲綍",
"enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
-
+ "navigationStyle": "custom"
+ }
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
- "navigationBarBackgroundColor": "#F3F6F9",
- "backgroundColor": "#F3F6F9"
+ "navigationBarBackgroundColor": "#ffffff",
+ "backgroundColor": "#ffffff"
},
"tabBar": {
"color": "#666666",
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index 7308129..c6d7304 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -1,14 +1,10 @@
<template>
- <view>
-
+ <view>
<myTabbar :index="0" />
</view>
</template>
<script>
- // import { coustomLogin, wxEmpower } from '@/util/api/index'
-
-
import myTabbar from "@/components/myTabber.vue"
export default {
components: {
@@ -73,5 +69,5 @@
</script>
<style lang="scss" scoped>
-
+
</style>
diff --git a/minipro_standard/pages/mine/mine.vue b/minipro_standard/pages/mine/mine.vue
index 417e0d4..081c8eb 100644
--- a/minipro_standard/pages/mine/mine.vue
+++ b/minipro_standard/pages/mine/mine.vue
@@ -1,8 +1,31 @@
<template>
- <view>
-
- <myTabbar :index="2" />
- </view>
+<view>
+ <div class="box">
+ <div class="box_info" :style="{background: 'url(' + img + ')'}">
+ <image src="@/static/2@2x.png" mode="widthFix" />
+ <div class="box_info_box">
+ <text>寮犱笁</text>
+ <div class="box_info_box_x">
+ <text>璞嗙背绉戞妧</text>
+ <image src="@/static/mine_ic_change@2x.png" alt="" />
+ </div>
+ </div>
+ </div>
+ <div class="box_function">
+ <div class="box_function_item" v-for="(item, index) in MENU" :key="index">
+ <div class="box_function_item_left">
+ <image :src="item.icon" alt="" />
+ <text>{{item.name}}</text>
+ </div>
+ <div class="box_function_item_right">
+ <van-icon name="arrow" size="20" color="#CCCCCC" />
+ </div>
+ </div>
+ </div>
+ <div class="box_out"><text>閫�鍑虹櫥褰�</text></div>
+ </div>
+ <myTabbar :index="2" />
+</view>
</template>
<script>
@@ -13,15 +36,19 @@
},
data() {
return {
- form: {
- account: '',
- password: '',
- },
- logining: false,
- openId: ''
+ MENU: [
+ { name: '涓汉淇℃伅', url: '/personal/personalInformation', icon: require('@/static/mine_ic_gerenxinxi@2x.png') },
+ // { name: '绯荤粺閫氱煡', url: '', icon: require('@/assets/icon/mine_ic_xitonggonggao@2x.png') },
+ { name: '鏇存柊鎵嬫満鍙�', url: '/personal/updatePhone', icon: require('@/static/mine_ic_shoujihao@2x.png') },
+ { name: '鏇存柊閭鍙�', url: '/personal/updateMailbox', icon: require('@/static/mine_ic_youxianghao@2x.png') },
+ { name: '鎵爜缁戝畾璐﹀彿', url: '', icon: require('@/static/mine_ic_bangding@2x.png') },
+ { name: '淇敼瀵嗙爜', url: '/personal/changePassword', icon: require('@/static/mine_ic_xiugaimima@2x.png') },
+ ],
+ img: require('@/static/mine_bg@2x.png')
}
},
onLoad() {
+ uni.hideTabBar()
// uni.login({
// success: data => {
// this.wxLogin(data.code)
@@ -32,43 +59,96 @@
// })
},
methods: {
- // loginAction() {
- // if (!this.form.account || !this.form.password) {
- // uni.$u.toast('璐﹀彿鎴栬�呭瘑鐮佷笉鑳戒负绌�')
- // }
- // this.logining = true
- // coustomLogin({...this.form, openid: this.openId})
- // .then(res => {
- // this.$store.commit('SETTOKEN', res.token)
- // this.$store.commit('SETUSERINFO', res)
- // uni.navigateTo({
- // url:'/pages/projectList/projectList'
- // })
- // })
- // .finally(() => {
- // this.logining = false
- // })
- // },
- // wxLogin(code) {
- // wxEmpower({code})
- // .then(res => {
- // this.openId = res.openid
- // if (res.userInfo) {
- // this.$store.commit('SETTOKEN', res.userInfo.token)
- // this.$store.commit('SETUSERINFO', res.userInfo)
- // uni.navigateTo({
- // url:'/pages/projectList/projectList'
- // })
- // }
- // })
- // .catch(err => {
- // uni.$u.toast(err)
- // })
- // }
}
}
</script>
<style lang="scss" scoped>
-
+ .box {
+ width: 100%;
+ padding: 30rpx;
+ box-sizing: border-box;
+ .box_info {
+ padding: 0 30rpx;
+ height: 168rpx;
+ border-radius: 16rpx;
+ display: flex;
+ align-items: center;
+ background-repeat: no-repeat;
+ background-size: cover;
+ image {
+ width: 88rpx;
+ height: 88rpx;
+ }
+ .box_info_box {
+ height: 88rpx;
+ display: flex;
+ margin-left: 30rpx;
+ flex-direction: column;
+ justify-content: space-between;
+ .box_info_box_x {
+ display: flex;
+ align-items: center;
+ text {
+ font-size: 26rpx;
+ font-weight: 400;
+ color: rgba(255, 255, 255, 0.8);
+ }
+ image {
+ width: 26rpx;
+ height: 26rpx;
+ margin-left: 10rpx;
+ }
+ }
+ text {
+ font-size: 34rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ }
+ }
+ }
+ .box_function {
+ margin-top: 30rpx;
+ .box_function_item {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ height: 98rpx;
+ border-bottom: 1rpx solid #E5E5E5;
+ /*&:last-child {*/
+ /* border: none;*/
+ /*}*/
+ .box_function_item_left {
+ display: flex;
+ align-items: center;
+ image {
+ width: 36rpx;
+ height: 36rpx;
+ margin-right: 24rpx;
+ }
+ text {
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #222222;
+ }
+ }
+ }
+ }
+ .box_out {
+ position: fixed;
+ bottom: 200rpx;
+ left: 50%;
+ transform: translate(-50%, 0);
+ width: 350rpx;
+ height: 88rpx;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #333333;
+ }
+ }
</style>
diff --git a/minipro_standard/pages/workbench/workbench.vue b/minipro_standard/pages/workbench/workbench.vue
index 8d77569..01a623e 100644
--- a/minipro_standard/pages/workbench/workbench.vue
+++ b/minipro_standard/pages/workbench/workbench.vue
@@ -1,6 +1,21 @@
<template>
- <view>
-
+ <view class="index">
+ <view class="menu">
+ <view class="menu_list" v-for="(row, i) in 3" :key="i">
+ <view class="menu_list_head">
+ <span>甯哥敤鍔熻兘</span>
+ </view>
+ <div class="menu_list_list">
+ <view class="menu_list_item" v-for="item in list" :key="item.id" @click="jump(item)">
+ <image :src="item.icon" mode="widthFix" />
+ <span>{{item.label}}</span>
+ </view>
+ <view class="menu_list_zw"></view>
+ <view class="menu_list_zw"></view>
+ <view class="menu_list_zw"></view>
+ </div>
+ </view>
+ </view>
<myTabbar :index="1" />
</view>
</template>
@@ -14,7 +29,32 @@
},
data() {
return {
-
+ list: [
+ {
+ icon: require('@/static/logo@2x.png'),
+ label: '娴嬭瘯'
+ },
+ {
+ icon: require('@/static/logo@2x.png'),
+ label: '娴嬭瘯'
+ },
+ {
+ icon: require('@/static/logo@2x.png'),
+ label: '娴嬭瘯'
+ },
+ {
+ icon: require('@/static/logo@2x.png'),
+ label: '娴嬭瘯'
+ },
+ {
+ icon: require('@/static/logo@2x.png'),
+ label: '娴嬭瘯'
+ },
+ {
+ icon: require('@/static/logo@2x.png'),
+ label: '娴嬭瘯'
+ }
+ ]
};
},
onLoad() {
@@ -49,7 +89,88 @@
}
}
</script>
-
-<style lang="scss">
-
+<style>
+ page {
+ background-color: #F7F7F7 !important;
+ }
+</style>
+<style scoped lang="scss">
+.index {
+ width: 100%;
+ .menu {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ .menu_list {
+ display: flex;
+ flex-direction: column;
+ padding: 30rpx;
+ box-sizing: border-box;
+ margin-bottom: 20rpx;
+ background: white;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ .menu_list_head {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 40rpx;
+ span {
+ font-size: 32rpx;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #222222;
+ }
+ }
+ .menu_list_list {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ .menu_list_zw {
+ width: 20%;
+ height: 0;
+ }
+ .menu_list_item {
+ width: 20%;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ margin-top: 40rpx;
+ &:nth-child(1) {
+ margin: 0;
+ }
+ &:nth-child(2) {
+ margin: 0;
+ }
+ &:nth-child(3) {
+ margin: 0;
+ }
+ &:nth-child(4) {
+ margin: 0;
+ }
+ &:nth-child(5) {
+ margin: 0;
+ }
+ image {
+ width: 88rpx;
+ height: 88rpx;
+ border-radius: 24rpx;
+ overflow: hidden;
+ }
+ span {
+ font-size: 24rpx;
+ font-weight: 400;
+ color: #333333;
+ margin-top: 16rpx;
+ }
+ }
+ }
+ }
+ }
+}
</style>
diff --git a/minipro_standard/util/request/responseInterceptors.js b/minipro_standard/util/request/responseInterceptors.js
index d2fe335..a88ed54 100644
--- a/minipro_standard/util/request/responseInterceptors.js
+++ b/minipro_standard/util/request/responseInterceptors.js
@@ -7,18 +7,18 @@
/* 瀵瑰搷搴旀垚鍔熷仛鐐逛粈涔� 鍙娇鐢╝sync await 鍋氬紓姝ユ搷浣�*/
const data = response.data
// 鑷畾涔夊弬鏁�
- const custom = response.config?.custom
- if (data.code !== 200) { // 鏈嶅姟绔繑鍥炵殑鐘舵�佺爜涓嶇瓑浜�200锛屽垯reject()
- uni.$u.toast(data.message)
- if (data.code === 401) {
- // console.log('鏈櫥褰曘�佺櫥褰曞け鏁�');
- // 鏈櫥褰曘�佺櫥褰曞け鏁�
- uni.reLaunch({
- url: '/pages/login/login'
- })
- }
- return Promise.reject(data)
- }
+ // const custom = response.config?.custom
+ // if (data.code !== 200) { // 鏈嶅姟绔繑鍥炵殑鐘舵�佺爜涓嶇瓑浜�200锛屽垯reject()
+ // uni.$u.toast(data.message)
+ // if (data.code === 401) {
+ // // console.log('鏈櫥褰曘�佺櫥褰曞け鏁�');
+ // // 鏈櫥褰曘�佺櫥褰曞け鏁�
+ // uni.reLaunch({
+ // url: '/pages/login/login'
+ // })
+ // }
+ // return Promise.reject(data)
+ // }
// console.log(data.data);
return data.data || {}
}, (response) => {
diff --git a/platform_web/.env.development b/platform_web/.env.development
index d2d1b54..53c2611 100644
--- a/platform_web/.env.development
+++ b/platform_web/.env.development
@@ -16,7 +16,10 @@
#姹熻悕鏈湴
-VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'
+# VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'
+
+#鐒︽澗
+VUE_APP_BASE_URL = 'http://192.168.0.36:10021/'
#鍒樼纾婃湰鍦�
# VUE_APP_BASE_URL = 'http://192.168.0.18:10021/'
diff --git a/platform_web/src/views/business/clientRecord.vue b/platform_web/src/views/business/clientRecord.vue
index 6c87c4a..cdde56a 100644
--- a/platform_web/src/views/business/clientRecord.vue
+++ b/platform_web/src/views/business/clientRecord.vue
@@ -33,7 +33,7 @@
</template>
</el-table-column>
<el-table-column prop="detail" label="澶囨敞" align="center" min-width="180px"></el-table-column>
- <el-table-column prop="updateUser" label="鎿嶄綔浜�" align="center" min-width="100px"></el-table-column>
+ <el-table-column prop="createUserName" label="鎿嶄綔浜�" align="center" min-width="100px"></el-table-column>
<el-table-column prop="createTime" label="鎿嶄綔鏃堕棿" align="center" min-width="140px"></el-table-column>
</el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
diff --git a/screen_standard/.env.development b/screen_standard/.env.development
index faee205..5c3ce22 100644
--- a/screen_standard/.env.development
+++ b/screen_standard/.env.development
@@ -6,6 +6,11 @@
#VITE_BASE_URL='http://192.168.0.35:10021'
# VITE_BASE_PATH='/doumeeplant_api'
+<<<<<<< HEAD
# VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api/'
-VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
\ No newline at end of file
+VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
+=======
+VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api'
+# VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
+>>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10
diff --git a/screen_standard/.env.production b/screen_standard/.env.production
index bb4353f..e332e9c 100644
--- a/screen_standard/.env.production
+++ b/screen_standard/.env.production
@@ -1,5 +1,5 @@
NODE_ENV = production
VITE_NAME = '鐢熶骇鐜'
VITE_BASE_CONTEXT = 'screen'
-VITE_BASE_PATH = '/doumeeplant'
-VITE_BASE_URL = 'https://www.mes.red/doumeeplant/'
\ No newline at end of file
+VITE_BASE_PATH = '/api'
+VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
\ No newline at end of file
diff --git a/screen_standard/.env.staging b/screen_standard/.env.staging
index bcb56b5..a511b8c 100644
--- a/screen_standard/.env.staging
+++ b/screen_standard/.env.staging
@@ -2,4 +2,4 @@
VITE_NAME='娴嬭瘯鐜'
VITE_BASE_CONTEXT='doumeeplant_screen'
VITE_BASE_PATH='/doumeeplant_api'
-VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api/'
\ No newline at end of file
+VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api'
\ No newline at end of file
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 7604b4d..22f0e80 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -25,10 +25,6 @@
<img v-if="!isFull" src="@/assets/img/ic_fullscreen@2x.png" class="full-ic" @click="fullChange">
<img v-else src="@/assets/img/ic_exitfullscreen@2x.png" class="full-ic" @click="fullChange">
<img src="@/assets/img/title_line@2x.png" class="right-line" alt="">
-
- <template>
- <v-mini-weather></v-mini-weather>
- </template>
<div class="date">
<div class="time">{{ tempDate.time }}</div>
<div class="day">{{ `${tempDate.date} ${tempDate.day}` }}</div>
@@ -63,8 +59,6 @@
import { reactive, toRefs, onMounted, computed } from 'vue';
import { useCounterStore } from '@/stores/counter.js'
import { useRoute, useRouter } from 'vue-router'
-import { vMiniWeather } from 'vue-mini-weather'
-// export default { components: {vMiniWeather }}
const enterprise = useCounterStore()
const route = useRoute()
const router = useRouter()
@@ -88,7 +82,7 @@
return enterprise.deviceNum
})
const unqualifiedRate = computed(() => {
- return +enterprise.unqualifiedRate.toFixed(2)
+ return enterprise.unqualifiedRate
})
const title = computed(() => {
return enterprise.procedureName ? `${enterprise.procedureName}宸ュ簭鏁版嵁鐪嬫澘` : 'DM浜戝伐鍘傝溅闂村ぇ灞�'
@@ -166,7 +160,7 @@
}
}, 1000)
// console.log(date.getDay());
-
+
})
const back = () => {
enterprise.setProcedureName('')
@@ -180,22 +174,18 @@
background-position: center;
background-size: 100% 100%;
background-repeat: no-repeat;
-
// width: 1920px;
// height: 1080px;
width: 100%;
height: 100%;
- padding: 20px 30px;
- overflow-y: scroll;
- display: flex;
- flex-direction: column;
-
+ padding: 30px;
+ // overflow-y: scroll;
box-sizing: border-box;
.header {
background-image: url('@/assets/img/bg_maintitle@2x.png');
- background-size: 100% 70px;
+ background-size: 100% 74px;
width: 100%;
- height: 70px;
+ height: 74px;
display: flex;
padding-top: 1px;
padding-left: 20px;
@@ -263,15 +253,14 @@
}
}
.num-list {
- margin-top: 20px;
- margin-bottom: 20px;
+ margin-top: 24px;
+ margin-bottom: 27px;
display: flex;
justify-content: space-between;
- height: 80px;
+ height: 88px;
color: white;
.num-item {
width: calc(25% - 50px);
- height: 80px;
background-size: 100% 100%;
margin-right: 25px;
padding-left: 30px;
diff --git a/screen_standard/src/router/index.js b/screen_standard/src/router/index.js
index c756cb1..afebefa 100644
--- a/screen_standard/src/router/index.js
+++ b/screen_standard/src/router/index.js
@@ -1,5 +1,5 @@
import { createRouter, createWebHashHistory } from 'vue-router'
-import HomeView from '../views/HomeView.vue'
+// import HomeView from '../views/HomeView.vue'
import indexView from '../views/index.vue'
import processView from '../views/process.vue'
// console.log(import.meta.env.VITE_BASE_CONTEXT);
@@ -10,6 +10,11 @@
routes: [
{
path: '/',
+ redirect: '/home',
+
+ },
+ {
+ path: '/home',
name: 'home',
component: indexView
},
diff --git a/screen_standard/src/stores/counter.js b/screen_standard/src/stores/counter.js
index 9d972af..e3f5613 100644
--- a/screen_standard/src/stores/counter.js
+++ b/screen_standard/src/stores/counter.js
@@ -5,8 +5,8 @@
state: () => {
return {
- companyId: '8',
- departId: '',
+ companyId: window.sessionStorage.getItem('companyId'),
+ departId: window.sessionStorage.getItem('departId'),
delayNum: 0, // 寤舵湡璁″垝鏁�
deviceNum: 0, // 浠婃棩鐢熶骇璁惧鏁�
ingNum: 0, // 鎵ц涓鍒掓暟
diff --git a/screen_standard/src/views/HomeView.vue b/screen_standard/src/views/HomeView.vue
deleted file mode 100644
index 57c3298..0000000
--- a/screen_standard/src/views/HomeView.vue
+++ /dev/null
@@ -1,277 +0,0 @@
-<template>
- <div class="productProcess">
-
- <!-- 濡傛灉椤甸潰鍒锋柊鏁版嵁姣旇緝棰戠箒锛屽彲浠ュ皢loading銆乻howFlag鐨勭浉鍏充唬鐮佸垹闄わ紝闃叉杩囦簬棰戠箒鐨勫嚭鐜板姞杞藉姩鐢� -->
- <div class="loading_div" v-show="!showFlag">
- <div>Loading...</div> <!-- 杩欎釜loading鑷繁鍐欙紝浠ｇ爜娌¤创鍑烘潵 -->
- </div>
-
- <div class="success_info_body" v-show="showFlag">
- <!-- 鍙傛暟鍚嶇О銆佸垪鏁版牴鎹疄闄呮儏鍐佃皟鏁� -->
- <div class="table_body">
- <div class="table_th">
- <div class="tr1 th_style">鎺掍骇缂栧彿</div>
- <div class="tr2 th_style">绫诲瀷</div>
- <div class="tr3 th_style">鏃ユ湡</div>
- <div class="tr4 th_style">杩涘害</div>
- </div>
- <div class="table_main_body">
- <div class="table_inner_body" :style="{top: tableTop + 'px'}">
- <div class="table_tr" v-for="(item,index) in tableList" :key="index">
- <div class="tr1 tr">{{item.planNo}}</div>
- <div class="tr2 tr">{{item.type}}</div>
- <div class="tr3 tr" v-if="item.startDate!='-'">{{item.startDate}} ~ {{item.endDate}}</div>
- <div class="tr3 tr" v-else>-</div>
- <div class="tr4 tr" v-if="item.process!='-'">{{Number(item.process).toFixed(2)}} %</div>
- <div class="tr4 tr" v-else>-</div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-</template>
-
-<script>
-export default {
-
- data() {
- return {
- showFlag: true,
- tableTimer: null,
- tableTop: 0,
- tableList: [],
- tableList:
- [{
- "process":0.0000,
- "planNo":"BP2022060701",
- "endDate":"2022-06-07",
- "type":"鐮屽潡",
- "startDate":"2022-06-07"
- },
- {
- "process":0.0000,
- "planNo":"BP2022060701",
- "endDate":"2022-06-07",
- "type":"鐮屽潡",
- "startDate":"2022-06-07"
- },
- {
- "process":0.0000,
- "planNo":"BP2022060701",
- "endDate":"2022-06-07",
- "type":"鐮屽潡",
- "startDate":"2022-06-07"
- },
- {
- "process":0.0000,
- "planNo":"BP2022060701",
- "endDate":"2022-06-07",
- "type":"鐮屽潡",
- "startDate":"2022-06-07"
- },
- {
- "process":0.0000,
- "planNo":"BP2022060701",
- "endDate":"2022-06-07",
- "type":"鐮屽潡",
- "startDate":"2022-06-07"
- },
- {
- "process":0.0000,
- "planNo":"BP2022060701",
- "endDate":"2022-06-07",
- "type":"鐮屽潡",
- "startDate":"2022-06-07"
- },
- {
- "process":0.0000,
- "planNo":"BP2022060701",
- "endDate":"2022-06-07",
- "type":"鐮屽潡",
- "startDate":"2022-06-07"
- },
-
- {
- "process":0.0000,
- "planNo":"WP2022061301",
- "endDate":"2022-06-13",
- "type":"澧欐澘",
- "startDate":"2022-06-13"
- }],
-
- tableListSize: 0,
- componentTimer: null,
-
- //闇�瑕佹牴鎹儏鍐佃缃殑鍙傛暟
- title: "鎺掍骇杩涘害",
- visibleSize: 6, //瀹瑰櫒鍐呭彲瑙嗘渶澶у畬鏁磋鏁�
- lineHeight: 49, //姣忚鐨勫疄闄呴珮搴︼紙鍖呭惈margin-top/bottom,border绛夛級
- componentTimerInterval: 3600000, //鍒锋柊鏁版嵁鐨勬椂闂撮棿闅�
- tableTimerInterval: 100 //鍚戜笂婊氬姩 1px 鎵�闇�瑕佺殑鏃堕棿锛岃秺灏忚秺蹇紝鎺ㄨ崘鍊� 100
- };
- },
-
- //濡傛灉娌℃湁鐖跺厓绱犱紶鍊硷紝灏唚atch鍐呯殑鍐呭鎼嚦mounted涓嵆鍙�
- props: ["activeFactoryId"],
- watch: {
- activeFactoryId(val, oldVal) {
- clearInterval(this.componentTimer);
- this.bsGetProductProcess();
- this.componentTimerFun();
- }
- },
- mounted() {
- clearInterval(this.componentTimer);
- this.bsGetProductProcess();
- this.componentTimerFun();
- },
- beforeDestroy() {
- clearInterval(this.componentTimer);
- clearInterval(this.tableTimer);
- },
- methods: {
- //璋冪敤鏁版嵁鎺ュ彛锛岃幏鍙栧垪琛ㄦ暟鎹紝鏍规嵁鑷繁鎯呭喌濉帴鍙rl
- bsGetProductProcess() {
- clearInterval(this.tableTimer);
- this.tableTop = 0;
- this.showFlag = true;
- this.tableActionFun();
- // if (this.activeFactoryId != "") {
- // this.showFlag = false;
- // this.$ajax({
- // method: "get",
- // url: `` //鏍规嵁鑷繁鎯呭喌濉帴鍙rl
- // })
- // .then(res => {
- // this.tableList = res.data.data;
- // this.showFlag = true;
- // this.tableActionFun();
- // })
- // .catch(function(err) {
- // console.log("bsGetProductProcess error!");
- // });
- // }
- },
- tableActionFun() {
- this.tableListSize = this.tableList.length;
- if (this.tableListSize > this.visibleSize) {
- this.tableList = this.tableList.concat(this.tableList);
- this.tableTimerFun();
- } else {
- this.fillTableList();
- }
- },
- //褰撴暟鎹繃灏戞椂锛屼笉瑙﹀彂鑷姩杞挱浜嬩欢锛屽苟濉厖娌℃湁鏁版嵁鐨勮锛屽弬鏁版牴鎹疄闄呮儏鍐典慨鏀瑰嵆鍙�
- fillTableList() {
- var addLength = this.visibleSize - this.tableListSize;
- for (var i = 0; i < addLength; i++) {
- this.tableList.push({
- planNo: "-",
- type: "-",
- startDate: "-",
- endDate: "-",
- process: "-"
- });
- }
- },
- tableTimerFun() {
- var count = 0;
- this.tableTimer = setInterval(() => {
- if (count < (this.tableList.length / 2) * this.lineHeight) {
- this.tableTop -= 1;
- count++;
- } else {
- count = 0;
- this.tableTop = 0;
- }
- }, this.tableTimerInterval);
- },
- componentTimerFun() {
- this.componentTimer = setInterval(() => {
- this.bsGetProductProcess();
- }, this.componentTimerInterval);
- }
- }
-};
-</script>
-
-<style scoped>
-.productProcess {
- width: 550px;
- height: 415px;
-}
-.loading_div {
- /* color: #eee; */
- padding-top: 100px;
-}
-.title_div {
- width: 100%;
-}
-.table_body {
- width: 100%;
- margin-top: 15px;
-}
-.table_th {
- width: 100%;
- display: flex;
- height: 40px;
- line-height: 40px;
-}
-.tr {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- box-sizing: border-box;
- padding: 0 5px;
- text-align: center;
- font-size: 14px;
-}
-.tr1 {
- width: 28%;
-}
-.tr2 {
- width: 15%;
-}
-.tr3 {
- width: 35%;
- font-size: 13px;
-}
-
-.tr4 {
- flex: 1;
-}
-
-.th_style {
- color: rgb(0, 221, 253);
- font-weight: bold;
- font-size: 18px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- box-sizing: border-box;
- padding: 0 5px;
- text-align: center;
-}
-.table_main_body {
- width: 100%;
- height: 294px;
- overflow: hidden;
- position: relative;
-}
-.table_inner_body {
- width: 100%;
- position: absolute;
- left: 0;
-}
-.table_tr {
- display: flex;
- height: 40px;
- line-height: 40px;
- color: #eee;
- font-size: 15px;
- background: rgba(3, 145, 167, 0.1);
- border: 1px solid rgb(4, 114, 131);
- margin-top: 7px;
-}
-</style>
\ No newline at end of file
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index e477f37..16b27c6 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -157,7 +157,7 @@
<span>杩�7澶╀笉鑹搧鍒嗗竷</span>
</div>
<div class="content_right_top_nr">
-
+
<div class="content_right_top_nr_top" id="lineChrat"></div>
<div class="content_right_top_nr_bottom">
<div class="content_right_top_nr_bottom_yuan" v-if="data.typeDistribution.length > 0">
@@ -166,7 +166,7 @@
</div>
<div id="pieChart"></div>
</div>
-
+
</div>
</div>
<!-- 璁惧宸℃璁板綍 -->
@@ -319,8 +319,8 @@
}
}
})
-
-
+
+
// 鎶ュ伐鏃ュ織
getRecordLogPage(companyId.value, departId.value, {
capacity: 20,
@@ -1093,7 +1093,7 @@
&:nth-child(5) {
flex: 3;
-
+
}
}
}
diff --git a/screen_standard/src/views/process.vue b/screen_standard/src/views/process.vue
index 119ac7c..5ddfde1 100644
--- a/screen_standard/src/views/process.vue
+++ b/screen_standard/src/views/process.vue
@@ -113,7 +113,7 @@
</template>
<script setup>
-import { reactive, ref, toRefs, onMounted, onBeforeUnmount, onUnmounted } from 'vue'
+import { reactive, ref, toRefs, onMounted, onUnmounted, nextTick } from 'vue'
import { getProcedurePlanData, getTop, getProcedurePlansList, getRecordLogPage, getUnqualified7DayData, getUnqualifiedCateData } from '@/utils/api.js'
import { useCounterStore } from '@/stores/counter.js'
import { useRoute } from 'vue-router'
@@ -122,8 +122,7 @@
const route = useRoute()
const enterprise = useCounterStore()
let mainTimer = ref(null)
-let planTimer = ref(null)
-let reportTimer = ref(null)
+let scrollTimer = ref(null)
let planContainer = ref(null)
let reportLogContainer = ref(null)
const data = reactive({
@@ -140,19 +139,26 @@
{ categoryName: '灏哄涓嶈壇', unqualifiedNum: 22 },
{ categoryName: '鏈夊垝鐥�', unqualifiedNum: 5 },
{ categoryName: '鍏朵粬', unqualifiedNum: 2 },
- ]
+ ],
+ planScroll: false,
+ reportScroll: false,
})
let { listData, top1, top2, baseNum, allBad, reportListData } = toRefs(data)
-// start()
-onBeforeUnmount(() => {
- clearTimeout(planTimer.value)
- clearTimeout(reportTimer.value)
- clearTimeout(mainTimer.value)
-})
onMounted(() => {
+ window.addEventListener('resize', () => {
+ console.log('resize');
+ nextTick(() => {
+ setDayChart()
+ setTypeChart()
+ })
+ })
initData()
+ scrollTimer.value = setInterval(() => {
+ ListScroll()
+ reportScroll()
+ }, 100)
mainTimer.value = setInterval(() => {
initData()
}, 60000)
@@ -160,8 +166,7 @@
onUnmounted(() => {
- clearTimeout(planTimer.value)
- clearTimeout(reportTimer.value)
+ clearTimeout(scrollTimer.value)
clearTimeout(mainTimer.value)
})
@@ -175,7 +180,6 @@
getTop(enterprise.companyId, enterprise.departId, { procedureId: route.query.procedureId })
.then(res => {
if (res.length) {
-
data.baseNum = res[0].doneNum
data.top1 = []
data.top2 = []
@@ -196,52 +200,46 @@
getProcedurePlansList(enterprise.companyId, enterprise.departId, { procedureId: route.query.procedureId })
.then(res => {
data.listData = res
- start()
+ data.planScroll = true
})
// 鎶ュ伐鏃ュ織鍒嗛〉鏌ヨ
getRecordLogPage(enterprise.companyId, enterprise.departId, { capacity: 20, page: 1, model: { procedureId: route.query.procedureId } })
.then(res => {
data.reportListData = res.records
- reportStart()
+ data.reportScroll = true
})
getUnqualified7DayData(enterprise.companyId, enterprise.departId, route.query.procedureId)
.then(res => {
data.dayDistribution = res
+ data.allBad = res.reduce((accumulator, currentValue) => accumulator + currentValue.unqualifiedNum, 0)
setDayChart()
})
getUnqualifiedCateData(enterprise.companyId, enterprise.departId, route.query.procedureId)
.then(res => {
data.typeDistribution = res
- data.allBad = res.reduce((accumulator, currentValue) => accumulator + currentValue.unqualifiedNum, 0)
setTypeChart()
})
}
-
+// 榧犳爣绉诲叆
function handleMouseEnter() {
- clearTimeout(planTimer.value)
+ data.planScroll = false
}
function handleMouseLeave() {
- start()
+ data.planScroll = true
}
-
+// 榧犳爣绉婚櫎
function handleMouseEnterReport() {
- clearTimeout(reportTimer.value)
+ data.reportScroll = false
}
function handleMouseLeaveReport() {
- reportStart()
+ data.reportScroll = true
}
/**
- * 宸ュ簭璁″垝
+ * 宸ュ簭璁″垝婊氬姩鏂规硶
*/
-// 寮�鍚畾鏃跺櫒
-function start() {
- clearTimeout(planTimer.value)
- // 瀹氭椂鍣ㄨЕ鍙戝懆鏈�
- // let speed = ref(100)
- planTimer.value = setInterval(ListScroll, 100)
-}
function ListScroll() {
+ if (!data.planScroll) return
let scrollDom = planContainer.value
if (!scrollDom) return
// 鍒よ缁勪欢鏄惁娓叉煋瀹屾垚
@@ -249,14 +247,14 @@
scrollDom = planContainer.value
} else {
// 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
- if (scrollDom.children.length < 10) {
- clearTimeout(planTimer.value)
+ if (scrollDom.children.length < 11) {
+ data.planScroll = false
return
}
// 缁勪欢杩涜婊氬姩
- scrollDom.scrollTop += 1.5
+ scrollDom.scrollTop += 2
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight - 2)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -267,15 +265,10 @@
}
}
/**
- * 鎶ュ伐鏃ュ織
+ * 鎶ュ伐鏃ュ織婊氬姩鏂规硶
*/
-function reportStart() {
- clearTimeout(reportTimer.value)
- // 瀹氭椂鍣ㄨЕ鍙戝懆鏈�
- // let speed = ref(100)
- reportTimer.value = setInterval(reportScroll, 100)
-}
function reportScroll() {
+ if (!data.reportScroll) return
let scrollDom = reportLogContainer.value
if (!scrollDom) return
// 鍒よ缁勪欢鏄惁娓叉煋瀹屾垚
@@ -284,13 +277,13 @@
} else {
// 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
if (scrollDom.children.length < 10) {
- clearTimeout(reportTimer.value)
+ data.reportScroll = false
return
}
// 缁勪欢杩涜婊氬姩
- scrollDom.scrollTop += 1.5
+ scrollDom.scrollTop += 2
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight - 2)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -321,6 +314,10 @@
color: '#fff',
fontSize: 12
}
+ },
+ grid: {
+ top: 40,
+ bottom: 40
},
xAxis: {
type: 'category',
@@ -397,6 +394,7 @@
*/
function setTypeChart() {
let dayChartDom = document.getElementById('type-distribution');
+ console.log(dayChartDom);
let myChart = echarts.init(dayChartDom);
let legendData = []
let seriesData = []
@@ -495,13 +493,14 @@
flex: 1;
margin-right: 20px;
.proccess-plan {
- height: 424px;
+ height: 464px;
background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
margin-bottom: 20px;
}
.today-yield {
- height: calc(100vh - 690px);;
+ height: calc(100vh - 725px);
+ min-height: 226px;
background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
.yield-content {
@@ -601,13 +600,14 @@
flex: 1;
.report-log {
- height: 424px;
+ height: 464px;
background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
margin-bottom: 20px;
}
.bad-diagram {
- height:calc(100vh - 690px);;
+ height:calc(100vh - 725px);;
+ min-height: 226px;
background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
.bad-content {
diff --git a/screen_standard/vite.config.js b/screen_standard/vite.config.js
index 0861b64..966fbbe 100644
--- a/screen_standard/vite.config.js
+++ b/screen_standard/vite.config.js
@@ -11,6 +11,10 @@
// https://vitejs.dev/config/
export default defineConfig(({mode, command}) => {
let env = loadEnv(mode, process.cwd(), '')
+ console.log('-------');
+ console.log(env.VITE_BASE_PATH);
+ console.log(env.VITE_BASE_PATH.replace(env.VITE_BASE_PATH, ''));
+ console.log('-------');
return {
base:env.VITE_BASE_CONTEXT,
plugins: [
@@ -47,8 +51,20 @@
changeOrigin: true,
ws: false, // 鍏佽websocket浠ｇ悊
secure: false,
+<<<<<<< HEAD
rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/')
}
+=======
+ rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/'),
+ // rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
+ },
+ /*'/api' : {
+ target: env.VITE_BASE_URL, // 閫氳繃浠ｇ悊鎺ュ彛璁块棶瀹為檯鍦板潃銆傝繖閲屾槸瀹為檯璁块棶鐨勫湴鍧�銆倂ue浼氶�氳繃浠ｇ悊鏈嶅姟鍣ㄦ潵浠ｇ悊璇锋眰
+ changeOrigin: true,
+ ws: false, // 鍏佽websocket浠ｇ悊
+ rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
+ }*/
+>>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10
}
}
}
diff --git a/server/src/main/java/doumeemes/dao/business/model/CompanyLog.java b/server/src/main/java/doumeemes/dao/business/model/CompanyLog.java
index a197041..954a517 100644
--- a/server/src/main/java/doumeemes/dao/business/model/CompanyLog.java
+++ b/server/src/main/java/doumeemes/dao/business/model/CompanyLog.java
@@ -36,6 +36,7 @@
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ @TableField(exist = false)
private String createUserName;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
--
Gitblit v1.9.3