suzhou-jichuang-lanhai
/
tcZz-pc
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lvtianfang' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/tcZz-pc

Browse Source
duhanyu
杜函宇 2 years ago
parent a6f601e578 e4bdda8971
commit ad97f7772a
5 changed files with 75 additions and 90 deletions
Show Stats Download Patch File Download Diff File

2
.env.development
Unescape View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = 数据中台系统
ENV = 'development' ENV = 'development'
# 若依管理系统/开发环境 # 若依管理系统/开发环境
# VUE_APP_BASE_API = 'http://localhost:9035' # VUE_APP_BASE_API = 'http://39.101.188.84:9035'
# VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api' # VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api'
VUE_APP_BASE_API = 'http://39.101.188.84:9035' VUE_APP_BASE_API = 'http://39.101.188.84:9035'

4
src/layout/components/Sidebar/Logo.vue
Unescape View File

@ -1,11 +1,11 @@
<template> <template>
<div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }"> <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
<transition name="sidebarLogoFade"> <transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/"> <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/tcZz/networkSecurity/DataSourceTj">
<img v-if="logo" :src="logo" class="sidebar-logo" /> <img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1> <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
</router-link> </router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/"> <router-link v-else key="expand" class="sidebar-logo-link" to="/tcZz/networkSecurity/DataSourceTj">
<img v-if="logo" :src="logo" class="sidebar-logo" /> <img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1> <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
</router-link> </router-link>

9
src/views/tcZz/netManage/gzdt/index.vue
Unescape View File

@ -230,7 +230,7 @@
/> />
<!-- 添加或修改工作动态对话框 --> <!-- 添加或修改工作动态对话框 -->
<el-dialog :visible.sync="open" width="600px" append-to-body custom-class="dialog-box"> <el-dialog :visible.sync="open" width="700px" append-to-body custom-class="dialog-box">
<div slot="title" class="dialog-title">{{ title }}</div> <div slot="title" class="dialog-title">{{ title }}</div>
<el-form ref="form" :model="form" :rules="rules" label-width="auto" class="dialog-from"> <el-form ref="form" :model="form" :rules="rules" label-width="auto" class="dialog-from">
<el-form-item label="区域" prop="areaId"> <el-form-item label="区域" prop="areaId">
@ -711,9 +711,16 @@
.el-form { .el-form {
.file-item { .file-item {
display:flex; display:flex;
.el-form-item {
flex: 1;
}
.el-button { .el-button {
height: 35px; height: 35px;
} }
.el-input {
// width: 200px
width: 100%;
}
} }
} }
} }

138
src/views/tcZz/netManage/ytlc/index.vue
Unescape View File

