admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'yanyan_dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-yjl

Browse Source
This commit is contained in:
jxj_yjl 2023-05-08 15:16:47 +08:00
commit a369220164
15 changed files with 56 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/doc/h52/index.html
View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>过磅预约</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.48293eda.js></script><script src=./static/js/index.722ef6e5.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.48293eda.js></script><script src=./static/js/index.6b4b2665.js></script></body></html>

BIN
public/doc/h52/static/fonts/uniicons.b6d3756e.ttf Normal file
View File

Binary file not shown.

1
public/doc/h52/static/js/index.6b4b2665.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h52/static/js/index.722ef6e5.js
View File

File diff suppressed because one or more lines are too long

1
public/doc/h52/static/js/pages-index-index.085fc621.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h52/static/js/pages-index-index.a938ce18.js
View File

File diff suppressed because one or more lines are too long

1
public/doc/h52/static/js/pages-index-success.2603fea1.js
View File

@ -1 +0,0 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-index-success"],{"204c":function(t,e,n){"use strict";var a=n("8993"),c=n.n(a);c.a},"67f9":function(t,e,n){t.exports=n.p+"static/img/success.dd5cc343.png"},8993:function(t,e,n){var a=n("d24f");"string"===typeof a&&(a=[[t.i,a,""]]),a.locals&&(t.exports=a.locals);var c=n("4f06").default;c("780e5220",a,!0,{sourceMap:!1,shadowMode:!1})},"92cf":function(t,e,n){"use strict";n.r(e);var a=n("e0d7"),c=n("b36e");for(var i in c)"default"!==i&&function(t){n.d(e,t,(function(){return c[t]}))}(i);n("204c");var u,r=n("f0c5"),o=Object(r["a"])(c["default"],a["b"],a["c"],!1,null,"26a0ec7c",null,!1,a["a"],u);e["default"]=o.exports},b36e:function(t,e,n){"use strict";n.r(e);var a=n("e7a5"),c=n.n(a);for(var i in a)"default"!==i&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e["default"]=c.a},d24f:function(t,e,n){var a=n("24fb");e=a(!1),e.push([t.i,".content[data-v-26a0ec7c]{width:100%;height:100%;margin-top:%?350?%}.content .imgStyle[data-v-26a0ec7c]{text-align:center}.content .imgStyle uni-image[data-v-26a0ec7c]{width:%?500?%;height:%?350?%}.content .textStyle[data-v-26a0ec7c]{text-align:center;color:#a4a4a4}",""]),t.exports=e},e0d7:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return c})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return a}));var c=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("v-uni-view",{staticClass:"content"},[a("v-uni-view",{staticClass:"imgStyle"},[a("v-uni-image",{attrs:{src:n("67f9"),mode:""}})],1),a("v-uni-view",{staticClass:"textStyle"},[t._v("提交成功！等待审核...")])],1)},i=[]},e7a5:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={data:function(){return{}},onShow:function(){},methods:{}};e.default=a}}]);

1
public/doc/h52/static/js/pages-index-success.dba2e883.js Normal file
View File

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-index-success"],{"323c":function(t,e,n){"use strict";n.r(e);var a=n("4828"),c=n("b2fb");for(var i in c)"default"!==i&&function(t){n.d(e,t,(function(){return c[t]}))}(i);n("3ed4");var u,r=n("f0c5"),o=Object(r["a"])(c["default"],a["b"],a["c"],!1,null,"63b15739",null,!1,a["a"],u);e["default"]=o.exports},"3ed4":function(t,e,n){"use strict";var a=n("5ce9"),c=n.n(a);c.a},4828:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return c})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return a}));var c=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("v-uni-view",{staticClass:"content"},[a("v-uni-view",{staticClass:"imgStyle"},[a("v-uni-image",{attrs:{src:n("dc9e"),mode:""}})],1),a("v-uni-view",{staticClass:"textStyle"},[t._v("预约成功！")])],1)},i=[]},"5ce9":function(t,e,n){var a=n("c51d");"string"===typeof a&&(a=[[t.i,a,""]]),a.locals&&(t.exports=a.locals);var c=n("4f06").default;c("97dd1448",a,!0,{sourceMap:!1,shadowMode:!1})},"91f5":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={data:function(){return{}},onShow:function(){},methods:{}};e.default=a},b2fb:function(t,e,n){"use strict";n.r(e);var a=n("91f5"),c=n.n(a);for(var i in a)"default"!==i&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e["default"]=c.a},c51d:function(t,e,n){var a=n("24fb");e=a(!1),e.push([t.i,".content[data-v-63b15739]{width:100%;height:100%;margin-top:%?350?%}.content .imgStyle[data-v-63b15739]{text-align:center}.content .imgStyle uni-image[data-v-63b15739]{width:%?500?%;height:%?350?%}.content .textStyle[data-v-63b15739]{text-align:center;color:#a4a4a4}",""]),t.exports=e},dc9e:function(t,e,n){t.exports=n.p+"static/img/success.dd5cc343.png"}}]);

74
src/components/message.vue
View File

@ -39,12 +39,12 @@ import axios from 'axios'
const options = {
connectTimeout: 40000,
clientId:
"mqttjs_" +
'mqttjs_' +
Math.random()
.toString(16)
.substr(2, 8),
username: "root",
password: "123456",
username: 'root',
password: '123456',
clean: true
}
var client = null
@ -143,13 +143,9 @@ export default {
client = null
console.log(client)
// client = null
// mqttX.unsubscribe(this.topicName + this.userId);
// mqttX.unsubscribe(this.topicName + this.userId);
},
mounted() {
this.bindQRCode()
if (this.$route.path == '/project/quality/makeAnAppointment') {
this.showQrCode = true
}
this.selectNowDate()
if (localStorage.getItem('soundList')) {
this.soundList = JSON.parse(localStorage.getItem('soundList'))
@ -171,6 +167,19 @@ export default {
this.mqttMSG()
}
},
watch: {
$route: {
handler(newVal) {
if(newVal.path == '/project/quality/makeAnAppointment'){
this.showQrCode = true;
this.bindQRCode();
}else{
this.showQrCode = false
}
},
},
},
methods: {
//生成车辆录入二维码
bindQRCode: function() {
@ -178,18 +187,19 @@ export default {
let httpUrl = window.location.origin
let projectSn = this.$store.state.projectSn
let baseUrl = axios.defaults.baseURL
let newBaseUrl = baseUrl.slice(0, baseUrl.length - 1)
setTimeout(() => {
new QRCode(this.$refs.qrCodeDiv, {
text: httpUrl + '/doc/h52/index.html?projectSn=' + projectSn +'&baseUrl='+baseUrl,
// text:"下午好",
width: 200,
height: 200,
colorDark: '#333333', //二维码颜色
colorLight: '#ffffff', //二维码背景色
correctLevel: QRCode.CorrectLevel.L //容错率，L/M/H
})
},0)
var qrcode = new QRCode(this.$refs.qrCodeDiv, {
text: httpUrl + '/doc/h52/index.html?projectSn=' + projectSn + '&baseUrl=' + newBaseUrl,
// text:"下午好",
width: 200,
height: 200,
colorDark: '#333333', //二维码颜色
colorLight: '#ffffff', //二维码背景色
correctLevel: QRCode.CorrectLevel.L //容错率，L/M/H
})
}, 0)
},
// sendmes(){
// console.log(1)
@ -281,9 +291,9 @@ export default {
// });
// mqtt连接 +"/#" +workerId
client.on("connect", (e) => {
console.log("连接成功:", this.topicName + this.userId);
client.subscribe(this.topicName + this.userId, { qos: 0 }, (error) => {
client.on('connect', e => {
console.log('连接成功:', this.topicName + this.userId)
client.subscribe(this.topicName + this.userId, { qos: 0 }, error => {
if (!error) {
console.log('订阅成功')
} else {
@ -313,9 +323,9 @@ export default {
// console.log("正在重连:", error);
// });
// 链接异常处理
client.on("error", (error) => {
console.log("连接失败:", error);
});
client.on('error', error => {
console.log('连接失败:', error)
})
},
getData() {
getNoticeListApi({
@ -323,13 +333,13 @@ export default {
startTime: this.toDayDate,
endTime: this.toDayDate,
pageNo: 1,
pageSize: 10,
}).then((res) => {
this.messageList = res.result.records;
});
},
},
};
pageSize: 10
}).then(res => {
this.messageList = res.result.records
})
}
}
}
</script>
<style lang="less" scoped>

2
src/views/projectAdmin/zjsj/command/index.vue
View File

@ -39,7 +39,7 @@
<script>
import LeftOne from './leftOne'
import LeftTwo from './leftTwo'
import LeftThree from './LeftThree'
import LeftThree from './leftThree'
import LeftFour from './leftFour'
import Center from './center'
import CenterBOne from './centerBOne'

4
src/views/projectFront/quality/material/forwardingUnit.vue
View File

@ -20,7 +20,7 @@
<el-table-column prop="chargePhone" label="负责人电话" align="center"></el-table-column>
<el-table-column prop="unitAddress" label="单位地址 " align="center"></el-table-column>
<el-table-column prop="socialCode" label="统一社会信用代码 " align="center"></el-table-column>
<el-table-column label="操作" align="center" width="250">
<el-table-column label="操作" align="center" width="160">
<template slot-scope="scope">
<div class="tableBtns">
<div @click="editBtn(scope.row)" class="operationText">
@ -71,7 +71,7 @@
</span>
</el-dialog>
<el-dialog :modal-append-to-body="false" title="编辑" :visible.sync="dialogVisibleEdit" width="30%" :before-close="handleClose">
<el-form ref="editForm" :model="editForm" label-width="150px">
<el-form ref="editForm" :model="editForm" label-width="150px" :rules="addEditRules">
<el-form-item label="发货单位：" prop="unitName">
<el-input v-model="editForm.unitName" style="width:350px" placeholder="请输入"></el-input>
</el-form-item>

4
src/views/projectFront/quality/material/makeAnAppointment.vue
View File

@ -33,7 +33,7 @@
</template>
</el-table-column>
<el-table-column prop="addDateTime" label="录入时间" align="center"></el-table-column>
<el-table-column label="操作" align="center" width="300">
<el-table-column label="操作" align="center" width="160">
<template slot-scope="scope">
<div class="tableBtns">
<div @click="editBtn(scope.row)" class="operationText">
@ -99,7 +99,7 @@
</span>
</el-dialog>
<el-dialog :modal-append-to-body="false" title="编辑" :visible.sync="dialogVisibleEdit" width="30%" :before-close="handleClose">
<el-form ref="editForm" :model="editForm" label-width="150px">
<el-form ref="editForm" :model="editForm" label-width="150px" :rules="addEditRules">
<el-form-item label="车牌号码：" prop="licensePlate">
<el-input v-model="editForm.licensePlate" style="width:350px" placeholder="请输入"></el-input>
</el-form-item>

2
src/views/projectFront/quality/material/receivingUnit.vue
View File

@ -20,7 +20,7 @@
<el-table-column prop="chargePhone" label="负责人电话" align="center"></el-table-column>
<el-table-column prop="unitAddress" label="单位地址 " align="center"></el-table-column>
<el-table-column prop="socialCode" label="统一社会信用代码 " align="center"></el-table-column>
<el-table-column label="操作" align="center" width="250">
<el-table-column label="操作" align="center" width="160">
<template slot-scope="scope">
<div class="tableBtns">
<div @click="editBtn(scope.row)" class="operationText">

4
src/views/projectFront/quality/material/tradeName.vue
View File

@ -20,7 +20,7 @@
<el-table-column prop="foldSquare" label="折方系数" align="center"></el-table-column>
<el-table-column prop="goodsBuckledHeavily" label="货名扣重" align="center"></el-table-column>
<el-table-column prop="goodsInventory" label="货物存量" align="center"></el-table-column>
<el-table-column label="操作" align="center" width="250">
<el-table-column label="操作" align="center" width="160">
<template slot-scope="scope">
<div class="tableBtns">
<div @click="editBtn(scope.row)" class="operationText">
@ -71,7 +71,7 @@
</span>
</el-dialog>
<el-dialog :modal-append-to-body="false" title="编辑" :visible.sync="dialogVisibleEdit" width="30%" :before-close="handleClose">
<el-form ref="editForm" :model="editForm" label-width="150px">
<el-form ref="editForm" :model="editForm" label-width="150px" :rules="addEditRules">
<el-form-item label="货名：" prop="goodsName">
<el-input v-model="editForm.goodsName" style="width:350px" placeholder="请输入"></el-input>
</el-form-item>

4
src/views/projectFront/quality/material/weighInfo.vue
View File

@ -24,8 +24,8 @@
<el-table-column prop="tare" label="毛重" align="center"></el-table-column>
<el-table-column prop="grossWeight" label="皮重" align="center"></el-table-column>
<el-table-column prop="netWeight" label="净重" align="center"></el-table-column>
<el-table-column prop="tareTime" label="毛重时间" align="center"></el-table-column>
<el-table-column prop="grossTime" label="皮重时间" align="center"></el-table-column>
<el-table-column prop="tareTime" width="200px" label="毛重时间" align="center"></el-table-column>
<el-table-column prop="grossTime" width="200px" label="皮重时间" align="center"></el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<div class="tableBtns">