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

Merge branch 'dev-yjl' into 'shenzhen-dev'

Browse Source 
港投项目-页面bug修复

See merge request !159
This commit is contained in:
袁晶琳 2023-05-08 18:25:37 +08:00
commit 40c60736d4
24 changed files with 148 additions and 114 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)')) <!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"}}]);

4
src/assets/js/http.js
View File

@ -42,7 +42,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上（旧）地址 // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上（旧）地址
// axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
// axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
@ -80,7 +80,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地 // axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地
// axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地 // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地
axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地
// axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上 // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
// axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上 // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上

2
src/assets/style/dialog.less
View File

@ -23,7 +23,7 @@
} }
.dialog-footer{ .dialog-footer{
margin-top: 40px; margin-top: 40px;
text-align: right; text-align: center;
.el-button + .el-button{ .el-button + .el-button{
margin-left: 30px; margin-left: 30px;
} }

58
src/components/message.vue
View File

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

16
src/store/index.js
View File

@ -48,12 +48,12 @@ export default new Vuex.Store({
BASEURL: baseUrl BASEURL: baseUrl
? baseUrl ? baseUrl
: window.location.protocol + "//" + window.location.host + "/", //正式环境 : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL: UPLOADURL:
// window.location.protocol + window.location.protocol +
// "//" + "//" +
// window.location.host + window.location.host +
// "/upload/image", //正式环境 "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
//--------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------
// BASEURL: baseUrl // BASEURL: baseUrl
// ? baseUrl // ? baseUrl
@ -87,8 +87,8 @@ export default new Vuex.Store({
// FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式 // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式
// UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台 // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
// FILEURL: 'http://182.90.224.147:100/image/',//演示平台 // FILEURL: 'http://182.90.224.147:100/image/',//演示平台
UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 // UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地
FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 // FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地
// UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地 // UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地
// FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地 // FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地
// UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古 // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古

4
src/views/projectFront/contractManagement/basicInformation.vue
View File

@ -257,7 +257,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="dialog-footer" style="margin-right: 45%"> <div class="dialog-footer">
<el-button <el-button
class="cancleBtn" class="cancleBtn"
@click="dialogShow = false" @click="dialogShow = false"
@ -725,7 +725,7 @@
</el-table> </el-table>
</div> </div>
<div class="dialog-footer" style="margin-right: 48%"> <div class="dialog-footer" >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-circle-check" icon="el-icon-circle-check"

4
src/views/projectFront/equipmentManagement/leasingEquipment.vue
View File

@ -336,7 +336,7 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="dialog-footer" style="margin-right: 45%"> <div class="dialog-footer" >
<el-button <el-button
class="cancleBtn" class="cancleBtn"
@click="dialogShow = false" @click="dialogShow = false"
@ -772,7 +772,7 @@
</el-table> </el-table>
</div> </div>
<div class="dialog-footer" style="margin-right: 48%"> <div class="dialog-footer" >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-circle-check" icon="el-icon-circle-check"

4
src/views/projectFront/equipmentManagement/ownEquipment.vue
View File

@ -336,7 +336,7 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="dialog-footer" style="margin-right: 45%"> <div class="dialog-footer" >
<el-button <el-button
class="cancleBtn" class="cancleBtn"
@click="dialogShow = false" @click="dialogShow = false"
@ -778,7 +778,7 @@
</el-table> </el-table>
</div> </div>
<div class="dialog-footer" style="margin-right: 48%"> <div class="dialog-footer" >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-circle-check" icon="el-icon-circle-check"

35
src/views/projectFront/inspectionTesting/witnessSampling.vue
View File

@ -140,8 +140,8 @@
></el-table-column> ></el-table-column>
<el-table-column label="操作" align="center" width="200px"> <el-table-column label="操作" align="center" width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tableBtns" style="margin-left: 30px !important;"> <div class="tableBtns" style="margin-left: 30px !important">
<div @click="edit(scope.row)" class="operationText" > <div @click="edit(scope.row)" class="operationText">
<img <img
src="@/assets/images/icon-edit.png" src="@/assets/images/icon-edit.png"
width="15px" width="15px"
@ -302,16 +302,17 @@
<el-form-item label="见证取样视频" prop="witnessSamplingVideo"> <el-form-item label="见证取样视频" prop="witnessSamplingVideo">
<div class="videoUpload"> <div class="videoUpload">
<el-upload <el-upload
class="upload-demo"
name="files" name="files"
:action="$store.state.UPLOADURL" :action="$store.state.UPLOADURL"
multiple
:file-list="fileList"
:on-success="(file) => handleSuccess(file, 4)" :on-success="(file) => handleSuccess(file, 4)"
:show-file-list="false" :show-file-list="false"
accept="video/mp4"
> >
<el-button type="primary">上传视频</el-button> <el-button type="primary">上传视频</el-button>
</el-upload> </el-upload>
<video <video
v-if="isRouterAlive || addEditForm.witnessSamplingVideo"
:src="$store.state.FILEURL + addEditForm.witnessSamplingVideo" :src="$store.state.FILEURL + addEditForm.witnessSamplingVideo"
width="100%" width="100%"
height="200" height="200"
@ -319,7 +320,7 @@
></video> ></video>
</div> </div>
</el-form-item> </el-form-item>
<div class="dialog-footer"> <div class="dialog-footer" >
<el-button <el-button
class="cancleBtn" class="cancleBtn"
@click="dialogShow = false" @click="dialogShow = false"
@ -353,6 +354,7 @@ export default {
}, },
data() { data() {
return { return {
isRouterAlive: false,
title: "", title: "",
dialogShow: false, dialogShow: false,
pagInfo: { pagInfo: {
@ -387,10 +389,11 @@ export default {
projectName: '', projectName: '',
sampleName: '', sampleName: '',
}, },
videoUrl: '',
} }
}, },
methods: { methods: {
// 删除照片 // 删除
handleRemove(file, fileList, type) { handleRemove(file, fileList, type) {
if (type == 1) { if (type == 1) {
this.fileUplodList1 = fileList this.fileUplodList1 = fileList
@ -408,23 +411,31 @@ export default {
name: file.data[0].filename, name: file.data[0].filename,
url: this.$store.state.FILEURL + file.data[0].imageUrl url: this.$store.state.FILEURL + file.data[0].imageUrl
} }
if (type == 1) { if (type == 1) {
this.fileUplodList1.push( this.fileUplodList1.push(
data data
) )
} }
else if (type == 2) { else if (type == 2) {
this.fileUplodList2.push( this.fileUplodList2.push(
data data
) )
} }
else if (type == 3) { else if (type == 3) {
this.fileUplodList3.push( this.fileUplodList3.push(
data data
) )
} }
else if (type == 4) { else if (type == 4) {
this.addEditForm.witnessSamplingVideo = file.data[0].filename this.isRouterAlive = false;
this.$nextTick(() => {
this.addEditForm.witnessSamplingVideo = file.data[0].imageUrl
this.isRouterAlive = true;
})
} }
}, },
@ -447,7 +458,7 @@ export default {
item.samplerPhoto[0].url = item.samplerPhoto[0].url =
this.$store.state.FILEURL + item.samplerPhoto[0].url; this.$store.state.FILEURL + item.samplerPhoto[0].url;
} }
}else { } else {
let url = item.samplerPhoto let url = item.samplerPhoto
if (url.length !== 0 && !url.includes(this.$store.state.FILEURL)) { if (url.length !== 0 && !url.includes(this.$store.state.FILEURL)) {
@ -566,11 +577,11 @@ export default {
}, },
close() { close() {
this.fileUplodList1=[], this.fileUplodList1 = [],
this.fileUplodList2=[], this.fileUplodList2 = [],
this.fileUplodList3=[], this.fileUplodList3 = [],
this.addEditForm = {} this.addEditForm = {}
this.isRouterAlive = false;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addEditForm.clearValidate() this.$refs.addEditForm.clearValidate()
}) })

2
src/views/projectFront/procurementManagement/biddingManagement.vue
View File

@ -434,7 +434,7 @@
</el-table> </el-table>
</div> </div>
<div class="dialog-footer" style="margin-right: 48%"> <div class="dialog-footer" >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-circle-check" icon="el-icon-circle-check"

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="chargePhone" label="负责人电话" align="center"></el-table-column>
<el-table-column prop="unitAddress" 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 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"> <template slot-scope="scope">
<div class="tableBtns"> <div class="tableBtns">
<div @click="editBtn(scope.row)" class="operationText"> <div @click="editBtn(scope.row)" class="operationText">
@ -71,7 +71,7 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog :modal-append-to-body="false" title="编辑" :visible.sync="dialogVisibleEdit" width="30%" :before-close="handleClose"> <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-form-item label="发货单位：" prop="unitName">
<el-input v-model="editForm.unitName" style="width:350px" placeholder="请输入"></el-input> <el-input v-model="editForm.unitName" style="width:350px" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>

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

@ -33,7 +33,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="addDateTime" label="录入时间" align="center"></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"> <template slot-scope="scope">
<div class="tableBtns"> <div class="tableBtns">
<div @click="editBtn(scope.row)" class="operationText"> <div @click="editBtn(scope.row)" class="operationText">
@ -99,7 +99,7 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog :modal-append-to-body="false" title="编辑" :visible.sync="dialogVisibleEdit" width="30%" :before-close="handleClose"> <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-form-item label="车牌号码：" prop="licensePlate">
<el-input v-model="editForm.licensePlate" style="width:350px" placeholder="请输入"></el-input> <el-input v-model="editForm.licensePlate" style="width:350px" placeholder="请输入"></el-input>
</el-form-item> </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="chargePhone" label="负责人电话" align="center"></el-table-column>
<el-table-column prop="unitAddress" 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 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"> <template slot-scope="scope">
<div class="tableBtns"> <div class="tableBtns">
<div @click="editBtn(scope.row)" class="operationText"> <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="foldSquare" label="折方系数" align="center"></el-table-column>
<el-table-column prop="goodsBuckledHeavily" 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 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"> <template slot-scope="scope">
<div class="tableBtns"> <div class="tableBtns">
<div @click="editBtn(scope.row)" class="operationText"> <div @click="editBtn(scope.row)" class="operationText">
@ -71,7 +71,7 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog :modal-append-to-body="false" title="编辑" :visible.sync="dialogVisibleEdit" width="30%" :before-close="handleClose"> <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-form-item label="货名：" prop="goodsName">
<el-input v-model="editForm.goodsName" style="width:350px" placeholder="请输入"></el-input> <el-input v-model="editForm.goodsName" style="width:350px" placeholder="请输入"></el-input>
</el-form-item> </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="tare" label="毛重" align="center"></el-table-column>
<el-table-column prop="grossWeight" 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="netWeight" label="净重" align="center"></el-table-column>
<el-table-column prop="tareTime" label="毛重时间" align="center"></el-table-column> <el-table-column prop="tareTime" width="200px" label="毛重时间" align="center"></el-table-column>
<el-table-column prop="grossTime" 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"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tableBtns"> <div class="tableBtns">

55
src/views/projectFront/smartPartyBuilding/articleManagement.vue
View File

@ -28,7 +28,7 @@
</div> </div>
<div class="contentStyle whiteBlock"> <div class="contentStyle whiteBlock">
<vue-scroll style="height: 90%; width: 100%"> <vue-scroll style="height: 90%; width: 100%">
<div class="contentBox"> <div class="contentBox" v-if="List.length > 0">
<div <div
class="contentMenu" class="contentMenu"
v-for="(item, index) in List" v-for="(item, index) in List"
@ -59,17 +59,22 @@
<li class="alarm-item" v-show="current === index"> <li class="alarm-item" v-show="current === index">
<div class="operation"> <div class="operation">
<span @click.stop="edit(item)" <span
style="margin-right: 20px !important;cursor: pointer;" @click.stop="edit(item)"
><i class="el-icon-edit" style="color: #4a8bff;"></i>编辑</span style="margin-right: 20px !important; cursor: pointer"
><i class="el-icon-edit" style="color: #4a8bff"></i>编辑</span
> >
<span @click.stop="deleteDev(item)" style="cursor: pointer;"> <span @click.stop="deleteDev(item)" style="cursor: pointer">
<i class="el-icon-delete" style="color: red"></i>删除</span <i class="el-icon-delete" style="color: red"></i>删除</span
> >
</div> </div>
</li> </li>
</div> </div>
</div> </div>
<div class="noData" v-else>
<img src="@/assets/images/noData.png" alt srcset />
<p>暂无数据</p>
</div>
</vue-scroll> </vue-scroll>
</div> </div>
@ -93,14 +98,14 @@
<el-form-item label="文章标题"> <el-form-item label="文章标题">
<el-input <el-input
v-model="addEditForm.articleTitle" v-model="addEditForm.articleTitle"
style="width: 1020px" style="width: 1010px"
placeholder="请输入文章标题" placeholder="请输入文章标题"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="文章内容" prop="content"> <el-form-item label="文章内容" prop="content" style="line-height: 140px;">
<quill-editor <quill-editor
class="ql-editor" class="ql-editor"
style="width: 1020px" style="width: 1038px; margin-left: -15px; margin-top: -20px"
v-model="addEditForm.articleContent" v-model="addEditForm.articleContent"
ref="myQuillEditor" ref="myQuillEditor"
:options="editorOption" :options="editorOption"
@ -110,7 +115,7 @@
> >
</quill-editor> </quill-editor>
</el-form-item> </el-form-item>
<el-form-item label="封面图片"> <el-form-item label="封面图片" style="line-height: 140px;">
<el-upload <el-upload
:action="$store.state.UPLOADURL" :action="$store.state.UPLOADURL"
list-type="picture-card" list-type="picture-card"
@ -125,7 +130,7 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="dialog-footer" style="margin-right: 40%"> <div class="dialog-footer">
<el-button <el-button
class="cancleBtn" class="cancleBtn"
@click="dialogShow = false" @click="dialogShow = false"
@ -150,15 +155,19 @@
:visible.sync="dialogContent" :visible.sync="dialogContent"
width="1200px" width="1200px"
> >
<div style="padding: 10px 80px;"> <div style="padding: 10px 80px">
<h1 style="text-align: center;">{{detailData.articleTitle}}</h1> <h1 style="text-align: center">{{ detailData.articleTitle }}</h1>
<div class="detailHeader"> <div class="detailHeader">
<span>{{detailData.createTime}}</span> <span>{{ detailData.createTime }}</span>
</div> </div>
<div class="detailContent"> <div class="detailContent">
<div class="ql-editor" style="white-space:pre-line" v-html="detailData.articleContent"></div> <div
class="ql-editor"
style="white-space: pre-line"
v-html="detailData.articleContent"
></div>
</div> </div>
<div class="dialog-footer" style="margin-right: 45%"> <div class="dialog-footer" >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-circle-check" icon="el-icon-circle-check"
@ -192,7 +201,7 @@ export default {
data() { data() {
return { return {
detailData: {}, detailData: {},
dialogContent:false, dialogContent: false,
current: -1, current: -1,
title: "", title: "",
dialogShow: false, dialogShow: false,
@ -305,7 +314,6 @@ export default {
}, },
edit(obj) { edit(obj) {
console.log('编辑的内容',obj.coverImage[0].url);
this.title = '编辑' this.title = '编辑'
this.dialogShow = true this.dialogShow = true
this.addEditForm = JSON.parse(JSON.stringify(obj)) this.addEditForm = JSON.parse(JSON.stringify(obj))
@ -403,7 +411,7 @@ export default {
font-size: 10px; font-size: 10px;
color: #ccc; color: #ccc;
} }
.alarm-item{ .alarm-item {
margin-left: 35%; margin-left: 35%;
margin-top: 16px; margin-top: 16px;
} }
@ -417,14 +425,19 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.detailHeader{ .detailHeader {
text-align: center; text-align: center;
padding: 20px; padding: 20px;
span{ span {
color: #ccc; color: #ccc;
font-size: 12px; font-size: 12px;
margin-left: -5%; margin-left: -5%;
} }
} }
.noData {
margin: 15% 45%;
p {
margin-left: 5%;
}
}
</style> </style>

12
src/views/projectFront/smartPartyBuilding/partyBuildingActivities.vue
View File

@ -102,7 +102,7 @@
<el-form-item label="活动主题"> <el-form-item label="活动主题">
<el-input <el-input
v-model="addEditForm.activityTheme" v-model="addEditForm.activityTheme"
style="width: 1020px" style="width: 1010px"
placeholder="请输入活动主题" placeholder="请输入活动主题"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -124,14 +124,14 @@
<el-form-item label="参与人"> <el-form-item label="参与人">
<el-input <el-input
v-model="addEditForm.participant" v-model="addEditForm.participant"
style="width: 438px" style="width: 425px"
placeholder="请输入参与人" placeholder="请输入参与人"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="活动内容" prop="content"> <el-form-item label="活动内容" prop="content" style="line-height: 140px;">
<quill-editor <quill-editor
class="ql-editor" class="ql-editor"
style="width: 1020px" style="width: 1038px; margin-left: -15px; margin-top: -20px"
v-model="addEditForm.activity" v-model="addEditForm.activity"
ref="myQuillEditor" ref="myQuillEditor"
:options="editorOption" :options="editorOption"
@ -142,7 +142,7 @@
</quill-editor> </quill-editor>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="dialog-footer" style="margin-right: 40%"> <div class="dialog-footer">
<el-button <el-button
class="cancleBtn" class="cancleBtn"
@click="dialogShow = false" @click="dialogShow = false"
@ -178,7 +178,7 @@
<div class="ql-editor" style="white-space:pre-line" v-html="detailData.activity"></div> <div class="ql-editor" style="white-space:pre-line" v-html="detailData.activity"></div>
</div> </div>
<div class="dialog-footer" style="margin-right: 45%"> <div class="dialog-footer" >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-circle-check" icon="el-icon-circle-check"