@ -95,10 +95,13 @@
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="form.name" placeholder="请输入名称" /> <el-input v-model="form.name" placeholder="请输入名称" />
</el-form-item> </el-form-item>
<el-form-item label="文件"> <el-form-item label="上传文件">
<el-button @click="addDomain" type="primary">添加文件</el-button> <!-- <el-button @click="addDomain" type="primary">添加文件</el-button> -->
<!-- <el-form-item label="文件路径(完整路径)"> -->
<fileUpload v-model="fileNameS" :limit="1"/>
<!-- </el-form-item> -->
</el-form-item> </el-form-item>
<div v-for="(domain, index) in form.domains" :key="index" class="file-item"> <!-- <div v-for="(domain, index) in form.domains" :key="index" class="file-item">
<el-form-item <el-form-item
label="文件名称" label="文件名称"
:prop="'domains.' + index + '.fileName'" :prop="'domains.' + index + '.fileName'"
@ -118,7 +121,7 @@
<el-input v-model="domain.fileUrl" placeholder="请输入文件路径"></el-input> <el-input v-model="domain.fileUrl" placeholder="请输入文件路径"></el-input>
</el-form-item> </el-form-item>
<el-button @click.prevent="removeDomain(domain)" type="danger" size="mini">删除</el-button> <el-button @click.prevent="removeDomain(domain)" type="danger" size="mini">删除</el-button>
</div> </div> -->
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<!-- <el-input v-model="form.remark" placeholder="请输入备注" /> --> <!-- <el-input v-model="form.remark" placeholder="请输入备注" /> -->
<el-input v-model="form.remark" resize="none" :rows="5" type="textarea" placeholder="请输入备注" /> <el-input v-model="form.remark" resize="none" :rows="5" type="textarea" placeholder="请输入备注" />
@ -217,12 +220,12 @@
}, },
// 表单参数 // 表单参数
form: { form: {
domains: [ // domains: [
{ // {
fileName: "", // fileName: "",
fileUrl: "", // fileUrl: "",
} // }
], // ],
}, },
// 表单校验 // 表单校验
rules: { rules: {
@ -231,6 +234,7 @@
], ],
}, },
fileList:[], fileList:[],
fileNameS:[],
}; };
}, },
created() { created() {
@ -283,12 +287,12 @@
remark: null, remark: null,
domains: [ // domains: [
{ // {
fileName: "", // fileName: "",
fileUrl: "", // fileUrl: "",
} // }
], // ],
}; };
this.resetForm("form"); this.resetForm("form");
@ -324,79 +328,53 @@
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
// this.fileNameS = []; this.fileNameS = [];
this.open = true; this.open = true;
this.title = "添加约谈流程"; this.title = "添加约谈流程";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
// this.fileNameS = [] this.fileNameS = []
const id = row.id || this.ids const id = row.id || this.ids
getYtlc(id).then(response => { getYtlc(id).then(response => {
// console.log(response.data,'response.data') console.log(response.data,'response.data')
this.form.name = response.data.name; this.form = response.data;
this.form.createTime = response.data.createTime; // this.form.name = response.data.name;
this.form.remark = response.data.remark; // this.form.createTime = response.data.createTime;
this.form.id = response.data.id; // this.form.remark = response.data.remark;
// this.form.id = response.data.id;
// console.log(this.form,'this.form') // console.log(this.form,'this.form')
if (response.data.fileName && response.data.fileUrl) { if (response.data.fileName && response.data.fileUrl) {
let arr1 = response.data.fileName.split(","); let arr1 = response.data.fileName.split(",");
let arr2 = response.data.fileUrl.split(","); let arr2 = response.data.fileUrl.split(",");
if(arr1.length > 1) {
// console.log(arr1,'arr1')
this.form.domains = [];
arr1.forEach((value, index) => { arr1.forEach((value, index) => {
this.form.domains.push({ this.fileNameS.push({
fileName: value, name: value,
fileUrl: arr2[index], url: arr2[index],
}); });
}); });
} else {
// this.form.domains = [];
// let obj = {}
// obj.fileName = arr1[0]
// obj.fileUrl = arr2[0]
// this.form.domains.push(obj)
this.form.domains = [
{
fileName: arr1[0],
fileUrl: arr2[0],
}
];
}
} else {
this.form.domains = [
{
fileName: '',
fileUrl: '',
}
];
} }
this.open = true; this.open = true;
this.title = "修改约谈流程"; this.title = "修改约谈流程";
console.log(this.form,'this.form')
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
this.form.domains.forEach((value) => { console.log(this.fileNameS)
arr1.push(value.fileName); if (this.fileNameS.length > 0) {
arr2.push(value.fileUrl); this.fileNameS.forEach((value) => {
arr1.push(value.name);
arr2.push(value.url);
}); });
this.form.fileName = arr1.join(","); this.form.fileName = arr1.join(",");
this.form.fileUrl = arr2.join(","); this.form.fileUrl = arr2.join(",");
// if (this.fileNameS.length > 0) { } else {
this.form.fileName = "";
// this.form.fileName = arr1.join(","); this.form.fileUrl = "";
// this.form.fileUrl = arr2.join(","); }
// } else {
// this.form.fileName = "";
// this.form.fileUrl = "";
// }
// console.log(this.form,'this.form')
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
@ -463,22 +441,22 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .el-dialog { // ::v-deep .el-dialog {
.el-dialog__body { // .el-dialog__body {
.el-form { // .el-form {
.file-item { // .file-item {
display:flex; // display:flex;
// .el-form-item__content { // // .el-form-item__content {
// display:flex; // // display:flex;
// // .my-input { // // // .my-input {
// // margin: 0 10px; // // // margin: 0 10px;
// // } // // // }
// } // // }
.el-button { // .el-button {
height: 35px; // height: 35px;
} // }
} // }
} // }
} // }
} // }
</style> </style>

2
src/views/tcZz/netManage/zdlyjg/index.vue
Unescape View File

@ -265,7 +265,7 @@
<el-form-item label="企业类型" prop="enterpriseType"> <el-form-item label="企业类型" prop="enterpriseType">
<el-input v-model="form.enterpriseType" placeholder="请输入企业类型" /> <el-input v-model="form.enterpriseType" placeholder="请输入企业类型" />
</el-form-item> </el-form-item>
<el-form-item label="重点领域监管内容" prop="jgObgj"> <el-form-item label="重点监管内容" prop="jgObgj">
<el-input v-model="form.jgObgj" placeholder="请输入重点领域监管内容" /> <el-input v-model="form.jgObgj" placeholder="请输入重点领域监管内容" />
</el-form-item> </el-form-item>
<el-form-item label="法律法规令禁止的有关行为" prop="jzxw"> <el-form-item label="法律法规令禁止的有关行为" prop="jzxw">

Write Preview
Loading…
Cancel
Save