WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_2nd_period_test' 到 'feature_20221014_noLogo'

Browse Source 
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!249
This commit is contained in:
高嵩
2022-11-11 15:23:15 +08:00
parent 63d4075d1a 9c88a2b615
commit c86cb7b2c3
234 changed files with 20614 additions and 3574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/CollectionType/index.vue
+6 -1
View File
@@ -29,6 +29,7 @@
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
@input="onInput"
:maxLength="1000"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
v-model="item.dataValue"/>
</div>
@@ -652,7 +653,7 @@
</div>
</div>
<uploadFileChangeDown ref="uploadFile" @uploadSuccess="uploadSuccess"
:detailDate='detailDate'></uploadFileChangeDown>
:detailDate='detailDate' watermark='download'></uploadFileChangeDown>
</div>
</template>
@@ -667,6 +668,10 @@
type: Object,
default: {},
require: true
},
watermark: {
type: String,
default: ''
}
},
data() {
jero-web/src/components/CollectionTypeDisabled/index.vue
+1
View File
@@ -27,6 +27,7 @@
<a-input class="box-input inputWid"
:placeholder="$t('pleaseEnter')+$t('chinese')"
@input="onInput"
:maxLength="1000"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
v-model="item.dataValue"/>
</div>
jero-web/src/components/ImportFileOnlyList/index.vue
+6
View File
@@ -54,6 +54,10 @@ export default {
type: String,
default: ''
},
paramsManifestId: {
type: String,
default: ''
},
projectLibraryId: {
type: String,
default: ''
@@ -76,6 +80,8 @@ export default {
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&paramsTemplateId=' + this.paramsTemplateId
} else if (this.projectLibraryId) {
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectLibraryId=' + this.projectLibraryId
} else if (this.paramsManifestId) {
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&paramsManifestId=' + this.paramsManifestId
}
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut
}
jero-web/src/components/ImportFileOnlyListtag/index.vue
+284
View File
@@ -0,0 +1,284 @@
<template>
<div>
<a-upload name="file" :showUploadList="false"
class="upload-text"
:multiple="false" :headers="tokenHeader"
:action="importUrl"
@change="handleImport"
:accept="accept">
<a-icon type="import" :rotate="270"/>
{{$t('import')}}
</a-upload>
<div class="loading-box" v-if="spinning">
<div class="loading-content">
<a-icon class="loading" type="loading"/>
<div class="loading-tips">
{{this.$t('Importing')}}...
</div>
</div>
</div>
<!-- 错误数据提示-->
<a-modal
:title="$t('Importfailure')"
:width="860"
v-model="visibleoperationFailed"
:maskClosable="false"
:footer="null"
>
<a-row :gutter="24">
<a-col :span="24">
<div>
<span style='font-size: 16px;margin-bottom: 20px;' v-for='(item,key) in operationFailedValue'>
<span v-html="item"></span>
</span>
</div>
</a-col>
</a-row>
<div class="imports-footer">
<div class="imports-footer-wrap">
<a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
</div>
</div>
</a-modal>
</div>
</template>
<script>
import Vue from 'vue'
import {ACCESS_TOKEN} from '@/store/mutation-types'
import eventBUs from '../../common/event'
import {Modal} from 'ant-design-vue'
import store from '@/store'
export default {
name: 'index',
props: {
url: {
type: Object,
default: {}
},
//判断当前文档库还是其余的页面
isTrue: {
type: Boolean,
default: false
},
accept: {
type: String,
default: ''
},
projectId: {
type: String,
default: ''
},
dummyInventoryBaseId: {
type: String,
default: ''
},
paramsTemplateId: {
type: String,
default: ''
},
paramsManifestId: {
type: String,
default: ''
},
projectLibraryId: {
type: String,
default: ''
}
},
data() {
return {
tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)},
spinning: false,
operationFailedValue:[],
visibleoperationFailed: false, // 数据失败的弹框
cut: ''
}
},
computed: {
importUrl() {
if (this.projectId) {
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectId=' + this.projectId
} else if (this.dummyInventoryBaseId) {
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&dummyInventoryBaseId=' + this.dummyInventoryBaseId
} else if (this.paramsTemplateId) {
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&paramsTemplateId=' + this.paramsTemplateId
} else if (this.projectLibraryId) {
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectLibraryId=' + this.projectLibraryId
} else if (this.paramsManifestId) {
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&paramsManifestId=' + this.paramsManifestId
}
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut
}
},
mounted() {
let long = localStorage.getItem('language')
this.cut = ''
if (long && long == 'zh-cn') {
this.cut = 'cn'
} else if (long && long == 'en-us') {
this.cut = 'en'
}
},
methods: {
handleImport(info) {
this.spinning = true
if (info.file.status !== 'uploading') {
this.$emit('getList')
}
if (info.file.status === 'done') {
if (info.file.response.success) {
if (info.file.response.code === 201) {
let {message} = info.file.response
let {name} = info.file
let content = []
if (message) {
message = message.split('</br>')
message.forEach(res => {
if (res) {
content.push( < div > {res} < /div>)
}
})
}
this.$warning({
title: name,
content: (
< div >
{content}
< /div>
)
})
} else {
if (this.isTrue) {
this.$emit('getList')
} else {
eventBUs.$emit('searchReset')
}
console.log(info.file.response.message)
if(info.file.response.message == null){
console.log(111)
this.operationFailedValue = info.file.response.result
this.visibleoperationFailed = true
}else{
this.$message.success(info.file.response.message || `${info.file.name} 文件导入成功`)
}
}
this.spinning = false
} else {
let data = info.file.response
const token = Vue.ls.get(ACCESS_TOKEN)
if ((token && data.message.includes('Token失效')) || (token && data.message.includes('token')) || (token && data.message.includes('用户不存在'))) {
this.spinning = false
Modal.error({
title: '登录已过期',
content: '很抱歉，登录已过期，请重新登录',
okText: '重新登录',
mask: false,
onOk: () => {
store.dispatch('Logout').then(() => {
Vue.ls.remove(ACCESS_TOKEN)
window.location.reload()
})
}
})
return
}
let {message} = info.file.response
let {name} = info.file
let content = []
if (message) {
message = message.split('</br>')
message.forEach(res => {
if (res) {
content.push( < div > {res} < /div>)
}
})
}
this.$warning({
title: name,
content: (
< div >
{content}
< /div>
)
})
this.spinning = false
}
} else if (info.file.status === 'error') {
if (info.file.response.status === 500) {
let data = info.file.response
const token = Vue.ls.get(ACCESS_TOKEN)
if ((token && data.message.includes('Token失效')) || (token && data.message.includes('token')) || (token && data.message.includes('用户不存在'))) {
Modal.error({
title: '登录已过期',
content: '很抱歉，登录已过期，请重新登录',
okText: '重新登录',
mask: false,
onOk: () => {
store.dispatch('Logout').then(() => {
Vue.ls.remove(ACCESS_TOKEN)
window.location.reload()
})
}
})
}
this.spinning = false
} else {
this.$message.error(`文件导入失败: ${info.file.msg} `)
this.spinning = false
}
}
},
// 错误数据的弹框
cancleoperationFailed() {
this.operationFailedValue = []
this.visibleoperationFailed = false
},
}
}
</script>
<style>
.upload-text .ant-upload {
font-size: 14px !important;
font-weight: 400 !important;
color: #040B29 !important;
}
</style>
<style scoped lang="less">
.loading-box {
position: fixed;
top: 0;
left: 0;
z-index: 9999900;
width: 100%;
height: 100%;
background-color: rgba(255, 255, 255, 0.9);
border-radius: 8px;
user-select: none;
.loading-content {
position: absolute;
top: 50%;
left: 50%;
color: #21c9cc;
transform: translate(-50%, -50%);
text-align: center;
.loading {
font-size: 28px;
}
.spin-loading {
animation: rotating 2s linear infinite;
}
.loading-tips {
margin-top: 5px;
font-size: 16px;
color: #21c9cc;
}
}
}
</style>
jero-web/src/components/OcrTable/index.vue
+12 -3
View File
@@ -21,11 +21,11 @@
<!-- <span v-if="ol.text==$t('check')">-->
<!-- {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}}-->
<!-- </span>-->
<span v-if="ol.text==$t('download') && record.createBy == userData.username"
<span v-if="ol.text==$t('download') && (record.createBy == userData.username || administrators)"
v-has="'ocr:ocrRestful:downFile'">
{{record.resultContent=='转换成功'?ol.text:''}}
</span>
<span v-if="ol.text==$t('delete') && record.createBy == userData.username" v-has="'ocr:ocrRecord:delete'">
<span v-if="ol.text==$t('delete') && (record.createBy == userData.username || administrators)" v-has="'ocr:ocrRecord:delete'">
{{ol.text}}
</span>
</a>
@@ -105,7 +105,8 @@
searchParmes: {},
loading: false,
orderBy: '1',
orderByField: ''
orderByField: '',
administrators:false
}
},
mounted() {
@@ -131,6 +132,14 @@
this.getData()
this.getTableList()
this.userData = this.userInfo()
this.administrators = false
if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
this.userInfo().userRoleList.forEach(res => {
if (res.roleCode == 'admin') {
this.administrators = true
}
})
}
},
beforeDestroy(){
eventBUs.$off('searchQuery')
jero-web/src/components/SplitTable/index.vue
+12 -3
View File
@@ -18,7 +18,7 @@
<!-- <span class="text">-->
<!-- {{ol.text}}-->
<!-- </span>-->
<span v-if="ol.text==$t('backDocument')&&record.flag==0 && record.createBy == userData.username"
<span v-if="ol.text==$t('backDocument') && record.flag==0 && (record.createBy == userData.username || administrators)"
class="text"
v-has="'split:sarFileSplitInfo:bind'">
{{ol.text}}
@@ -27,7 +27,7 @@
v-has="'split:sarFileSplitItems:page'">
{{ol.text}}
</span>
<span v-if="ol.text==$t('delete') && record.createBy == userData.username"
<span v-if="ol.text==$t('delete') && (record.createBy == userData.username || administrators)"
v-has="'split:sarFileSplitInfo:delete'">
{{ol.text}}
</span>
@@ -109,7 +109,8 @@
loading: false,
orderBy: '1',
userData: {},
orderByField: ''
orderByField: '',
administrators:false,
}
},
mounted() {
@@ -141,6 +142,14 @@
this.getData()
this.getTableList()
this.userData = this.userInfo()
this.administrators = false
if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
this.userInfo().userRoleList.forEach(res => {
if (res.roleCode == 'admin') {
this.administrators = true
}
})
}
},
beforeDestroy() {
eventBUs.$off('searchQuery')
jero-web/src/components/globalAdvancedQuery/index.vue
+4 -4
View File
@@ -397,7 +397,7 @@
return str
},
handleOk() {
// if (!this.isNullArray(this.queryParamsModel)) {
if (!this.isNullArray(this.queryParamsModel)) {
let event = {
matchType: this.matchType,
params: this.removeEmptyObject(this.queryParamsModel)
@@ -407,9 +407,9 @@
this.visible = false
}
this.emitCallback(event)
// } else {
// this.$message.warn(this.$t('CannotQueryEmpty'))
// }
} else {
this.$message.warn(this.$t('CannotQueryEmpty'))
}
},
emitCallback(event = {}) {
let { params = [], matchType = this.matchType } = event
jero-web/src/components/menu/index.js
+6 -3
View File
@@ -109,8 +109,10 @@ export default {
props = { to: { path: menu.path } }
}
const attrs = { href: menu.path, target: menu.meta.target , title:menu.meta.title }
const attrs = { href: menu.path, target: menu.meta.target, title: menu.meta.title }
if (menu.meta && menu.meta.existTask) {
attrs.style = 'color:red'
}
if (menu.children && menu.alwaysShow) {
// 把有子菜单的 并且 父菜单是要隐藏子菜单的
// 都给子菜单增加一个 hidden 属性
@@ -162,7 +164,8 @@ export default {
span
slot = 'title' >
{ this.renderIcon(menu.meta.icon) }
< span title={menu.meta.title}> { menu.meta.title } < /span>
< span
title = { menu.meta.title } > { menu.meta.title } < /span>
< /span>
{
itemArr
jero-web/src/components/tableCollection/index.vue
+66 -32
View File
@@ -19,12 +19,16 @@
<span slot="titleName" slot-scope="text,record" :title="text">
{{ text }}
</span>
<span slot="paramsName" slot-scope="text,record">
<span class="textName" :title="text">{{text}}</span>
</span>
<div :slot="'titleName'+(index+1)" v-for="(item,index) in content">
<span v-if='item.isLock == 1' style='padding-right: 20px'><a-icon type="lock" theme="twoTone" two-tone-color="#00B3BE" /></span>
<span style='padding-right: 10px;margin-left: -16px'>{{ item.db_field_txt }} </span>
<span v-if='item.isLock == 1' style='padding-right: 20px'><a-icon type="lock" theme="twoTone"
two-tone-color="#00B3BE"/></span>
<span style='padding-right: 10px'>{{ item.db_field_txt }} </span>
<a-button @click='onClickSee(item)'>{{$t('See')}}</a-button>
</div>
<!-- {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->
<!-- {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->
<span slot="ParameterDescription" slot-scope="text,record" :title="text">
<a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
@@ -55,7 +59,7 @@
<span
v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "To be collected" || record.state == "Rejected by eng. interface"'>
<span :title='record.dataValue'
@click='ondataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
@click='ondataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
</span>
<span v-else>
<span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
@@ -135,14 +139,14 @@
<a-row :gutter='24'>
<a-col :span='24'>
<a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='queryzr'>
<!-- <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
<!-- v-model="Dateline.querySdt">-->
<!-- <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.label ">-->
<!-- {{ item.label }}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
<!-- v-model="Dateline.querySdt">-->
<!-- <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.label ">-->
<!-- {{ item.label }}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<j-dict-select-tag class="box-input" v-model="Dateline.queryzr"
@input="handleInput('queryzr')"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
@@ -155,7 +159,8 @@
<div class="imports-footer">
<div class="imports-footer-wrap">
<a-button class="imports-btn imports-sub" :loading="confirmLoading" type="primary" @click="handleSubmitzr">{{$t('preservation')}}
<a-button class="imports-btn imports-sub" :loading="confirmLoading" type="primary" @click="handleSubmitzr">
{{$t('preservation')}}
</a-button>
<a-button class="imports-btn" type="primary" @click="cancel">{{$t('cancel')}}</a-button>
</div>
@@ -235,7 +240,7 @@
default: {},
require: true
},
description:'',
description: '',
formInline: {
type: Object,
default: true
@@ -300,7 +305,7 @@
indeterminate: false,
columns: [],
content: [],
confirmLoading:false,
confirmLoading: false,
selectedRowKeys: [],
selectedRowrowValue: [],
dataSource: [],
@@ -316,7 +321,7 @@
sdt: 0, // 工程接口人
dre: 0, // 填写人
areaVisible: false,
areaVisiblezr:false,
areaVisiblezr: false,
form: {},
rules: {
querySdt: [
@@ -342,13 +347,13 @@
xs: { span: 24 },
sm: { span: 7 }
},
queryParamQuery:{},
queryParam:{},
queryParamQuery: {},
queryParam: {},
querySdtList: [], // 工程接口人
Dateline: {},
getquerySdtId: '', // 当前工程接口人的id
areaVisibleView: false, // 查看配置得弹框
seeVisibleView:false,
seeVisibleView: false,
configDetail: {} // 查看配置得详细信息
}
},
@@ -394,7 +399,7 @@
this.$emit('handlePreservation')
this.getTableList()
},
onClickTitle(val){
onClickTitle(val) {
console.log(val)
this.description = val.description
this.seeVisibleView = true
@@ -455,7 +460,11 @@
// 责任领域 保存
handleSubmitzr(record) {
let _this = this
let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, }
let param = {
dutyTerritory: this.Dateline.queryzr,
ids: this.getquerySdtId,
paramsManifestId: this.$route.query.id
}
this.$refs.ruleFormOne.validate(valid => {
if (valid) {
this.confirmLoading = true
@@ -538,7 +547,7 @@
this.areaVisible = false
this.$refs['ruleForm'].resetFields()
},
cancel(){
cancel() {
this.areaVisiblezr = false
this.$refs['ruleFormOne'].resetFields()
},
@@ -597,16 +606,18 @@
}
getAction('/params/userTypeLog/queryCurrentType', query).then((res) => {
if (res.success) {
this.queryParamQuery = {...this.queryParamQuery}
this.queryParamQuery = { ...this.queryParamQuery }
if (res.result && res.result.userType) {
if (!(result.some(val => val.value == res.result.userType))) {
res.result.userType = result[0] ? result[0].value : ''
}
this.getTableList(res.result.userType)
this.getHeader(res.result.userType)
} else {
this.getTableList(result[0].value)
this.getHeader(result[0].value)
}
this.$emit('LoginUserType', result, this.currentPersonRole, res.result.userType)
} else {
@@ -614,7 +625,7 @@
}
})
},
getHeader() {
getHeader(userType) {
let paramsManifestid
let url
if (this.$route.query.it === undefined) {
@@ -659,25 +670,27 @@
dataIndex: res.db_field_name,
align: 'center',
// ellipsis: true,
fixed: res.click5?'left':'',
fixed: res.click5 ? 'left' : '',
sorter: res.sort,
width: 160
})
console.log(res)
this.columns[index].scopedSlots = {
customRender: 'titleName'
}
if(res.click1){
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 100
}
if (res.click1) {
this.columns[index].scopedSlots = {
customRender: 'operationzr'
}
}
if(res.click2){
if (res.click2) {
this.columns[index].scopedSlots = {
customRender: 'ParameterDescription'
}
}
if(res.click3){
if (res.click3) {
this.columns[index].scopedSlots = {
customRender: 'paramsNameDescription'
}
@@ -688,6 +701,12 @@
customRender: 'operationbtn'
}
}
if (res.db_field_name == 'paramsName') {
this.columns[index].width = 300
this.columns[index].scopedSlots = {
customRender: 'paramsName'
}
}
}
})
this.columns = [...this.columns]
@@ -704,7 +723,7 @@
let params = {
paramsManifestId: this.$route.query.id,
pageNo: this.pageNo,
pageSize: this.pageSize,
pageSize: this.pageSize
// userTypes: this.currentPersonRole
}
let url
@@ -809,7 +828,7 @@
// })
let tt = []
if (this.currentPersonRole !== 'dre') {
console.log(res.result.records,'res.result.records')
console.log(res.result.records, 'res.result.records')
res.result.records.forEach((Obj) => {
Object.keys(Obj).forEach((item) => {
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
@@ -909,6 +928,7 @@
border: none !important;
padding: 0 !important;
}
//::v-deep .ant-table-row:first-child {
// background: #fff!important;
// /*opacity: 0.9;*/
@@ -949,6 +969,7 @@
font-weight: 400;
}
}
.textfield {
width: 100%;
margin-bottom: 8px;
@@ -978,6 +999,19 @@
}
}
}
.textName {
width: 100%;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
}
</style>
<style>
.resize-table-th {
@@ -998,7 +1032,7 @@
}
.rowClassRed {
background: #f3d9de ;
background: #f3d9de;
}
.rowClassRedYellow {
jero-web/src/components/tableCollection/index1.vue
+55 -25
View File
@@ -28,22 +28,25 @@
<a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
</span>
<!-- <span slot="operationbtn" slot-scope="record">-->
<!-- <span v-if='currentPersonRole === "homo"'>-->
<!--&lt;!&ndash; 认证工程师 &ndash;&gt;-->
<!-- <span-->
<!-- v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>-->
<!--&lt;!&ndash; <span&ndash;&gt;-->
<!--&lt;!&ndash; @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>&ndash;&gt;-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<span slot="paramsName" slot-scope="text,record">
<span class="textName" :title="text">{{text}}</span>
</span>
<!-- <span slot="operationbtn" slot-scope="record">-->
<!-- <span v-if='currentPersonRole === "homo"'>-->
<!--&lt;!&ndash; 认证工程师 &ndash;&gt;-->
<!-- <span-->
<!-- v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>-->
<!--&lt;!&ndash; <span&ndash;&gt;-->
<!--&lt;!&ndash; @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>&ndash;&gt;-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<span slot="detailClick" slot-scope="text,record">
<collection-type :detailDate='text'/>
</span>
@@ -99,7 +102,8 @@
</div>
</a-modal>
<!-- 配置信息--->
<a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null" @cancel="hideModal">
<a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null"
@cancel="hideModal">
<div class="content-text">
<div class="text-field">
<span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
@@ -246,7 +250,7 @@
sdt: 0, // 工程接口人
dre: 0, // 填写人
areaVisible: false,
seeVisibleView:false,
seeVisibleView: false,
form: {},
rules: {
querySdt: [
@@ -293,7 +297,7 @@
return 'rowClassRed'
}
},
onClickTitle(val){
onClickTitle(val) {
console.log(val)
this.description = val.description
this.seeVisibleView = true
@@ -310,7 +314,7 @@
// this.$emit('handlePreservation')
this.getTableList()
},
hideModal(){
hideModal() {
this.areaVisibleView = false
},
// 查看配置详细信息
@@ -507,17 +511,27 @@
this.columns[index].scopedSlots = {
customRender: 'titleName'
}
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 100
}
if (res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
customRender: 'operationbtn'
}
}
if(res.click2){
if (res.click2) {
this.columns[index].scopedSlots = {
customRender: 'ParameterDescription'
}
}
if (res.db_field_name == 'paramsName') {
this.columns[index].width = 300
this.columns[index].ellipsis = false
this.columns[index].scopedSlots = {
customRender: 'paramsName'
}
}
}
})
this.columns = [...this.columns]
@@ -532,8 +546,8 @@
let params = {
paramsManifestId: this.$route.query.id,
userTypes: this.currentPersonRole,
pageNo:this.pageNo,
pageSize:this.pageSize
pageNo: this.pageNo,
pageSize: this.pageSize
}
this.loading = true
this.$emit('listReset', '')
@@ -723,14 +737,16 @@
border: none !important;
padding: 0 !important;
}
::v-deep .ant-table-row:first-child {
background: #fff!important;
background: #fff !important;
opacity: 0.9;
}
::v-deep .ant-table-body {
background: transparent!important;
background: transparent !important;
}
.textfield {
width: 100%;
margin-bottom: 8px;
@@ -759,6 +775,7 @@
font-weight: 400;
}
}
.content-text {
width: 100%;
display: flex;
@@ -791,6 +808,19 @@
}
}
}
.textName {
width: 100%;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
}
</style>
<style>
.resize-table-th {
jero-web/src/components/tools/HeaderNotice.vue
+20 -3
View File
@@ -15,7 +15,10 @@
<a-list-item :key="index" v-for="(record, index) in announcement1" v-if="index <= 4">
<div style="margin-left: 5%;width: 80%;">
<p style="overflow: hidden; text-overflow: ellipsis;white-space: nowrap;color:#00B3BE">
<a :title="record.titile" @click="showAnnouncement(record)">{{ record.titile }}</a>
<a :title="language == 'zh-cn'&& record.msgContentCn?record.msgContentCn:record.msgContent"
@click="showAnnouncement(record)">
{{ language == 'zh-cn'&& record.msgContentCn?record.msgContentCn:record.msgContent }}
</a>
</p>
</div>
</a-list-item>
@@ -50,6 +53,7 @@
data() {
return {
loadding: false,
language: '',
url: {
listCementByUser: '/sys/sysAnnouncementSend/getMessageUnreadList',
editCementSend: '/sys/sysAnnouncementSend/editByAnntIdAndUserId',
@@ -91,6 +95,7 @@
},
created() {
this.loadData()
this.language = localStorage.getItem('language') || ''
// this.initWebSocket()
if (store.getters.userInfo) {
this.$socketPublic.dispatch('webSocketInit')//初始化ws
@@ -110,6 +115,11 @@
// clearInterval(this.timer)
// },
methods: {
getText(str) {
let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
//.replace(/\s/g, '') //这里是去除空格
return words
},
loadData() {
getAction(this.url.listCementByUser).then((res) => {
if (res.success) {
@@ -134,9 +144,16 @@
showAnnouncement(record) {
getAction(this.url.readAllMsg, { ids: record.id }).then((res) => {
})
if (this.language == 'zh-cn') {
localStorage.setItem('msgContent', record.msgContentCn)
} else {
localStorage.setItem('msgContent', record.msgContent)
}
this.$router.push({
path: '/system/MessageDetails',
query: record
path: '/isps/userAnnouncement',
query: {
Date: Date.now()
}
})
},
toMyAnnouncement() {
jero-web/src/components/uploadFileChangeDown/file.vue
+10 -2
View File
@@ -43,7 +43,7 @@ import { mapGetters } from 'vuex'
export default {
name: 'file',
props: ['disableds', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'detailDate'],
props: ['disableds', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'detailDate','watermark'],
data() {
return {
visible: false,
@@ -91,7 +91,11 @@ import { mapGetters } from 'vuex'
methods: {
...mapGetters(['userInfo']),
download() {
downloadFile('/sys/common/downLoadFile', this.template.templateName, { id: this.template.templateId })
if(this.watermark == 'download'){
downloadFile('/sys/common/downLoadFileNOMark', this.template.templateName, { id: this.template.templateId })
} else {
downloadFile('/sys/common/downLoadFile', this.template.templateName, { id: this.template.templateId })
}
},
perentHandleFunc(data) {
this.myfileList = data
@@ -220,7 +224,11 @@ import { mapGetters } from 'vuex'
// let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
// window.open(url, '_blank')
// } else {
if(this.watermark == 'download'){
downloadFile('/sys/common/downLoadFileNOMark', fileQuery.fileName, { id: fileQuery.id })
}else {
downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
}
// }
}
}