Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 14913a73 by liuyong
Options

修改代码

1 parent d5b25ba3
Expand all
Inline Side-by-side
Showing with 318 additions and 152 deletions
public/drawio/extention/js/exFormat.js
...@@ -100,7 +100,7 @@ const initAttributePanel = function(that) { ...@@ -100,7 +100,7 @@ const initAttributePanel = function(that) {
if(cell.style.includes('svg+xml')) {//新增图库的图形 if(cell.style.includes('svg+xml')) {//新增图库的图形
const decode_style = window.atob(cell.style.split("svg+xml,")[1]);//svg解码，为字符串 const decode_style = window.atob(cell.style.split("svg+xml,")[1].split(';')[0]);//svg解码，为字符串
const svgDocument = new DOMParser().parseFromString(decode_style, 'text/xml');//svg字符串转标签 const svgDocument = new DOMParser().parseFromString(decode_style, 'text/xml');//svg字符串转标签
const svgTag = svgDocument.getElementsByTagName('svg')[0]; const svgTag = svgDocument.getElementsByTagName('svg')[0];
...@@ -118,7 +118,7 @@ const initAttributePanel = function(that) { ...@@ -118,7 +118,7 @@ const initAttributePanel = function(that) {
}) })
} }
}) })
console.log(attrArray); // console.log(attrArray);
if(attrArray.length > 0) { if(attrArray.length > 0) {
attrArray.forEach(item => { attrArray.forEach(item => {
addListPanel(that, item.name, item.value); addListPanel(that, item.name, item.value);
......
public/drawio/extention/js/url.js
const ajaxUrl = '43.143.211.42:7003'; const ajaxUrl = '172.20.10.3:7003';
\ No newline at end of file \ No newline at end of file
public/drawio/js/grapheditor/Format.js
...@@ -809,7 +809,6 @@ BaseFormatPanel.prototype.createOption = function(label, isCheckedFn, setChecked ...@@ -809,7 +809,6 @@ BaseFormatPanel.prototype.createOption = function(label, isCheckedFn, setChecked
var applying = false; var applying = false;
var value = isCheckedFn(); var value = isCheckedFn();
var apply = function(newValue, evt) var apply = function(newValue, evt)
{ {
if (!applying) if (!applying)
...@@ -832,7 +831,6 @@ BaseFormatPanel.prototype.createOption = function(label, isCheckedFn, setChecked ...@@ -832,7 +831,6 @@ BaseFormatPanel.prototype.createOption = function(label, isCheckedFn, setChecked
if (value != newValue) if (value != newValue)
{ {
value = newValue; value = newValue;
// Checks if the color value needs to be updated in the model // Checks if the color value needs to be updated in the model
if (isCheckedFn() != value) if (isCheckedFn() != value)
{ {
...@@ -884,7 +882,7 @@ BaseFormatPanel.prototype.createCellOption = function(label, key, defaultValue, ...@@ -884,7 +882,7 @@ BaseFormatPanel.prototype.createCellOption = function(label, key, defaultValue,
var ui = this.editorUi; var ui = this.editorUi;
var editor = ui.editor; var editor = ui.editor;
var graph = editor.graph; var graph = editor.graph;
enabledValue = (enabledValue != null) ? ((enabledValue == 'null') ? null : enabledValue) : 1; enabledValue = (enabledValue != null) ? ((enabledValue == 'null') ? null : enabledValue) : 1;
disabledValue = (disabledValue != null) ? ((disabledValue == 'null') ? null : disabledValue) : 0; disabledValue = (disabledValue != null) ? ((disabledValue == 'null') ? null : disabledValue) : 0;
......
src/api/index.js
...@@ -25,7 +25,7 @@ export function delete_jia_gou_gui_shu(params) {// 删除架构元素列表某 ...@@ -25,7 +25,7 @@ export function delete_jia_gou_gui_shu(params) {// 删除架构元素列表某
return post('/network/ele/del-ele', params); return post('/network/ele/del-ele', params);
} }
export function version_release_jia_gou_gui_shu(params) {// 版本发布 export function version_release_jia_gou_gui_shu(params) {// 版本发布
return post('/network/ele/updateEleBatch', params); return post('/network/ele/updEleBatch', params);
} }
export function add_jia_gou_yuan_su(params) {// 架构元素管理，新建 export function add_jia_gou_yuan_su(params) {// 架构元素管理，新建
return post('/network/ele/ad-ele', params); return post('/network/ele/ad-ele', params);
...@@ -136,7 +136,7 @@ export function save_drawio_xml_and_svg(params) { ...@@ -136,7 +136,7 @@ export function save_drawio_xml_and_svg(params) {
} }
// 版本发布 // 版本发布
export function save_drawio_version(params) { export function save_drawio_version(params) {
return post('/network/ma-ml/updateYnMol', params); return post('/network/ma-ml/updArchiMetaModel', params);
} }
// 获取字典数据 // 获取字典数据
...@@ -193,6 +193,10 @@ export function getArchiViewManageTable(params) { ...@@ -193,6 +193,10 @@ export function getArchiViewManageTable(params) {
export function getJiShuZhengCeJieGouHuaTable(params) { export function getJiShuZhengCeJieGouHuaTable(params) {
return post('/kl-tech-policy/', params); return post('/kl-tech-policy/', params);
} }
// 技术政策结构化-导出
export function exportJiShuZhengCeJieGouHuaTable(params) {
return download('/excelUtil/exportKtp', params);
}
// 技术政策结构化-新增 // 技术政策结构化-新增
export function addJiShuZhengCeJieGouHuaTable(params) { export function addJiShuZhengCeJieGouHuaTable(params) {
return post('/kl-tech-policy/add', params); return post('/kl-tech-policy/add', params);
...@@ -231,7 +235,10 @@ export function get_BaoGaoMoBanJieGouHua_Table(params) { ...@@ -231,7 +235,10 @@ export function get_BaoGaoMoBanJieGouHua_Table(params) {
export function get_BaoGaoMoBanGuanLianShiYong_Table(params) { export function get_BaoGaoMoBanGuanLianShiYong_Table(params) {
return post('/kl-report-temp-link/', params); return post('/kl-report-temp-link/', params);
} }
// 报告模板关联使用-导出
export function export_BaoGaoMoBanGuanLianShiYong_Table(params) {
return download('/excelUtil/exportRtl', params);
}
// 专家人才库管理 // 专家人才库管理
// 列表查询 // 列表查询
export function getETPManageList(params) { export function getETPManageList(params) {
......
src/views/archi-view-manage/canvas/index.vue
...@@ -23,31 +23,29 @@ ...@@ -23,31 +23,29 @@
}, },
mounted(){ mounted(){
const id = window.location.href.split("id=")[1].split("&")[0]; const id = window.location.href.split("id=")[1].split("&")[0];
const version = window.location.href.split("id=")[1].split("&")[1].split("=")[1];
this.routerId = { this.routerId = {
id, id,
} }
window.addEventListener("message", event => {//会一直调用
if(event.data.type) { window.onmessage = e => {
if(event.data.type == 'saveData') { if(e.data.type == 'saveData') {
// console.log(event.data.type) MessageBox.confirm('确定保存?', '提示', {
MessageBox.confirm('确定保存?', '提示', { confirmButtonText: '确定',
confirmButtonText: '确定', cancelButtonText: '取消',
cancelButtonText: '取消', customClass: 'messageClass',
customClass: 'messageClass', confirmButtonClass: 'confirmClass',
confirmButtonClass: 'confirmClass', type: 'warning'
type: 'warning' }).then(() => {
}).then(() => { this.saveCanvas(id, e.data.data.mxGraphModel, e.data.data.base64SvgToString);
this.saveCanvas(id, event.data.data.mxGraphModel, event.data.data.base64SvgToString); }).catch(() => {
}).catch(() => { Message({
Message({ type: 'info',
type: 'info', message: '已取消'
message: '已取消' });
}); });
});
}
} }
if(event.data.type == 'saveVersion'){
if(e.data.type == 'saveVersion'){
MessageBox.confirm('确定发布版本?', '提示', { MessageBox.confirm('确定发布版本?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
...@@ -63,7 +61,7 @@ ...@@ -63,7 +61,7 @@
}); });
}); });
} }
}); }
}, },
methods: { methods: {
saveCanvas(id, mxGraphModel, base64SvgToString) { saveCanvas(id, mxGraphModel, base64SvgToString) {
......
src/views/archi-view-manage/index.vue
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<el-tree <el-tree
class="filter-tree" class="filter-tree"
:data="treeData" :data="treeData"
:highlight-current="true"
node-key="viewId" node-key="viewId"
@node-click="treeClick" @node-click="treeClick"
:props="{ children: 'subList', label: 'viewName', id: 'viewId' }" :props="{ children: 'subList', label: 'viewName', id: 'viewId' }"
...@@ -11,41 +12,41 @@ ...@@ -11,41 +12,41 @@
</el-tree> </el-tree>
<div class="right_container"> <div class="right_container">
<el-tabs v-model="activeName" type="border-card"> <el-tabs v-model="activeName" type="border-card">
<el-tab-pane label="已发布" name="已发布"> <el-tab-pane label="暂存" name="暂存">
<div class="card_container"> <div class="card_container">
<div class="card_body"> <div class="card_body">
<el-card class="card_item" v-for="item in yiFaBu" :key="item.metaModelId"> <el-card class="card_item" v-for="item in zanCun" :key="item.metaModelId">
<img class="card_image" @click="to_current_details(item)" :src="item.metaModelSvg_" alt="" /> <img class="card_image" @click="to_current_details(item)" :src="item.metaModelSvg_" alt="" />
<div class="card_info"> <div class="card_info">
<div class="card_title"> <div class="card_title">
<i class="el-icon-location"></i> <i class="el-icon-location"></i>
{{ item.verName }}&nbsp;&nbsp;&nbsp;{{ item.version }} {{ item.verName }}&nbsp;&nbsp;&nbsp;{{ item.version }}
</div> </div>
<!-- <div class="card_icon" @click.stop="deleteItem(item)"> <div class="card_icon" @click.stop="deleteItem(item)">
<i class="el-icon-delete"></i> <i class="el-icon-delete"></i>
</div> --> </div>
</div> </div>
</el-card> </el-card>
<div class="add_container" @click="add_dialog = true"> <div v-if="viewId" class="add_container" @click="open_dialog('暂存')">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</div> </div>
</div> </div>
</div> </div>
<el-pagination <el-pagination
background background
@size-change="val => handleSizeChange(val, '已发布')" @size-change="val => handleSizeChange(val, '暂存')"
@current-change="val => handleCurrentChange(val, '已发布')" @current-change="val => handleCurrentChange(val, '暂存')"
:current-page="pager1.current" :current-page="pager2.current"
:page-sizes="pager1.sizes" :page-sizes="pager2.sizes"
:page-size="pager1.size" :page-size="pager2.size"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="pager1.total"> :total="pager2.total">
</el-pagination> </el-pagination>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="暂存" name="暂存"> <el-tab-pane label="停用" name="停用">
<div class="card_container"> <div class="card_container">
<div class="card_body"> <div class="card_body">
<el-card class="card_item" v-for="item in zanCun" :key="item.metaModelId"> <el-card class="card_item" v-for="item in tingYong" :key="item.metaModelId">
<img class="card_image" @click="to_current_details(item)" :src="item.metaModelSvg_" alt="" /> <img class="card_image" @click="to_current_details(item)" :src="item.metaModelSvg_" alt="" />
<div class="card_info"> <div class="card_info">
<div class="card_title"> <div class="card_title">
...@@ -57,51 +58,51 @@ ...@@ -57,51 +58,51 @@
</div> </div>
</div> </div>
</el-card> </el-card>
<div class="add_container" @click="add_dialog = true"> <div v-if="viewId" class="add_container" @click="open_dialog('停用')">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</div> </div>
</div> </div>
</div> </div>
<el-pagination <el-pagination
background background
@size-change="val => handleSizeChange(val, '暂存')" @size-change="val => handleSizeChange(val, '停用')"
@current-change="val => handleCurrentChange(val, '暂存')" @current-change="val => handleCurrentChange(val, '停用')"
:current-page="pager2.current" :current-page="pager3.current"
:page-sizes="pager2.sizes" :page-sizes="pager3.sizes"
:page-size="pager2.size" :page-size="pager3.size"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="pager2.total"> :total="pager3.total">
</el-pagination> </el-pagination>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="停用" name="停用"> <el-tab-pane label="发布" name="发布">
<div class="card_container"> <div class="card_container">
<div class="card_body"> <div class="card_body">
<el-card class="card_item" v-for="item in tingYong" :key="item.metaModelId"> <el-card class="card_item" v-for="item in yiFaBu" :key="item.metaModelId">
<img class="card_image" @click="to_current_details(item)" :src="item.metaModelSvg_" alt="" /> <img class="card_image" @click="to_current_details(item)" :src="item.metaModelSvg_" alt="" />
<div class="card_info"> <div class="card_info">
<div class="card_title"> <div class="card_title">
<i class="el-icon-location"></i> <i class="el-icon-location"></i>
{{ item.verName }}&nbsp;&nbsp;&nbsp;{{ item.version }} {{ item.verName }}&nbsp;&nbsp;&nbsp;{{ item.version }}
</div> </div>
<div class="card_icon" @click.stop="deleteItem(item)"> <!-- <div class="card_icon" @click.stop="deleteItem(item)">
<i class="el-icon-delete"></i> <i class="el-icon-delete"></i>
</div> </div> -->
</div> </div>
</el-card> </el-card>
<div class="add_container" @click="add_dialog = true"> <div v-if="viewId" class="add_container" @click="open_dialog('发布')">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</div> </div>
</div> </div>
</div> </div>
<el-pagination <el-pagination
background background
@size-change="val => handleSizeChange(val, '停用')" @size-change="val => handleSizeChange(val, '发布')"
@current-change="val => handleCurrentChange(val, '停用')" @current-change="val => handleCurrentChange(val, '发布')"
:current-page="pager3.current" :current-page="pager1.current"
:page-sizes="pager3.sizes" :page-sizes="pager1.sizes"
:page-size="pager3.size" :page-size="pager1.size"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="pager3.total"> :total="pager1.total">
</el-pagination> </el-pagination>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -114,7 +115,7 @@ ...@@ -114,7 +115,7 @@
<div class="add_dialog_content"> <div class="add_dialog_content">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm">
<el-form-item label="版本名称" prop="name"> <el-form-item label="版本名称" prop="name">
<el-input v-model="ruleForm.name"></el-input> <el-input v-model="ruleForm.name" maxlength="100"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -153,7 +154,7 @@ export default { ...@@ -153,7 +154,7 @@ export default {
subList: [] subList: []
} }
], ],
activeName: '已发布', activeName: '暂存',
pager1: { pager1: {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
...@@ -185,6 +186,7 @@ export default { ...@@ -185,6 +186,7 @@ export default {
{ required: true, message: '请输入版本名称', trigger: 'blur' }, { required: true, message: '请输入版本名称', trigger: 'blur' },
], ],
}, },
addStatus: null
}; };
}, },
mounted(){ mounted(){
...@@ -199,12 +201,11 @@ export default { ...@@ -199,12 +201,11 @@ export default {
if(res.code == 200) { if(res.code == 200) {
const xmlData = res.data.metaModelData; const xmlData = res.data.metaModelData;
const xmlTitle = res.data.verName; const xmlTitle = res.data.verName;
const version = res.data.version;
const id = res.data.viewDetailsId; const id = res.data.viewDetailsId;
localStorage.setItem('xmlData', xmlData); localStorage.setItem('xmlData', xmlData);
localStorage.setItem('xmlTitle', xmlTitle); localStorage.setItem('xmlTitle', xmlTitle);
this.$router.push( `/main/archiViewManageDetails/id=${id}&version=${version}`, () => {}, () => {} ); this.$router.push( `/main/archiViewManageDetails/id=${id}`, () => {}, () => {} );
} }
}); });
}, },
...@@ -242,12 +243,29 @@ export default { ...@@ -242,12 +243,29 @@ export default {
}); });
}); });
}, },
open_dialog(status) {//打开新增对话框
this.addStatus = status;
this.add_dialog = true;
},
ok() {//弹框点击确定 ok() {//弹框点击确定
this.$refs.ruleForm.validate(valid => { this.$refs.ruleForm.validate(valid => {
if(valid) { if(valid) {
let state;
switch(this.addStatus){
case '暂存':
state = 2;
break;
case '停用':
state = 0;
break;
case '发布':
state = 1;
break;
}
const params = { const params = {
version: this.ruleForm.name, version: this.ruleForm.name,
viewId: this.viewId viewId: this.viewId,
state: state
}; };
addArchiViewManage(params).then(res => { addArchiViewManage(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
...@@ -275,7 +293,7 @@ export default { ...@@ -275,7 +293,7 @@ export default {
// 每页条数改变 // 每页条数改变
handleSizeChange(val, status) { handleSizeChange(val, status) {
switch(status){ switch(status){
case '已发布': case '发布':
this.pager1.current = 1; this.pager1.current = 1;
this.pager1.size = val; this.pager1.size = val;
this.get_list1(); this.get_list1();
...@@ -295,7 +313,7 @@ export default { ...@@ -295,7 +313,7 @@ export default {
//当前页码改变 //当前页码改变
handleCurrentChange(val, status) { handleCurrentChange(val, status) {
switch(status){ switch(status){
case '已发布': case '发布':
this.pager1.current = val; this.pager1.current = val;
this.get_list1(); this.get_list1();
break; break;
...@@ -398,6 +416,13 @@ export default { ...@@ -398,6 +416,13 @@ export default {
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/ .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{
background-color: #0D867F;
color: #fff;
}
/deep/ .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content >.is-leaf{
background-color: #0D867F !important;
}
/deep/ .el-dialog__header{ /deep/ .el-dialog__header{
background-color: #0D867F; background-color: #0D867F;
text-align: left; text-align: left;
......
src/views/meta-model-list/canvas/index.vue
...@@ -24,47 +24,44 @@ ...@@ -24,47 +24,44 @@
mounted(){ mounted(){
const id = window.location.href.split("id=")[1].split("&")[0]; const id = window.location.href.split("id=")[1].split("&")[0];
const version = window.location.href.split("id=")[1].split("&")[1].split("=")[1]; const version = window.location.href.split("id=")[1].split("&")[1].split("=")[1];
// const state = window.location.href.split("id=")[1].split("&")[2].split("=")[1];
this.routerId = { this.routerId = {
id, id,
} }
window.addEventListener("message", event => {//会一直调用 window.onmessage = e => {
if(event.data.type) { if(e.data.type == 'saveData') {
if(event.data.type == 'saveData') { MessageBox.confirm('确定保存?', '提示', {
MessageBox.confirm('确定保存?', '提示', { confirmButtonText: '确定',
confirmButtonText: '确定', cancelButtonText: '取消',
cancelButtonText: '取消', customClass: 'messageClass',
customClass: 'messageClass', confirmButtonClass: 'confirmClass',
confirmButtonClass: 'confirmClass', type: 'warning'
type: 'warning' }).then(() => {
}).then(() => { this.saveCanvas(id, e.data.data.mxGraphModel, e.data.data.base64SvgToString);
this.saveCanvas(id, event.data.data.mxGraphModel, event.data.data.base64SvgToString); }).catch(() => {
}).catch(() => { Message({
Message({ type: 'info',
type: 'info', message: '已取消'
message: '已取消' });
}); });
}); }
} if(e.data.type == 'saveVersion'){
if(event.data.type == 'saveVersion'){ MessageBox.confirm('确定发布版本?', '提示', {
MessageBox.confirm('确定发布版本?', '提示', { confirmButtonText: '确定',
confirmButtonText: '确定', cancelButtonText: '取消',
cancelButtonText: '取消', customClass: 'messageClass',
customClass: 'messageClass', confirmButtonClass: 'confirmClass',
confirmButtonClass: 'confirmClass', type: 'warning'
type: 'warning' }).then(() => {
}).then(() => { this.releaseVersion(id, version);
this.releaseVersion(id, version); }).catch(() => {
}).catch(() => { Message({
Message({ type: 'info',
type: 'info', message: '已取消'
message: '已取消' });
}); });
});
}
} }
}); }
}, },
methods: { methods: {
saveCanvas(id, mxGraphModel, base64SvgToString) { saveCanvas(id, mxGraphModel, base64SvgToString) {
......
src/views/meta-model-list/index.vue
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<div class="add_dialog_content"> <div class="add_dialog_content">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm">
<el-form-item label="版本名称" prop="name"> <el-form-item label="版本名称" prop="name">
<el-input v-model="ruleForm.name"></el-input> <el-input v-model="ruleForm.name" maxlength="100"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -259,10 +259,18 @@ export default { ...@@ -259,10 +259,18 @@ export default {
// console.log(res) // console.log(res)
if(res.code == 200) { if(res.code == 200) {
this.add_dialog = false; this.add_dialog = false;
this.$router.push(`/main/metaModelListDetails/?id=${res.data}`, () => {}, () => {} ); const params = {
Message({ metaModelId: res.data
type: 'success', }
message: '新增成功!' query_yuan_mo_xing_details(params).then(res2 => {
if(res2.code == 200) {
const xmlData = res2.data.metaModelData;
const xmlTitle = res2.data.verName;
const version = res2.data.version;
localStorage.setItem('xmlData', xmlData);
localStorage.setItem('xmlTitle', xmlTitle);
this.$router.push( `/main/metaModelListDetails/id=${res.data}&version=${version}`, () => {}, () => {} );
}
}); });
}else { }else {
Message({ Message({
...@@ -272,7 +280,6 @@ export default { ...@@ -272,7 +280,6 @@ export default {
} }
}) })
} else { } else {
console.log('error submit!!');
return false; return false;
} }
}); });
......
src/views/report-template-fabric/index.vue
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">模板名称</span> <span class="search_title">模板名称</span>
<el-input v-model="searchParams.tempName" placeholder="请输入内容" class="search_item"></el-input> <el-input maxlength="100" v-model="searchParams.tempName" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">模板类型</span> <span class="search_title">模板类型</span>
<el-input v-model="searchParams.tempType" placeholder="请输入内容" class="search_item"></el-input> <el-input maxlength="100" v-model="searchParams.tempType" placeholder="请输入内容" class="search_item"></el-input>
<!-- <el-select v-model="searchParams.tempType" placeholder="请选择" class="search_item"> <!-- <el-select v-model="searchParams.tempType" placeholder="请选择" class="search_item">
<el-option v-for="item in moBanLeiXing" :key="item.value" :label="item.tempName" :value="item.value"></el-option> <el-option v-for="item in moBanLeiXing" :key="item.value" :label="item.tempName" :value="item.value"></el-option>
</el-select> --> </el-select> -->
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
type="daterange" type="daterange"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
:unlink-panels="true"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
...@@ -54,8 +55,12 @@ ...@@ -54,8 +55,12 @@
<el-table-column prop="createMan" label="创建人" align="center"></el-table-column> <el-table-column prop="createMan" label="创建人" align="center"></el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center"></el-table-column> <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
<el-table-column prop="version" label="版本" align="center"></el-table-column> <el-table-column prop="version" label="版本" align="center"></el-table-column>
<el-table-column prop="fileId" label="附件" align="center"></el-table-column> <el-table-column label="附件" align="center">
<el-table-column prop="tempRemark" label="备注" align="center"></el-table-column> <template slot-scope="scope">
<el-button v-if="scope.row.fileName" @click="exportFile()" type="text" style="text-decoration: underline;color: #0D867F;">{{ scope.row.fileName }}</el-button>
</template>
</el-table-column>
<el-table-column prop="tempRemark" width="200" :show-overflow-tooltip="true" label="备注" align="center"></el-table-column>
<el-table-column label="操作" width="260" align="center"> <el-table-column label="操作" width="260" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;"> <div style="display: flex;align-items: center;justify-content: center;">
...@@ -83,20 +88,21 @@ ...@@ -83,20 +88,21 @@
</div> </div>
<el-dialog <el-dialog
title="模板信息" :title="is_add_edit == 'add' ? '新建模版信息' : '编辑模版信息'"
:visible.sync="add_dialog" :visible.sync="add_dialog"
:center="false" :center="false"
:close-on-click-modal="false"
width="60%"> width="60%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<el-form :model="ruleForm" ref="form"> <el-form :model="ruleForm" :rules="rules" ref="form">
<div class="form_item_container"> <div class="form_item_container">
<el-form-item label="模版名称:" prop="let1"> <el-form-item label="模版名称:" prop="let1">
<el-input v-model="ruleForm.let1"></el-input> <el-input maxlength="100" v-model="ruleForm.let1"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模版类型:" prop="let2"> <el-form-item label="模版类型:" prop="let2">
<el-input v-model="ruleForm.let2"></el-input> <el-input maxlength="100" v-model="ruleForm.let2"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模版文件:" style="width: 100%;"> <el-form-item label="模版文件:" prop="let3" style="width: 100%;">
<!-- <input @change="fileUpload" type="file" /> --> <!-- <input @change="fileUpload" type="file" /> -->
<el-upload <el-upload
class="upload-demo" class="upload-demo"
...@@ -147,7 +153,32 @@ export default { ...@@ -147,7 +153,32 @@ export default {
let1: '', let1: '',
let2: '', let2: '',
let3: null, let3: null,
let4: '' let4: '',
let5: null,
let6: null,
},
rules: {
let1: [
{ required: true, message: '请输入模版名称', trigger: 'blur' },
],
let2: [
{ required: true, message: '请输入模版类型', trigger: 'blur' },
],
let3: [
{
required: true,
validator: (rule, value, callback) => {
if(!value) {
callback(new Error('请上传文件.'));
}else {
callback();
}
}
},
],
let4: [
{ required: true, message: '请输入备注', trigger: 'change' },
],
}, },
tableData: [], tableData: [],
add_dialog: false, add_dialog: false,
...@@ -182,6 +213,9 @@ export default { ...@@ -182,6 +213,9 @@ export default {
}, },
methods: { methods: {
exportFile() {//附件下载
},
editItem(row) {//编辑 editItem(row) {//编辑
this.is_add_edit = 'edit'; this.is_add_edit = 'edit';
this.editId = row.krtId; this.editId = row.krtId;
...@@ -191,13 +225,17 @@ export default { ...@@ -191,13 +225,17 @@ export default {
this.add_dialog = true; this.add_dialog = true;
}, },
handleRemove(file, fileList) {//文件移出 handleRemove(file, fileList) {//文件移出
// console.log(file, fileList); console.log(fileList);
console.log(this.fileList);
this.ruleForm.let3 = null;
this.ruleForm.let5 = null;
this.ruleForm.let6 = null;
}, },
handleFileUploadSuccess(res, file, fileList) {//文件上传 handleFileUploadSuccess(res, file, fileList) {//文件上传
this.ruleForm.let3 = res.data.fileId; this.ruleForm.let3 = res.data.fileId;
// console.log(res); this.ruleForm.let5 = file.name;
// console.log(file); this.ruleForm.let6 = res.data.downLoadUrl;
// console.log(fileList); this.$refs.form.clearValidate('let3');
}, },
deleteItem(row) {//删除 deleteItem(row) {//删除
MessageBox.confirm('确定删除?', '提示', { MessageBox.confirm('确定删除?', '提示', {
...@@ -240,6 +278,8 @@ export default { ...@@ -240,6 +278,8 @@ export default {
tempName: this.ruleForm.let1, tempName: this.ruleForm.let1,
tempType: this.ruleForm.let2, tempType: this.ruleForm.let2,
fileId: this.ruleForm.let3, fileId: this.ruleForm.let3,
fileName: this.ruleForm.let5,
fileLink: this.ruleForm.let6,
tempRemark: this.ruleForm.let4, tempRemark: this.ruleForm.let4,
}; };
const requestParams = this.is_add_edit == 'add' ? params : { ...params, krtId: this.editId }; const requestParams = this.is_add_edit == 'add' ? params : { ...params, krtId: this.editId };
...@@ -300,6 +340,9 @@ export default { ...@@ -300,6 +340,9 @@ export default {
}, },
add() {//新建按钮 add() {//新建按钮
this.add_dialog = true; this.add_dialog = true;
this.$nextTick(() => {
this.$refs.form.resetFields();
});
this.ruleForm.let1 = null; this.ruleForm.let1 = null;
this.ruleForm.let2 = null; this.ruleForm.let2 = null;
this.ruleForm.let4 = null; this.ruleForm.let4 = null;
...@@ -358,15 +401,12 @@ export default { ...@@ -358,15 +401,12 @@ export default {
}, },
// 每页条数改变 // 每页条数改变
handleSizeChange(val) { handleSizeChange(val) {
console.log(1)
this.pager.current = 1; this.pager.current = 1;
this.pager.size = val; this.pager.size = val;
this.get_table(); this.get_table();
}, },
//当前页码改变 //当前页码改变
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(2)
this.pager.current = val; this.pager.current = val;
this.get_table(); this.get_table();
}, },
......
src/views/report-template-relative-use/index.vue
...@@ -5,19 +5,19 @@ ...@@ -5,19 +5,19 @@
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">单位</span> <span class="search_title">单位</span>
<el-input v-model="searchParams.deptName" placeholder="请输入内容" class="search_item"></el-input> <el-input maxlength="100" v-model="searchParams.deptName" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item" style="margin-right: 50px;"> <div class="search_menu_item" style="margin-right: 50px;">
<span class="search_title">系统名称</span> <span class="search_title">系统名称</span>
<el-input v-model="searchParams.appName" placeholder="请输入内容" class="search_item"></el-input> <el-input maxlength="100" v-model="searchParams.appName" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">项目名称</span> <span class="search_title">项目名称</span>
<el-input v-model="searchParams.projectName" placeholder="请输入内容" class="search_item"></el-input> <el-input maxlength="100" v-model="searchParams.projectName" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">模版名称</span> <span class="search_title">模版名称</span>
<el-input v-model="searchParams.tempName" placeholder="请输入内容" class="search_item"></el-input> <el-input maxlength="100" v-model="searchParams.tempName" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
</div> </div>
<div class="search_menu_btn_container"> <div class="search_menu_btn_container">
...@@ -87,12 +87,13 @@ ...@@ -87,12 +87,13 @@
</div> </div>
<el-dialog <el-dialog
title="报告模板关联使用" :title="is_add_edit == 'add' ? '新建报告模板关联使用' : '编辑报告模板关联使用'"
:visible.sync="add_dialog" :visible.sync="add_dialog"
:center="false" :center="false"
:close-on-click-modal="false"
width="60%"> width="60%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<el-form :model="ruleForm" ref="form"> <el-form :model="ruleForm" :rules="rules" ref="form">
<div class="form_item_container"> <div class="form_item_container">
<el-form-item label="单位:" prop="let1" style="margin-left: 27px;width: 30.5%;"> <el-form-item label="单位:" prop="let1" style="margin-left: 27px;width: 30.5%;">
<!-- <el-select v-model="ruleForm.let1" placeholder="请选择"> <!-- <el-select v-model="ruleForm.let1" placeholder="请选择">
...@@ -100,7 +101,7 @@ ...@@ -100,7 +101,7 @@
<el-option label="已停用" value="0"></el-option> <el-option label="已停用" value="0"></el-option>
<el-option label="暂存" value="2"></el-option> <el-option label="暂存" value="2"></el-option>
</el-select> --> </el-select> -->
<el-input v-model="ruleForm.let1"></el-input> <el-input maxlength="100" v-model="ruleForm.let1"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="系统名称:" prop="let2"> <el-form-item label="系统名称:" prop="let2">
<!-- <el-select v-model="ruleForm.let2" placeholder="请选择"> <!-- <el-select v-model="ruleForm.let2" placeholder="请选择">
...@@ -108,7 +109,7 @@ ...@@ -108,7 +109,7 @@
<el-option label="已停用" value="0"></el-option> <el-option label="已停用" value="0"></el-option>
<el-option label="暂存" value="2"></el-option> <el-option label="暂存" value="2"></el-option>
</el-select> --> </el-select> -->
<el-input v-model="ruleForm.let2"></el-input> <el-input maxlength="100" v-model="ruleForm.let2"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目名称:" prop="let3"> <el-form-item label="项目名称:" prop="let3">
<!-- <el-select v-model="ruleForm.let3" placeholder="请选择"> <!-- <el-select v-model="ruleForm.let3" placeholder="请选择">
...@@ -116,7 +117,7 @@ ...@@ -116,7 +117,7 @@
<el-option label="已停用" value="0"></el-option> <el-option label="已停用" value="0"></el-option>
<el-option label="暂存" value="2"></el-option> <el-option label="暂存" value="2"></el-option>
</el-select> --> </el-select> -->
<el-input v-model="ruleForm.let3"></el-input> <el-input maxlength="100" v-model="ruleForm.let3"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模板名称:" prop="let4"> <el-form-item label="模板名称:" prop="let4">
<el-select v-model="ruleForm.let4" placeholder="请选择" style="width: 210px;"> <el-select v-model="ruleForm.let4" placeholder="请选择" style="width: 210px;">
...@@ -141,7 +142,8 @@ import { ...@@ -141,7 +142,8 @@ import {
deleteBaoGaoMoBanGuanLianShiYong, deleteBaoGaoMoBanGuanLianShiYong,
deleteAllBaoGaoMoBanGuanLianShiYong, deleteAllBaoGaoMoBanGuanLianShiYong,
addBaoGaoMoBanGuanLianShiYong, addBaoGaoMoBanGuanLianShiYong,
getMoBanMingCheng getMoBanMingCheng,
export_BaoGaoMoBanGuanLianShiYong_Table
} from '@/api/index.js'; } from '@/api/index.js';
import { MessageBox, Message } from 'element-ui'; import { MessageBox, Message } from 'element-ui';
import $ from 'jquery'; import $ from 'jquery';
...@@ -159,6 +161,20 @@ export default { ...@@ -159,6 +161,20 @@ export default {
let3: null, let3: null,
let4: null, let4: null,
}, },
rules: {
let1: [
{ required: true, message: '请输入单位', trigger: 'blur' },
],
let2: [
{ required: true, message: '请输入系统名称', trigger: 'blur' },
],
let3: [
{ required: true, message: '请输入项目名称', trigger: 'blur' },
],
let4: [
{ required: true, message: '请选择模版名称', trigger: 'change' },
],
},
tableData: [], tableData: [],
add_dialog: false, add_dialog: false,
searchParams: { searchParams: {
...@@ -216,7 +232,22 @@ export default { ...@@ -216,7 +232,22 @@ export default {
inpEle.click(); inpEle.click();
}, },
exportFile() {//导出 exportFile() {//导出
const params = {
"deptName": this.searchParams.deptName,
"appName": this.searchParams.appName,
"projectName": this.searchParams.projectName,
"tempName": this.searchParams.tempName,
"current": this.pager.current,
"pageSize": this.pager.size,
};
export_BaoGaoMoBanGuanLianShiYong_Table(params).then(res => {
let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
let url = URL.createObjectURL(blob);
let link = document.createElement('a');
link.href = url;
document.body.appendChild(link);
link.click();
});
}, },
editItem(row) {//编辑 editItem(row) {//编辑
this.ruleForm.let1 = row.deptName; this.ruleForm.let1 = row.deptName;
...@@ -350,6 +381,9 @@ export default { ...@@ -350,6 +381,9 @@ export default {
}, },
add() {//新建按钮 add() {//新建按钮
this.add_dialog = true; this.add_dialog = true;
this.$nextTick(() => {
this.$refs.form.resetFields();
});
this.is_add_edit = 'add'; this.is_add_edit = 'add';
this.ruleForm.let1 = null; this.ruleForm.let1 = null;
this.ruleForm.let2 = null; this.ruleForm.let2 = null;
......
src/views/tech-politics-fabric/index.vue
...@@ -5,13 +5,14 @@ ...@@ -5,13 +5,14 @@
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">政策名称</span> <span class="search_title">政策名称</span>
<el-input v-model="searchParams.tpoName" placeholder="请输入内容" class="search_item"></el-input> <el-input v-model="searchParams.tpoName" maxlength="100" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item" style="margin-right: 50px;"> <div class="search_menu_item" style="margin-right: 50px;">
<span class="search_title">启用时间</span> <span class="search_title">启用时间</span>
<el-date-picker <el-date-picker
v-model="searchParams.startTime" v-model="searchParams.startTime"
type="daterange" type="daterange"
:unlink-panels="true"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
...@@ -59,7 +60,7 @@ ...@@ -59,7 +60,7 @@
<el-table-column type="selection" width="55" :selectable="selectable"></el-table-column> <el-table-column type="selection" width="55" :selectable="selectable"></el-table-column>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column> <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="tpoName" label="政策名称" align="center"></el-table-column> <el-table-column prop="tpoName" label="政策名称" align="center"></el-table-column>
<el-table-column prop="tepContent" label="政策描述" align="center"></el-table-column> <el-table-column prop="tepContent" width="140" :show-overflow-tooltip="true" label="政策描述" align="center"></el-table-column>
<el-table-column prop="scope_" label="适用范围" align="center"></el-table-column> <el-table-column prop="scope_" label="适用范围" align="center"></el-table-column>
<el-table-column prop="deptName" label="发布部门" align="center"></el-table-column> <el-table-column prop="deptName" label="发布部门" align="center"></el-table-column>
<el-table-column prop="level_" label="级别" align="center"></el-table-column> <el-table-column prop="level_" label="级别" align="center"></el-table-column>
...@@ -72,7 +73,7 @@ ...@@ -72,7 +73,7 @@
<span v-if="scope.row.state == 1">已启用</span> <span v-if="scope.row.state == 1">已启用</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="content" label="备注" align="center"></el-table-column> <el-table-column prop="tepRemark" label="备注" width="140" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column label="操作" width="360" align="center"> <el-table-column label="操作" width="360" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;"> <div style="display: flex;align-items: center;justify-content: center;">
...@@ -102,15 +103,16 @@ ...@@ -102,15 +103,16 @@
</div> </div>
<el-dialog <el-dialog
title="技术政策结构化" :title="is_add_edit == 'add' ? '新建技术政策结构化' : '编辑技术政策结构化'"
:visible.sync="add_dialog" :visible.sync="add_dialog"
:center="false" :center="false"
:close-on-click-modal="false"
width="60%"> width="60%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<el-form :model="ruleForm" ref="form"> <el-form :model="ruleForm" :rules="rules" ref="form">
<div class="form_item_container"> <div class="form_item_container">
<el-form-item label="政策名称:" prop="let1"> <el-form-item label="政策名称:" prop="let1">
<el-input v-model="ruleForm.let1"></el-input> <el-input v-model="ruleForm.let1" maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用范围:" prop="let2"> <el-form-item label="适用范围:" prop="let2">
<el-select v-model="ruleForm.let2" placeholder="请选择"> <el-select v-model="ruleForm.let2" placeholder="请选择">
...@@ -118,7 +120,7 @@ ...@@ -118,7 +120,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="发布部门:" prop="let3"> <el-form-item label="发布部门:" prop="let3">
<el-input v-model="ruleForm.let3"></el-input> <el-input v-model="ruleForm.let3" maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="级别:" prop="let4" style="margin-left: 27px;width: 30.5%;"> <el-form-item label="级别:" prop="let4" style="margin-left: 27px;width: 30.5%;">
<el-select v-model="ruleForm.let4" placeholder="请选择" style="width: 200px;"> <el-select v-model="ruleForm.let4" placeholder="请选择" style="width: 200px;">
...@@ -162,7 +164,8 @@ import { ...@@ -162,7 +164,8 @@ import {
addJiShuZhengCeJieGouHuaTable, addJiShuZhengCeJieGouHuaTable,
editJiShuZhengCeJieGouHuaTable, editJiShuZhengCeJieGouHuaTable,
getDianXingAnLiSelectData, getDianXingAnLiSelectData,
deleteAllJiShuZhengCeJieGouHua deleteAllJiShuZhengCeJieGouHua,
exportJiShuZhengCeJieGouHuaTable
} from '@/api/index.js'; } from '@/api/index.js';
import { MessageBox, Message } from 'element-ui'; import { MessageBox, Message } from 'element-ui';
import $ from 'jquery'; import $ from 'jquery';
...@@ -184,6 +187,32 @@ export default { ...@@ -184,6 +187,32 @@ export default {
let7: null, let7: null,
let8: null, let8: null,
}, },
rules: {
let1: [
{ required: true, message: '请输入政策名称', trigger: 'blur' },
],
let2: [
{ required: true, message: '请选择适用范围', trigger: 'change' },
],
let3: [
{ required: true, message: '请输入发布部门', trigger: 'blur' },
],
let4: [
{ required: true, message: '请选择级别', trigger: 'change' },
],
let5: [
{ required: true, message: '请选择启用时间', trigger: 'change' },
],
let6: [
{ required: true, message: '请选择状态', trigger: 'change' },
],
let7: [
{ required: true, message: '请输入政策描述', trigger: 'blur' },
],
let8: [
{ required: true, message: '请输入备注', trigger: 'blur' },
],
},
tableData: [], tableData: [],
add_dialog: false, add_dialog: false,
searchParams: { searchParams: {
...@@ -255,7 +284,28 @@ export default { ...@@ -255,7 +284,28 @@ export default {
inpEle.click(); inpEle.click();
}, },
exportFile() {//导出 exportFile() {//导出
let beginTime_;
let endTime_;
if(this.searchParams.startTime) {
beginTime_ = this.searchParams.startTime[0];
endTime_ = this.searchParams.startTime[1];
}
const params = {
"tpoName": this.searchParams.tpoName,
"beginTime": beginTime_,
"endTime": endTime_,
"state": this.searchParams.state,
"current": this.pager.current,
"pageSize": this.pager.size,
};
exportJiShuZhengCeJieGouHuaTable(params).then(res => {
let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
let url = URL.createObjectURL(blob);
let link = document.createElement('a');
link.href = url;
document.body.appendChild(link);
link.click();
});
}, },
editItem(row) {//编辑 editItem(row) {//编辑
this.ruleForm.let1 = row.tpoName; this.ruleForm.let1 = row.tpoName;
...@@ -346,7 +396,7 @@ export default { ...@@ -346,7 +396,7 @@ export default {
}).then(() => { }).then(() => {
const params = { const params = {
ktepId: row.ktepId, ktepId: row.ktepId,
state: row.state delFlag: 1,
} }
editJiShuZhengCeJieGouHuaTable(params).then(res => { editJiShuZhengCeJieGouHuaTable(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
...@@ -442,6 +492,9 @@ export default { ...@@ -442,6 +492,9 @@ export default {
this.is_add_edit = 'add'; this.is_add_edit = 'add';
this.editId = undefined; this.editId = undefined;
this.add_dialog = true; this.add_dialog = true;
this.$nextTick(() => {
this.$refs.form.resetFields();
});
this.ruleForm.let1 = null; this.ruleForm.let1 = null;
this.ruleForm.let2 = null; this.ruleForm.let2 = null;
this.ruleForm.let3 = null; this.ruleForm.let3 = null;
......
src/views/tech-politics-relative-use/index.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">政策名称</span> <span class="search_title">政策名称</span>
<el-input v-model="searchParams.tpoName" placeholder="请输入内容" class="search_item"></el-input> <el-input maxlength="100" v-model="searchParams.tpoName" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">符合度</span> <span class="search_title">符合度</span>
...@@ -124,7 +124,7 @@ export default { ...@@ -124,7 +124,7 @@ export default {
set_table_height() {//动态设置表格高度 set_table_height() {//动态设置表格高度
const table_container_height = $(".table_container").height(); const table_container_height = $(".table_container").height();
const search_menu_height = $(".search_menu").height(); const search_menu_height = $(".search_menu").height();
this.tableHeight = table_container_height - search_menu_height - 90 + 'px'; this.tableHeight = table_container_height - search_menu_height - 120 + 'px';
}, },
reset() {//重置 reset() {//重置
this.searchParams.tpoName = null; this.searchParams.tpoName = null;
...@@ -151,6 +151,7 @@ export default { ...@@ -151,6 +151,7 @@ export default {
}; };
getJiShuZhengCeGuanLianShiYongTable(params).then(res => { getJiShuZhengCeGuanLianShiYongTable(params).then(res => {
this.loading = false; this.loading = false;
console.log(res)
// res.records.map(item => { // res.records.map(item => {
// const startTime_year = String(new Date(item.startTime).getFullYear()); // const startTime_year = String(new Date(item.startTime).getFullYear());
// const startTime_month = String(new Date(item.startTime).getMonth() + 1); // const startTime_month = String(new Date(item.startTime).getMonth() + 1);
...@@ -167,6 +168,12 @@ export default { ...@@ -167,6 +168,12 @@ export default {
// this.tableData = res.records; // this.tableData = res.records;
// }) // })
this.tableData = res.records; this.tableData = res.records;
this.pager.current = res.current;
this.pager.total = res.total;
this.pager.size = res.size;
// if(res.code == 200) { // if(res.code == 200) {
// this.loading = false; // this.loading = false;
// console.log(res) // console.log(res)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!