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

港投项目-页面bug修复

Browse Source
This commit is contained in:
jxj_yjl 2023-05-08 18:23:59 +08:00
parent a369220164
commit 999c4cbf06
11 changed files with 64 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;
} }

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',//内蒙古

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

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

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"

47
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,24 +302,25 @@
<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
:src="$store.state.FILEURL + addEditForm.witnessSamplingVideo" v-if="isRouterAlive || addEditForm.witnessSamplingVideo"
width="100%" :src="$store.state.FILEURL + addEditForm.witnessSamplingVideo"
height="200" width="100%"
controls height="200"
></video> controls
></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"

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

@ -72,11 +72,10 @@
</div> </div>
</div> </div>
<div class="noData" v-else> <div class="noData" v-else>
<img src="@/assets/images/noData.png" alt srcset /> <img src="@/assets/images/noData.png" alt srcset />
<p>暂无数据</p> <p>暂无数据</p>
</div> </div>
</vue-scroll> </vue-scroll>
</div> </div>
<!-- 新增 --> <!-- 新增 -->
@ -99,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"
@ -116,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"
@ -131,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"
@ -168,7 +167,7 @@
v-html="detailData.articleContent" v-html="detailData.articleContent"
></div> ></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"

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"