FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-04-19 16:44:23 +08:00
parent 3485a9a8b0 ced5c03807
commit 204253cf0f
13 changed files with 127 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/index.html
+4 -4
View File
@@ -11,10 +11,10 @@
<title>标准法规管理系统</title> <title>标准法规管理系统</title>
<script src = "https://cdn.jsdelivr.net/npm/proxy-polyfill@0.3.0/proxy.min.js"></script> <script src = "https://cdn.jsdelivr.net/npm/proxy-polyfill@0.3.0/proxy.min.js"></script>
<!-- vconsole调试工具--> <!-- vconsole调试工具-->
<script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script> <!-- <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>-->
<script type="text/javascript"> <!-- <script type="text/javascript">-->
var vConsole = new VConsole(); <!-- var vConsole = new VConsole();-->
</script> <!-- </script>-->
</head> </head>
<body class="el-drawer-body"> <body class="el-drawer-body">
<div id="app"></div> <div id="app"></div>
src/main.js
+2 -1
View File
@@ -46,7 +46,8 @@ import 'vant/lib/index.css';
//vant //vant
import animate from 'animate.css' import animate from 'animate.css'
import tool from './utils/tool'
Vue.use(tool)
// 引入路由器 // 引入路由器
import router from './router' import router from './router'
// 路由解析器 // 路由解析器
src/pages/home2/components/todoList/index.vue
+7 -7
View File
@@ -9,13 +9,13 @@
</div> </div>
<ul> <ul>
<li v-for="item in toDoTaskList" :key="item.id" class="time-title"> <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
<div style="height: 30px"> <div style="min-height: 30px">
<span @click="dealWith(item)" v-if="item.prcName.length<24" <span @click="dealWith(item)"
style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item) }}</span> style="line-height: 30px; font-size: 13px;display: inline-block;width: 400px;">{{ getPrcNameFilter(item) }}</span>
<el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else> <!-- <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>-->
<span @click="dealWith(item)" <!-- <span @click="dealWith(item)"-->
style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span> <!-- style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>-->
</el-tooltip> <!-- </el-tooltip>-->
</div> </div>
</li> </li>
</ul> </ul>
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+4
View File
@@ -437,6 +437,7 @@
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
placeholder="请输入核心技术要求" placeholder="请输入核心技术要求"
maxlength="500" maxlength="500"
:autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1"> <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
@@ -1036,6 +1037,9 @@ export default {
}, },
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
this.$nextTick(()=>{
this.$refs.filterTable.doLayout()
})
}, },
handleSave() { handleSave() {
this.saveLoading = true this.saveLoading = true
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+7
View File
@@ -237,6 +237,7 @@
</div> </div>
<!-- 选择已拆分标准抽屉--> <!-- 选择已拆分标准抽屉-->
<el-drawer <el-drawer
class="drawer-table"
title="标准库" title="标准库"
:visible.sync="ListModel" :visible.sync="ListModel"
size="900px" size="900px"
@@ -365,6 +366,7 @@
</el-drawer> </el-drawer>
<!-- 添加抽屉--> <!-- 添加抽屉-->
<el-drawer <el-drawer
class="drawer-table"
title="添加项目群" title="添加项目群"
:visible.sync="ProjectModel" :visible.sync="ProjectModel"
size="950px" size="950px"
@@ -1389,6 +1391,11 @@ export default {
.demo-drawer-content { .demo-drawer-content {
margin-top: 10px; margin-top: 10px;
} }
.drawer-table{
/deep/.el-drawer__body{
overflow-y: hidden;
}
}
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+13 -6
View File
@@ -235,6 +235,7 @@
</div> </div>
<!-- 选择清单抽屉--> <!-- 选择清单抽屉-->
<el-drawer <el-drawer
class="drawer-table"
title="选择清单" title="选择清单"
:visible.sync="ListModel" :visible.sync="ListModel"
size="900px" size="900px"
@@ -533,6 +534,7 @@
</el-drawer> </el-drawer>
<!-- 添加标准抽屉--> <!-- 添加标准抽屉-->
<el-drawer <el-drawer
class="drawer-table"
title="添加标准" title="添加标准"
:visible.sync="standModel" :visible.sync="standModel"
size="900px" size="900px"
@@ -1419,29 +1421,29 @@ export default {
// 表格某一行的单击事件 // 表格某一行的单击事件
rowClick(row, column) { rowClick(row, column) {
const selectData = this.selectList; const selectData = this.selectList;
this.$refs.selection.clearSelection(); this.$refs.detailedSelection.clearSelection();
if (selectData.length === 1) { if (selectData.length === 1) {
selectData.forEach(item => { selectData.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中 // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item === row) { if (item === row) {
this.$refs.selection.toggleRowSelection(row, false); this.$refs.detailedSelection.toggleRowSelection(row, false);
} }
// 不然就让当前的一行勾选 // 不然就让当前的一行勾选
else { else {
this.$refs.selection.toggleRowSelection(row, true); this.$refs.detailedSelection.toggleRowSelection(row, true);
} }
}); });
} else { } else {
this.$refs.selection.toggleRowSelection(row, true); this.$refs.detailedSelection.toggleRowSelection(row, true);
} }
}, },
select(selection, row) { select(selection, row) {
// 清除 所有勾选项 // 清除 所有勾选项
this.$refs.selection.clearSelection(); this.$refs.detailedSelection.clearSelection();
// 当表格数据都没有被勾选的时候 就返回 // 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除 // 主要用于将当前勾选的表格状态清除
if (selection.length === 0) return; if (selection.length === 0) return;
this.$refs.selection.toggleRowSelection(row, true); this.$refs.detailedSelection.toggleRowSelection(row, true);
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
@@ -1633,5 +1635,10 @@ export default {
height: calc(~'100% - 65px'); height: calc(~'100% - 65px');
overflow: auto; overflow: auto;
} }
.drawer-table{
/deep/.el-drawer__body{
overflow-y: hidden;
}
}
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+14 -6
View File
@@ -235,6 +235,7 @@
</div> </div>
<!-- 选择清单抽屉--> <!-- 选择清单抽屉-->
<el-drawer <el-drawer
class="drawer-table"
title="选择清单" title="选择清单"
:visible.sync="ListModel" :visible.sync="ListModel"
size="900px" size="900px"
@@ -503,6 +504,7 @@
</el-drawer> </el-drawer>
<!-- 添加标准抽屉--> <!-- 添加标准抽屉-->
<el-drawer <el-drawer
class="drawer-table"
title="添加标准" title="添加标准"
:visible.sync="standModel" :visible.sync="standModel"
size="900px" size="900px"
@@ -1387,12 +1389,13 @@ export default {
} }
}, },
select(selection, row) { select(selection, row) {
console.log(selection);
// 清除 所有勾选项 // 清除 所有勾选项
this.$refs.selection.clearSelection() this.$refs.detailedSelection.clearSelection()
// 当表格数据都没有被勾选的时候 就返回 // 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除 // 主要用于将当前勾选的表格状态清除
if(selection.length === 0) return if(selection.length === 0) return
this.$refs.selection.toggleRowSelection(row, true) this.$refs.detailedSelection.toggleRowSelection(row, true)
}, },
//添加标准select的改变 //添加标准select的改变
selectThree(data) { selectThree(data) {
@@ -1401,21 +1404,21 @@ export default {
// 表格某一行的单击事件 // 表格某一行的单击事件
rowClick(row, column) { rowClick(row, column) {
const selectData = this.selectList const selectData = this.selectList
this.$refs.selection.clearSelection() this.$refs.detailedSelection.clearSelection()
if( selectData.length === 1 ) { if( selectData.length === 1 ) {
selectData.forEach(item => { selectData.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中 // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item === row) { if (item === row) {
this.$refs.selection.toggleRowSelection(row, false); this.$refs.detailedSelection.toggleRowSelection(row, false);
} }
// 不然就让当前的一行勾选 // 不然就让当前的一行勾选
else { else {
this.$refs.selection.toggleRowSelection(row, true); this.$refs.detailedSelection.toggleRowSelection(row, true);
} }
}) })
} }
else { else {
this.$refs.selection.toggleRowSelection(row, true); this.$refs.detailedSelection.toggleRowSelection(row, true);
} }
}, },
choiceZRR(type, title, id) { choiceZRR(type, title, id) {
@@ -1595,5 +1598,10 @@ export default {
height: calc(~'100% - 65px'); height: calc(~'100% - 65px');
overflow: auto; overflow: auto;
} }
.drawer-table{
/deep/.el-drawer__body{
overflow-y: hidden;
}
}
} }
</style> </style>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+10 -5
View File
@@ -1771,11 +1771,16 @@
<el-col :span="12"> <el-col :span="12">
<!-- 归口管理部门--> <!-- 归口管理部门-->
<el-form-item label="归口管理部门" class="add-form-item form-item-disabled"> <el-form-item label="归口管理部门" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable> <search-select
<el-option v-for="(opt, index) in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value" v-model="advanceSearchMapping.GKDW"
:key="index" :label="opt.label">{{ opt.label }} :placeholder="'归口管理部门'"
</el-option> :options="gkglbmOptions"
</el-select> clearable/>
<!-- <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable>-->
<!-- <el-option v-for="(opt, index) in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"-->
<!-- :key="index" :label="opt.label">{{ opt.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
</el-form-item> </el-form-item>
<!-- 我司参与深度--> <!-- 我司参与深度-->
<el-form-item label="我司参与深度" class="add-form-item form-item-disabled"> <el-form-item label="我司参与深度" class="add-form-item form-item-disabled">
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+28 -2
View File
@@ -809,7 +809,7 @@
{required: true, message: '请选择起草人', trigger: 'change'}, {required: true, message: '请选择起草人', trigger: 'change'},
], ],
rqbJson: [ rqbJson: [
{required: true, message: '请选择代替企标编号', trigger: 'change'}, {required: false, message: '请选择代替企标编号', trigger: ['change', 'blur']},
] ]
}, },
form: { form: {
@@ -1038,6 +1038,7 @@
} }
this.addForm.unit = list this.addForm.unit = list
this.addForm.unitName = listName this.addForm.unitName = listName
this.$refs.addForm.validateField('unitName')
this.modalshowflagZRBM = false this.modalshowflagZRBM = false
}, },
choiceZRBM(id) { choiceZRBM(id) {
@@ -1161,7 +1162,32 @@
}, },
addData () { addData () {
this.addDrawerTitle = '新增' this.addDrawerTitle = '新增'
this.addForm = {} this.addForm = {
bussSort:'',
esMatingRelations: '',
technologic: '',
useLevel: '',
isRelate: '',
esStandRelations: '',
area: [],
tsJson: '',
tsJsonName: '',
rqbJson: '',
rqbName: '',
unit: '', // 单位
unitName: '',
esName: '', // 企标名称
planStatus: '', // 计划状态
reviseStatus: '', // 制修订状态
resPerson: '', // 评审责任人
resPersonName: '',
wgLeader: '', // 工作组组长
wgLeaderName: '',
draftTime: '', // 计划标准初稿完成时间
releaseTime: '', // 计划标准发布时间
drafter: '', // 起草人
drafterName: ''
}
this.DrawerType = 'add' this.DrawerType = 'add'
this.addForm.planStatus = '0' this.addForm.planStatus = '0'
this.addDrawer = true this.addDrawer = true
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+1 -1
View File
@@ -457,7 +457,7 @@ export default {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails', name: 'OtherStandardDetails',
params: { params: {
id: item.id, id: item.standId,
pageType: 'INLAND_STAND' pageType: 'INLAND_STAND'
// pageType: item.standType + '_STAND' // pageType: item.standType + '_STAND'
} }
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+1
View File
@@ -896,6 +896,7 @@ export default {
}, },
showStand(){ showStand(){
this.dialogTableVisible = true this.dialogTableVisible = true
this.getStandDataBtn()
}, },
//标准查询按钮 //标准查询按钮
getStandDataBtn(){ getStandDataBtn(){
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+23 -1
View File
@@ -388,6 +388,7 @@ export default {
console.log(res.data.records); console.log(res.data.records);
this.total = res.data.total this.total = res.data.total
this.spinShow = false this.spinShow = false
localStorage.setItem('refreshFlag', false)
}, e => { }, e => {
}) })
}, },
@@ -557,6 +558,13 @@ export default {
}, },
handleQueryPdf(file){ handleQueryPdf(file){
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId)) window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId))
},
isVisible(e) {
if (e.target.visibilityState === "visible") {
this.getList()
} else if (e.target.visibilityState === "hidden") {
this.getList()
}
} }
}, },
watch: { watch: {
@@ -572,6 +580,17 @@ export default {
...mapGetters(['refreshFlag']) ...mapGetters(['refreshFlag'])
}, },
mounted() { mounted() {
const that = this;
//监听缓存中指定key的值变化
window.addEventListener("setItemEvent",function(e){
//e.key : 是值发生变化的key
//例如 e.key==="token";
//e.newValue : 是可以对应的新值
if(e.key === "refreshFlag" && e.newValue === true){
this.getList()
}
})
document.addEventListener('visibilitychange', that.isVisible)
if (this.lawsStand) { if (this.lawsStand) {
this.form = { this.form = {
ideaId: this.lawsStand.id, ideaId: this.lawsStand.id,
@@ -613,7 +632,10 @@ export default {
this.getList() this.getList()
this.getIdeaKey() this.getIdeaKey()
this.getFileInfo() this.getFileInfo()
} },
destroyed() {
document.removeEventListener('visibilitychange', this.isVisible)
},
} }
</script> </script>
src/utils/tool.js
+13
View File
@@ -0,0 +1,13 @@
function dispatchEventStroage() {
const signSetItem = localStorage.setItem
localStorage.setItem = function(key, val) {
let setEvent = new Event('setItemEvent')
setEvent.key = key
setEvent.newValue = val
window.dispatchEvent(setEvent)
signSetItem.apply(this, arguments)
}
}
export default dispatchEventStroage