root/hht-tongbo-acs-two-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

样式

Browse Source
This commit is contained in:
caill
2024-04-02 17:43:30 +08:00
parent d5bf6c8c65
commit 3289561e3b
6 changed files with 55 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/style/mixin.styl
View File

@@ -9,10 +9,12 @@ $fc1 = #323232
background-color: $red !important background-color: $red !important
.bggreen .bggreen
background-color: $green !important background-color: $green !important
color #fff !important
.bgyellow .bgyellow
background-color: $yellow !important background-color: $yellow !important
.bgblue .bgblue
background-color: $blue !important background-color: $blue !important
color #fff !important
.bggray .bggray
background-color: $gray !important background-color: $gray !important

11
pages/login/setup.vue
View File

@@ -7,6 +7,10 @@
<view class="setup-label">服务器地址</view> <view class="setup-label">服务器地址</view>
<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip"> <input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
</view> </view>
<!-- <view class="setup-item">
<view class="setup-label">ACS地址</view>
<input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip">
</view> -->
<view class="setup-item"> <view class="setup-item">
<view class="setup-label">刷新时间(s)</view> <view class="setup-label">刷新时间(s)</view>
<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime"> <input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
@@ -47,6 +51,13 @@
}) })
return return
} }
// if (this.acsip === '') {
// uni.showToast({
// title: '请填写ACS地址',
// icon: 'none'
// })
// return
// }
if (this.setTime === '') { if (this.setTime === '') {
uni.showToast({ uni.showToast({
title: '请填写刷新时间', title: '请填写刷新时间',

65
pages/manage/point-manage.vue
View File

@@ -1,16 +1,16 @@
<template> <template>
<view class="zd_container"> <view class="zd_container">
<nav-bar title="呼叫管理"></nav-bar> <nav-bar title="呼叫管理"></nav-bar>
<view class="zd-row jcflexstart state-wrap"> <!-- <view class="zd-row jcflexstart state-wrap">
<view class="zd-col-4 zd-row jcflexstart" v-for="e in state"> <view class="zd-col-4 zd-row jcflexstart" v-for="e in state">
<view class="state-color" :class="e.color"></view> <view class="state-color" :class="e.color"></view>
<view class="state-name">{{e.name}}</view> <view class="state-name">{{e.name}}</view>
</view> </view>
</view> </view> -->
<view class="zd-row mgb10 xzd-wraper"> <view class="zd-row mgb10 xzd-wraper">
<view class="zd-col-11 item-font-6">起:{{sObj.device_name}}</view> <view class="zd-col-11 item-font-6 bggreen">起:{{sObj.device_name}}</view>
<view class="zd-col-1 item-font-7">&ndash;</view> <view class="zd-col-1 item-font-7">&ndash;</view>
<view class="zd-col-11 item-font-6">终:{{nObj.device_name}}</view> <view class="zd-col-11 item-font-6 bgblue">终:{{nObj.device_name}}</view>
</view> </view>
<view class="zd_content"> <view class="zd_content">
<view class="zd_wrapper grid-wraper"> <view class="zd_wrapper grid-wraper">
@@ -21,9 +21,9 @@
</view> </view>
<view v-show="e.checked === true" class="site_block" ref="liCon"> <view v-show="e.checked === true" class="site_block" ref="liCon">
<view class="site_item" v-for="(el, i) in e.pointArr" :key="i"> <view class="site_item" v-for="(el, i) in e.pointArr" :key="i">
<view class="site_item_box" :class="['bggray', 'bggreen'][Number(el.status)]" @click="setcode(el)"> <view class="site_item_box" :class="{'bggreen': sObj.device_code === el.device_code, 'bgblue': nObj.device_code === el.device_code}" @click="setcode(el)">
<text class="title_1">{{el.device_name}}</text> <view class="title_1">{{el.device_name}}</view>
<text class="title_2">来源:{{el.source_device}}</text> <view class="title_2">{{el.device_code}}</view>
</view> </view>
</view> </view>
</view> </view>
@@ -31,10 +31,10 @@
</view> </view>
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<button class="zd-col-5 button-default" @click="cancle">清空</button> <button class="zd-col-4 button-default" @click="cancle">清空</button>
<button class="zd-col-5 button-primary" :class="{'button-info': JSON.stringify(sObj) === '{}' && JSON.stringify(nObj) === '{}'}" :disabled="disabled" @tap="_callTask('1')">生箔换轴</button> <button class="zd-col-6 button-primary" :class="{'button-info': JSON.stringify(sObj) === '{}' && JSON.stringify(nObj) === '{}'}" :disabled="disabled" @tap="_callTask('1')">生箔换轴</button>
<button class="zd-col-5 button-primary" :class="{'button-info': JSON.stringify(sObj) === '{}' && JSON.stringify(nObj) === '{}'}" :disabled="disabled" @tap="_callTask('2')">分切换轴</button> <button class="zd-col-6 button-primary" :class="{'button-info': JSON.stringify(sObj) === '{}' && JSON.stringify(nObj) === '{}'}" :disabled="disabled" @tap="_callTask('2')">分切换轴</button>
<button class="zd-col-5 button-primary" :class="{'button-info': JSON.stringify(sObj) === '{}' && JSON.stringify(nObj) === '{}'}" :disabled="disabled" @tap="_callTask('3')">搬运任务</button> <button class="zd-col-6 button-primary" :class="{'button-info': JSON.stringify(sObj) === '{}' && JSON.stringify(nObj) === '{}'}" :disabled="disabled" @tap="_callTask('3')">搬运任务</button>
</view> </view>
</view> </view>
</template> </template>
@@ -83,10 +83,11 @@
}, },
async initArea () { async initArea () {
let res = await queryArea() let res = await queryArea()
this.areaArr = [...res.result] this.areaArr = [...res.data]
this.areaArr.map(el => { this.areaArr.map(el => {
this.$set(el, 'checked', false) this.$set(el, 'checked', false)
this.$set(el, 'pointArr', []) this.$set(el, 'pointArr', [])
this.$set(el, 'region_code', '1')
}) })
if (this.areaArr.length > 0) { if (this.areaArr.length > 0) {
this.getPonit(this.areaArr[0]) this.getPonit(this.areaArr[0])
@@ -97,7 +98,7 @@
this.regobj = e this.regobj = e
this.areaArr.map(el => { this.areaArr.map(el => {
if (el.region_code === e.region_code) { if (el.region_code === e.region_code) {
this.$set(el, 'pointArr', [...res.result]) this.$set(el, 'pointArr', [...res.data])
} }
}) })
}, },
@@ -161,7 +162,7 @@
<style lang="stylus"> <style lang="stylus">
@import '../../common/style/mixin.styl'; @import '../../common/style/mixin.styl';
.zd_content .zd_content
padding-top calc(var(--status-bar-height) + 72rpx) // padding-top calc(var(--status-bar-height) + 72rpx)
padding-bottom 200rpx padding-bottom 200rpx
.locate_block .locate_block
width 100% width 100%
@@ -169,19 +170,20 @@
position relative position relative
_wh(100%,48rpx) _wh(100%,48rpx)
.site_block .site_block
_wh(100%,auto) width 100%
overflow hidden
transition height .3s transition height .3s
_fj(flex-start,,,wrap) _fj(flex-start,,,wrap)
padding-bottom 10rpx
.site_item .site_item
_wh(calc(100% / 3),110rpx) width 49%
padding 5rpx 5rpx padding 5rpx 5rpx
overflow hidden overflow hidden
margin-bottom 10rpx
_fj(center) _fj(center)
&:nth-child(even)
margin-left 2%
.site_item_box .site_item_box
_wh(100%, 100%) _wh(100%, 100%)
padding 10rpx padding 20rpx 10rpx 10rpx 10rpx
background-color rgb(220, 223, 230) background-color rgb(220, 223, 230)
border-radius 10rpx border-radius 10rpx
.title_locate .title_locate
@@ -189,21 +191,19 @@
_font(30rpx,40rpx,#333,bold) _font(30rpx,40rpx,#333,bold)
font-style italic font-style italic
.title_1 .title_1
_wh(100%, 60%) _wh(100%, 40rpx)
_fj(center)
overflow hidden overflow hidden
_font(28rpx,28rpx,#303133,500, center) _font(26rpx,40rpx,#303133,500, center)
.title_2 .title_2
_wh(100%, 40%) _wh(100%, 40rpx)
_fj(center)
overflow hidden overflow hidden
_font(24rpx,25rpx,#303133,500, center) _font(24rpx,40rpx,#999,500, center)
opacity .69
white-space: nowrap
.submit-bar .submit-bar
padding 10rpx box-shadow none
.state-wrap .state-wrap
position fixed position fixed
z-index 200
background #f2f5fa
top calc(var(--status-bar-height) + 72rpx) top calc(var(--status-bar-height) + 72rpx)
_wh(100%, 60rpx) _wh(100%, 60rpx)
padding 0 14rpx padding 0 14rpx
@@ -215,8 +215,13 @@
_font(28rpx, 30rpx, #333) _font(28rpx, 30rpx, #333)
.xzd-wraper .xzd-wraper
position fixed position fixed
bottom 118rpx z-index 200
padding 0 14rpx bottom 100rpx
padding 14rpx
background-color #fff
box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
.button-default, .button-primary .button-default, .button-primary
font-size 30rpx font-size 30rpx
.bgblue .title_1,.bgblue .title_2,.bggreen .title_1,.bggreen .title_2
color #fff
</style> </style>

2
utils/getData2.js
View File

@@ -32,7 +32,7 @@ export const queryArea = () => request({
export const queryPointByArea = (code) => request({ export const queryPointByArea = (code) => request({
url:'api/hand/queryPointByArea', url:'api/hand/queryPointByArea',
data: { data: {
areaCode: code region_code: code
} }
}) })
// 1.3创建任务(生成任务号为-开头) // 1.3创建任务(生成任务号为-开头)

4
utils/mork2.js
View File

@@ -55,13 +55,13 @@ export const taskOperation = (uuid, type) => {
} }
export const queryArea = () => { export const queryArea = () => {
let res = { let res = {
result: [{region_code: '1', region_name: 'A1'}, {region_code: '2', region_name: 'A2'}, {region_code: '3', region_name: 'A2'}, {region_code: '4', region_name: 'A10'}] data: [{region_code: '1', region_name: 'A1'}, {region_code: '2', region_name: 'A2'}, {region_code: '3', region_name: 'A2'}, {region_code: '4', region_name: 'A10'}]
} }
return res return res
} }
export const queryPointByArea = () => { export const queryPointByArea = () => {
let res = { let res = {
result: [{ data: [{
device_code: '1', device_code: '1',
device_name: 'JLDFJLLJ', device_name: 'JLDFJLLJ',
source_device: 'FAL3LAA01', source_device: 'FAL3LAA01',

8
vuex/modules/user.js
View File

@@ -1,13 +1,13 @@
import * as types from '../types' import * as types from '../types'
const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.162:8011' : 'http://192.168.81.162:8011' const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.120:8011' : 'http://192.168.81.120:8011'
const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.162:8010' : 'http://192.168.81.162:8010' const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.120:8010' : 'http://192.168.81.120:8010'
const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.162:8010' : 'http://192.168.81.162:8010' const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.120:8010' : 'http://192.168.81.120:8010'
const state = { const state = {
baseUrl: uni.getStorageSync('baseUrl') || baseUrl, baseUrl: uni.getStorageSync('baseUrl') || baseUrl,
acsUrl: uni.getStorageSync('acsUrl') || acsUrl, acsUrl: uni.getStorageSync('acsUrl') || acsUrl,
printUrl: uni.getStorageSync('printUrl') || printUrl, printUrl: uni.getStorageSync('printUrl') || printUrl,
setTime: uni.getStorageSync('setTime') || 5000, setTime: uni.getStorageSync('setTime') || 50000,
loginName: uni.getStorageSync('loginName') ? uni.getStorageSync('loginName') : '', loginName: uni.getStorageSync('loginName') ? uni.getStorageSync('loginName') : '',
userInfo: uni.getStorageSync('userInfo') ? uni.getStorageSync('userInfo') : '', userInfo: uni.getStorageSync('userInfo') ? uni.getStorageSync('userInfo') : '',
saveToken: uni.getStorageSync('saveToken') || '' saveToken: uni.getStorageSync('saveToken') || ''