Commit 65aeaaa16288cd0e87916c86be2fe1575df13dd9
1 parent
7d4da54c
样式修改
Showing
13 changed files
with
200 additions
and
162 deletions
src/assets/images/box-bc.png
0 → 100644
7.68 KB
src/components/CompanyForm/index.vue
| ... | ... | @@ -2,11 +2,11 @@ |
| 2 | 2 | <div class="companyForm"> |
| 3 | 3 | <div class="userSelect-input" @click="openDialog"> |
| 4 | 4 | <el-button type="text" icon="el-icon-circle-plus-outline" size="small" |
| 5 | - >点击新增企业</el-button | |
| 5 | + >点击新增运营主体</el-button | |
| 6 | 6 | > |
| 7 | 7 | </div> |
| 8 | 8 | <el-dialog |
| 9 | - title="新增企业" | |
| 9 | + title="新增运营主体" | |
| 10 | 10 | :close-on-click-modal="false" |
| 11 | 11 | :visible.sync="visible" |
| 12 | 12 | lock-scroll |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | :modal-append-to-body="false" |
| 17 | 17 | class="NCC-dialog NCC-dialog_center company-dialog" |
| 18 | 18 | > |
| 19 | - <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" | |
| 19 | + <el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right" | |
| 20 | 20 | :rules="rules" v-lodding="loading"> |
| 21 | 21 | <el-col :span="24" v-if="false"> |
| 22 | 22 | <el-form-item label="主键" prop="id"> |
| ... | ... | @@ -25,7 +25,7 @@ |
| 25 | 25 | </el-form-item> |
| 26 | 26 | </el-col> |
| 27 | 27 | <el-col :span="24"> |
| 28 | - <el-form-item label="公司名称" prop="companyName"> | |
| 28 | + <el-form-item label="运营主体名称" prop="companyName"> | |
| 29 | 29 | <el-input v-model="dataForm.companyName" placeholder="请输入" clearable required |
| 30 | 30 | :style='{ "width": "100%" }'> |
| 31 | 31 | </el-input> |
| ... | ... | @@ -39,13 +39,13 @@ |
| 39 | 39 | </el-form-item> |
| 40 | 40 | </el-col> |
| 41 | 41 | <el-col :span="24"> |
| 42 | - <el-form-item label="公司法人" prop="legalPerson"> | |
| 42 | + <el-form-item label="运营主体法人" prop="legalPerson"> | |
| 43 | 43 | <el-input v-model="dataForm.legalPerson" placeholder="请输入" clearable :style='{ "width": "100%" }'> |
| 44 | 44 | </el-input> |
| 45 | 45 | </el-form-item> |
| 46 | 46 | </el-col> |
| 47 | 47 | <el-col :span="24"> |
| 48 | - <el-form-item label="公司地址" prop="address"> | |
| 48 | + <el-form-item label="运营主体地址" prop="address"> | |
| 49 | 49 | <el-input v-model="dataForm.address" placeholder="请输入" clearable :style='{ "width": "100%" }'> |
| 50 | 50 | </el-input> |
| 51 | 51 | </el-form-item> | ... | ... |
src/components/InfoForm/index.vue
| ... | ... | @@ -54,13 +54,13 @@ |
| 54 | 54 | <div class="company-info"> |
| 55 | 55 | <div class="company-info-items"> |
| 56 | 56 | <div :span="12"> |
| 57 | - 企业归属:{{ companyInfo.areaName || "--" }} | |
| 57 | + 运营主体归属:{{ companyInfo.areaName || "--" }} | |
| 58 | 58 | </div> |
| 59 | 59 | <div :span="12"> |
| 60 | 60 | 联系人:{{ companyInfo.contactUser || "--" }} |
| 61 | 61 | </div> |
| 62 | 62 | <div :span="12"> |
| 63 | - 公司地址:{{ companyInfo.address || "--" }} | |
| 63 | + 运营主体地址:{{ companyInfo.address || "--" }} | |
| 64 | 64 | </div> |
| 65 | 65 | </div> |
| 66 | 66 | <div class="company-info-items"> |
| ... | ... | @@ -227,7 +227,7 @@ |
| 227 | 227 | </el-form-item> |
| 228 | 228 | </el-col> |
| 229 | 229 | <el-col :span="24" class="icom-box"> |
| 230 | - <el-form-item label="系统图标" prop="systemIcon"> | |
| 230 | + <el-form-item label="应用图标" prop="systemIcon"> | |
| 231 | 231 | <el-upload |
| 232 | 232 | class="avatar-uploader" |
| 233 | 233 | action="#" | ... | ... |
src/views/baseCaseHandling/index.vue
| ... | ... | @@ -60,8 +60,8 @@ |
| 60 | 60 | <!-- <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/> --> |
| 61 | 61 | <el-table-column prop="number" label="档案号" align="left" show-overflow-tooltip/> |
| 62 | 62 | <el-table-column prop="registrationTime" label="登记时间" :formatter="ncc.tableDateFormat" align="left" show-overflow-tooltip/> |
| 63 | - <el-table-column prop="systemName" label="系统名称" align="left" width="150" show-overflow-tooltip/> | |
| 64 | - <el-table-column prop="registeredEntity" label="主体企业" align="left" show-overflow-tooltip/> | |
| 63 | + <el-table-column prop="systemName" label="应用名称" align="left" width="150" show-overflow-tooltip/> | |
| 64 | + <el-table-column prop="registeredEntity" label="运营主体" align="left" show-overflow-tooltip/> | |
| 65 | 65 | <el-table-column label="类别" prop="category" align="left"> |
| 66 | 66 | <template slot-scope="scope">{{ scope.row.category | dynamicTextUP(systemTypeOptions) }}</template> |
| 67 | 67 | </el-table-column> | ... | ... |
src/views/baseComapnyInfo/Form.vue
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false" |
| 3 | 3 | :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%" v-loading="loading"> |
| 4 | 4 | <el-row :gutter="15" class="NCC-dialog-content"> |
| 5 | - <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" | |
| 5 | + <el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right" | |
| 6 | 6 | :disabled="!!isDetail" :rules="rules"> |
| 7 | 7 | <el-col :span="24" v-if="false"> |
| 8 | 8 | <el-form-item label="主键" prop="id"> |
| ... | ... | @@ -11,7 +11,7 @@ |
| 11 | 11 | </el-form-item> |
| 12 | 12 | </el-col> |
| 13 | 13 | <el-col :span="24"> |
| 14 | - <el-form-item label="公司名称" prop="companyName"> | |
| 14 | + <el-form-item label="运营主体名称" prop="companyName"> | |
| 15 | 15 | <el-input v-model="dataForm.companyName" placeholder="请输入" clearable required |
| 16 | 16 | :style='{ "width": "100%" }'> |
| 17 | 17 | </el-input> |
| ... | ... | @@ -25,13 +25,13 @@ |
| 25 | 25 | </el-form-item> |
| 26 | 26 | </el-col> |
| 27 | 27 | <el-col :span="24"> |
| 28 | - <el-form-item label="公司法人" prop="legalPerson"> | |
| 28 | + <el-form-item label="运营主体法人" prop="legalPerson"> | |
| 29 | 29 | <el-input v-model="dataForm.legalPerson" placeholder="请输入" clearable :style='{ "width": "100%" }'> |
| 30 | 30 | </el-input> |
| 31 | 31 | </el-form-item> |
| 32 | 32 | </el-col> |
| 33 | 33 | <el-col :span="24"> |
| 34 | - <el-form-item label="公司地址" prop="address"> | |
| 34 | + <el-form-item label="运营主体地址" prop="address"> | |
| 35 | 35 | <el-input v-model="dataForm.address" placeholder="请输入" clearable :style='{ "width": "100%" }'> |
| 36 | 36 | </el-input> |
| 37 | 37 | </el-form-item> | ... | ... |
src/views/baseComapnyInfo/index.vue
| ... | ... | @@ -8,105 +8,64 @@ |
| 8 | 8 | <el-form @submit.native.prevent size="mini"> |
| 9 | 9 | <el-col :span="5"> |
| 10 | 10 | <el-form-item label=""> |
| 11 | - <el-input | |
| 12 | - v-model="query.companyName" | |
| 13 | - placeholder="公司名称" | |
| 14 | - clearable | |
| 15 | - /> | |
| 11 | + <el-input v-model="query.companyName" placeholder="运营主体名称" clearable/> | |
| 16 | 12 | </el-form-item> |
| 17 | 13 | </el-col> |
| 18 | 14 | <el-col :span="5"> |
| 19 | 15 | <el-form-item label=""> |
| 20 | - <el-input | |
| 21 | - v-model="query.legalPerson" | |
| 22 | - placeholder="公司法人" | |
| 23 | - clearable | |
| 24 | - /> | |
| 16 | + <el-input v-model="query.legalPerson" placeholder="运营主体法人" clearable/> | |
| 25 | 17 | </el-form-item> |
| 26 | 18 | </el-col> |
| 27 | 19 | <el-col :span="5"> |
| 28 | 20 | <el-form-item label=""> |
| 29 | - <el-input | |
| 30 | - v-model="query.socialCreditAgency" | |
| 31 | - placeholder="社会信用代" | |
| 32 | - clearable | |
| 33 | - /> | |
| 21 | + <el-input v-model="query.socialCreditAgency" placeholder="社会信用代" clearable/> | |
| 34 | 22 | </el-form-item> |
| 35 | 23 | </el-col> |
| 36 | 24 | <el-col :span="4"> |
| 37 | 25 | <el-form-item> |
| 38 | - <el-button | |
| 39 | - type="primary" | |
| 40 | - icon="el-icon-search" | |
| 41 | - @click="search()" | |
| 42 | - >搜索</el-button | |
| 43 | - > | |
| 26 | + <el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button> | |
| 44 | 27 | </el-form-item> |
| 45 | 28 | </el-col> |
| 46 | 29 | </el-form> |
| 47 | 30 | <div class="NCC-common-search-box-right"> |
| 48 | 31 | <el-button type="success" icon="el-icon-plus" @click="addOrUpdateHandle()" size="mini" >新增</el-button> |
| 49 | - <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()">导出</el-button> | |
| 32 | + <!-- <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData('demo')">导出模板</el-button> | |
| 33 | + <el-upload | |
| 34 | + class="uploadXlax" | |
| 35 | + :action="define.APIURl + '/api/Extend/basecomapnyinfo/Actions/ImportByExcel'" | |
| 36 | + :headers="uploadHeaders" | |
| 37 | + :on-success="toUpload" | |
| 38 | + :show-file-list="false" | |
| 39 | + name="excelfile" | |
| 40 | + accept="image/*" | |
| 41 | + > | |
| 42 | + <div class="avatar-box"> | |
| 43 | + <el-button type="primary" icon="el-icon-download" size="mini">导入</el-button> | |
| 44 | + </div> | |
| 45 | + </el-upload> | |
| 46 | + <el-button type="primary" icon="el-icon-download" :loading="exportBtnLoading" size="mini" @click="exportData()">导出</el-button> --> | |
| 50 | 47 | </div> |
| 51 | 48 | </el-row> |
| 52 | 49 | <div class="NCC-common-layout-main NCC-flex-main"> |
| 53 | 50 | <NCC-table v-loading="listLoading" :data="list"> |
| 54 | - <el-table-column prop="id" label="主键" align="left" /> | |
| 55 | - <el-table-column | |
| 56 | - prop="companyName" | |
| 57 | - label="公司名称" | |
| 58 | - show-overflow-tooltip | |
| 59 | - align="left" | |
| 60 | - /> | |
| 61 | - <el-table-column | |
| 62 | - prop="socialCreditAgency" | |
| 63 | - label="社会信用代" | |
| 64 | - show-overflow-tooltip | |
| 65 | - align="left" | |
| 66 | - /> | |
| 67 | - <el-table-column | |
| 68 | - prop="legalPerson" | |
| 69 | - label="公司法人" | |
| 70 | - show-overflow-tooltip | |
| 71 | - align="left" | |
| 72 | - /> | |
| 51 | + <!-- <el-table-column prop="id" label="主键" align="left" /> --> | |
| 52 | + <el-table-column prop="companyName" label="运营主体名称" show-overflow-tooltip align="left"/> | |
| 53 | + <el-table-column prop="socialCreditAgency" label="社会信用代" show-overflow-tooltip align="left"/> | |
| 54 | + <el-table-column prop="legalPerson" label="运营主体法人" show-overflow-tooltip align="left"/> | |
| 73 | 55 | <el-table-column prop="address" label="公司地址" align="left" /> |
| 74 | - <el-table-column | |
| 75 | - prop="contactInformation" | |
| 76 | - show-overflow-tooltip | |
| 77 | - label="联系方式" | |
| 78 | - align="left" | |
| 79 | - /> | |
| 56 | + <el-table-column prop="contactInformation" show-overflow-tooltip label="联系方式" align="left"/> | |
| 80 | 57 | <el-table-column label="操作" fixed="right" width="100"> |
| 81 | 58 | <template slot-scope="scope"> |
| 82 | - <el-button | |
| 83 | - type="text" | |
| 84 | - @click="addOrUpdateHandle(scope.row.id)" | |
| 85 | - >编辑</el-button | |
| 86 | - > | |
| 87 | - <el-button | |
| 88 | - type="text" | |
| 89 | - @click="handleDel(scope.row.id)" | |
| 90 | - class="NCC-table-delBtn" | |
| 91 | - >删除</el-button | |
| 92 | - > | |
| 59 | + <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button> | |
| 60 | + <el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button> | |
| 93 | 61 | </template> |
| 94 | 62 | </el-table-column> |
| 95 | 63 | </NCC-table> |
| 96 | - <pagination | |
| 97 | - :total="total" | |
| 98 | - :page.sync="listQuery.currentPage" | |
| 99 | - :limit.sync="listQuery.pageSize" | |
| 100 | - @pagination="initData" | |
| 101 | - /> | |
| 64 | + <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> | |
| 102 | 65 | </div> |
| 103 | 66 | </div> |
| 104 | 67 | <NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" /> |
| 105 | - <ExportBox | |
| 106 | - v-if="exportBoxVisible" | |
| 107 | - ref="ExportBox" | |
| 108 | - @download="download" | |
| 109 | - /> | |
| 68 | + <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/> | |
| 110 | 69 | </div> |
| 111 | 70 | </div> |
| 112 | 71 | </div> |
| ... | ... | @@ -119,6 +78,8 @@ import { |
| 119 | 78 | } from "@/api/baseData/company"; |
| 120 | 79 | import NCCForm from "./Form"; |
| 121 | 80 | import ExportBox from "./ExportBox"; |
| 81 | +import request from "@/utils/request"; | |
| 82 | +import define from '@/utils/define' | |
| 122 | 83 | export default { |
| 123 | 84 | components: { NCCForm, ExportBox }, |
| 124 | 85 | data() { |
| ... | ... | @@ -139,8 +100,10 @@ export default { |
| 139 | 100 | sort: "desc", |
| 140 | 101 | sidx: "", |
| 141 | 102 | }, |
| 103 | + exportBtnLoading: false, | |
| 142 | 104 | formVisible: false, |
| 143 | 105 | exportBoxVisible: false, |
| 106 | + uploadHeaders: { Authorization: this.$store.getters.token }, | |
| 144 | 107 | columnList: [ |
| 145 | 108 | { prop: "id", label: "主键" }, |
| 146 | 109 | { prop: "companyName", label: "公司名称" }, |
| ... | ... | @@ -198,11 +161,48 @@ export default { |
| 198 | 161 | this.$refs.NCCForm.init(id, isDetail); |
| 199 | 162 | }); |
| 200 | 163 | }, |
| 201 | - exportData() { | |
| 202 | - this.exportBoxVisible = true; | |
| 203 | - this.$nextTick(() => { | |
| 204 | - this.$refs.ExportBox.init(this.columnList); | |
| 205 | - }); | |
| 164 | + toUpload(response, file, fileList) { | |
| 165 | + console.log(response, file, fileList); | |
| 166 | + }, | |
| 167 | + exportData(type) { | |
| 168 | + let obj = {}; | |
| 169 | + if(type) { | |
| 170 | + obj = { | |
| 171 | + url: '/Extend/basecomapnyinfo/Actions/GenerateImportTemplate', | |
| 172 | + method: "GET", | |
| 173 | + } | |
| 174 | + } else { | |
| 175 | + let _query = { | |
| 176 | + ...this.query, | |
| 177 | + }; | |
| 178 | + let query = {}; | |
| 179 | + for (let key in _query) { | |
| 180 | + if (Array.isArray(_query[key])) { | |
| 181 | + query[key] = _query[key].join(); | |
| 182 | + } else { | |
| 183 | + query[key] = _query[key]; | |
| 184 | + } | |
| 185 | + } | |
| 186 | + obj ={ | |
| 187 | + url: '/Extend/basecomapnyinfo/Actions/ImportByExcel', | |
| 188 | + method: "POST", | |
| 189 | + data: query, | |
| 190 | + } | |
| 191 | + }; | |
| 192 | + request(obj).then((res) => { | |
| 193 | + console.log(res); | |
| 194 | + const url = define.APIURl + res.data.url; | |
| 195 | + const link = document.createElement("a"); | |
| 196 | + link.href = url; | |
| 197 | + link.download = res.data.name; | |
| 198 | + link.click(); | |
| 199 | + }).catch(() => this.exportBtnLoading = false); | |
| 200 | + }, | |
| 201 | + exportForm(url) { | |
| 202 | + const link = document.createElement("a"); | |
| 203 | + link.href = url; | |
| 204 | + link.download = '公司信息模板.xlsx'; | |
| 205 | + link.click(); | |
| 206 | 206 | }, |
| 207 | 207 | async download(data) { |
| 208 | 208 | let query = { ...data, ...this.listQuery, ...this.query }; |
| ... | ... | @@ -250,4 +250,8 @@ export default { |
| 250 | 250 | height: calc(100% - 35px); |
| 251 | 251 | } |
| 252 | 252 | } |
| 253 | +.uploadXlax { | |
| 254 | + display: inline-block; | |
| 255 | + margin: 0 8px; | |
| 256 | +} | |
| 253 | 257 | </style> | ... | ... |
src/views/baseInspectionReport/index.vue
| ... | ... | @@ -8,12 +8,12 @@ |
| 8 | 8 | <el-form @submit.native.prevent size="mini"> |
| 9 | 9 | <el-col :span="4"> |
| 10 | 10 | <el-form-item label=""> |
| 11 | - <el-input v-model="query.platformName" placeholder="请输入平台名称" clearable /> | |
| 11 | + <el-input v-model="query.platformName" placeholder="请输入应用名称" clearable /> | |
| 12 | 12 | </el-form-item> |
| 13 | 13 | </el-col> |
| 14 | 14 | <el-col :span="4"> |
| 15 | 15 | <el-form-item label=""> |
| 16 | - <el-select v-model="query.platformType" placeholder="请选择平台类型" clearable > | |
| 16 | + <el-select v-model="query.platformType" placeholder="请选择应用类型" clearable > | |
| 17 | 17 | <el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id" /> |
| 18 | 18 | </el-select> |
| 19 | 19 | </el-form-item> |
| ... | ... | @@ -36,13 +36,11 @@ |
| 36 | 36 | </el-row> |
| 37 | 37 | <div class="NCC-common-layout-main NCC-flex-main"> |
| 38 | 38 | <NCC-table v-loading="listLoading" :data="list"> |
| 39 | - <el-table-column show-overflow-tooltip prop="platformNameStr" label="系统名称" align="left" /> | |
| 40 | - <el-table-column show-overflow-tooltip label="系统类型" prop="platformType" align="left"> | |
| 39 | + <el-table-column show-overflow-tooltip prop="platformNameStr" label="应用名称" align="left" /> | |
| 40 | + <el-table-column show-overflow-tooltip label="应用类型" prop="platformType" align="left"> | |
| 41 | 41 | <template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template> |
| 42 | 42 | </el-table-column> |
| 43 | - <el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left"> | |
| 44 | - <template slot-scope="scope">{{ scope.row.questionType | dynamicText(questionTypeOptions) }}</template> | |
| 45 | - </el-table-column> | |
| 43 | + <el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left" /> | |
| 46 | 44 | <!-- <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" /> --> |
| 47 | 45 | <el-table-column show-overflow-tooltip prop="questionClass" label="关键词" align="left" /> |
| 48 | 46 | <!-- <el-table-column show-overflow-tooltip prop="department" label="部门" align="left" /> --> | ... | ... |
src/views/baseSystemInfo/DetailForm.vue
| ... | ... | @@ -5,21 +5,21 @@ |
| 5 | 5 | :visible.sync="visible" |
| 6 | 6 | class="NCC-dialog NCC-dialog_center systemInfoDialog" |
| 7 | 7 | lock-scroll |
| 8 | - width="40%" | |
| 8 | + width="70%" | |
| 9 | 9 | > |
| 10 | 10 | <el-row :gutter="15" style="height: 65vh;" class="NCC-dialog-content" v-loading="loading"> |
| 11 | - <el-tabs v-model="activeName" type="card" @tab-click="handleClick"> | |
| 11 | + <el-tabs class="system-info-tabs" type="border-card" tab-position='top' v-model="activeName" @tab-click="handleClick"> | |
| 12 | 12 | <el-tab-pane label="应用信息" name="1"> |
| 13 | 13 | <div class="system-info" style="overflow:auto;height: calc(65vh - 65px); margin-bottom: -10px;"> |
| 14 | 14 | <el-col :span="24"> |
| 15 | 15 | <div class="form-item"> |
| 16 | - <div class="label w-100">主体企业:</div> | |
| 16 | + <div class="label w-100">运营主体:</div> | |
| 17 | 17 | {{ dataForm.companyName || "--" }} |
| 18 | 18 | </div> |
| 19 | 19 | </el-col> |
| 20 | 20 | <el-col :span="24"> |
| 21 | 21 | <div class="form-item"> |
| 22 | - <div class="label w-100">系统类型:</div> | |
| 22 | + <div class="label w-100">应用类型:</div> | |
| 23 | 23 | {{ dataForm.systemType | dynamicTextUP(systemTypeOptions) }} |
| 24 | 24 | </div> |
| 25 | 25 | </el-col> |
| ... | ... | @@ -56,13 +56,13 @@ |
| 56 | 56 | </template> |
| 57 | 57 | <el-col :span="24"> |
| 58 | 58 | <div class="form-item"> |
| 59 | - <div class="label w-100">系统名称:</div> | |
| 59 | + <div class="label w-100">应用名称:</div> | |
| 60 | 60 | {{ dataForm.systemName || "--" }} |
| 61 | 61 | </div> |
| 62 | 62 | </el-col> |
| 63 | 63 | <el-col :span="24"> |
| 64 | 64 | <div class="form-item"> |
| 65 | - <div class="label w-100">系统分类:</div> | |
| 65 | + <div class="label w-100">应用分类:</div> | |
| 66 | 66 | {{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }} |
| 67 | 67 | </div> |
| 68 | 68 | </el-col> |
| ... | ... | @@ -116,17 +116,17 @@ |
| 116 | 116 | </el-col> |
| 117 | 117 | <el-col :span="24"> |
| 118 | 118 | <div class="form-item"> |
| 119 | - <div class="label w-100">系统图标:</div> | |
| 119 | + <div class="label w-100">应用图标:</div> | |
| 120 | 120 | {{ dataForm.systemIcon || "--" }} |
| 121 | 121 | </div> |
| 122 | 122 | </el-col> |
| 123 | 123 | </div> |
| 124 | 124 | </el-tab-pane> |
| 125 | - <el-tab-pane label="公司信息" name="2"> | |
| 125 | + <el-tab-pane label="运营主体信息" name="2"> | |
| 126 | 126 | <div class="company-info"> |
| 127 | 127 | <el-col :span="24"> |
| 128 | 128 | <div class="form-item"> |
| 129 | - <div class="label w-100">公司名称:</div> | |
| 129 | + <div class="label w-100">运营主体名称:</div> | |
| 130 | 130 | {{ companyForm.companyName || "--" }} |
| 131 | 131 | </div> |
| 132 | 132 | </el-col> |
| ... | ... | @@ -138,13 +138,13 @@ |
| 138 | 138 | </el-col> |
| 139 | 139 | <el-col :span="24"> |
| 140 | 140 | <div class="form-item"> |
| 141 | - <div class="label w-100">公司法人:</div> | |
| 141 | + <div class="label w-100">运营主体法人:</div> | |
| 142 | 142 | {{ companyForm.legalPerson || "--" }} |
| 143 | 143 | </div> |
| 144 | 144 | </el-col> |
| 145 | 145 | <el-col :span="24"> |
| 146 | 146 | <div class="form-item"> |
| 147 | - <div class="label w-100">公司地址:</div> | |
| 147 | + <div class="label w-100">运营主体地址:</div> | |
| 148 | 148 | {{ companyForm.address || "--" }} |
| 149 | 149 | </div> |
| 150 | 150 | </el-col> |
| ... | ... | @@ -175,17 +175,27 @@ |
| 175 | 175 | </div> |
| 176 | 176 | </el-tab-pane> |
| 177 | 177 | <el-tab-pane label="核查处置记录" name="3"> |
| 178 | - <el-table :data="handingList" height="500" border style="width: 100%"> | |
| 179 | - <el-table-column show-overflow-tooltip prop="systemNameStr" label="应用"></el-table-column> | |
| 180 | - <el-table-column show-overflow-tooltip prop="registeredEntityStr" label="主体"></el-table-column> | |
| 178 | + <el-table :data="inspectionList" height="500" border style="width: 100%"> | |
| 179 | + <el-table-column show-overflow-tooltip prop="platformNameStr" label="应用名称"></el-table-column> | |
| 180 | + <el-table-column show-overflow-tooltip prop="companyStr" label="运营主体"></el-table-column> | |
| 181 | + <el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left" /> | |
| 182 | + <el-table-column show-overflow-tooltip prop="questionClass" label="关键词"></el-table-column> | |
| 181 | 183 | </el-table> |
| 182 | 184 | </el-tab-pane> |
| 183 | 185 | <el-tab-pane label="网信执法记录" name="4"> |
| 184 | - <el-table :data="inspectionList" height="500" border style="width: 100%"> | |
| 185 | - <el-table-column show-overflow-tooltip prop="platformNameStr" label="应用"></el-table-column> | |
| 186 | - <el-table-column show-overflow-tooltip prop="companyStr" label="主体"></el-table-column> | |
| 187 | - <el-table-column show-overflow-tooltip prop="questionType" label="问题类型"></el-table-column> | |
| 188 | - <el-table-column show-overflow-tooltip prop="judgmentClass" label="执法类型"></el-table-column> | |
| 186 | + <el-table :data="handingList" height="500" border style="width: 100%"> | |
| 187 | + <el-table-column show-overflow-tooltip prop="number" label="档案号"></el-table-column> | |
| 188 | + <el-table-column show-overflow-tooltip prop="registrationTime" label="登记时间" :formatter="ncc.tableDateFormat"></el-table-column> | |
| 189 | + <el-table-column show-overflow-tooltip prop="systemNameStr" label="应用名称"></el-table-column> | |
| 190 | + <el-table-column show-overflow-tooltip prop="registeredEntityStr" label="运营主体"></el-table-column> | |
| 191 | + <el-table-column show-overflow-tooltip prop="illegalReasons" label="违法原因"></el-table-column> | |
| 192 | + <el-table-column show-overflow-tooltip prop="punishmentRequirements" label="处罚要求"></el-table-column> | |
| 193 | + <el-table-column show-overflow-tooltip prop="punishmentContent" label="处罚内容"></el-table-column> | |
| 194 | + <el-table-column label="状态" prop="state" align="left" > | |
| 195 | + <template slot-scope="scope"> | |
| 196 | + <el-tag v-if="scope.row.state" :type="ncc.getStateTagType(scope.row.state, stateOptions)">{{ scope.row.state | dynamicTextUP(stateOptions) }}</el-tag> | |
| 197 | + </template> | |
| 198 | + </el-table-column> | |
| 189 | 199 | </el-table> |
| 190 | 200 | </el-tab-pane> |
| 191 | 201 | <el-tab-pane label="数据日志" name="5"> |
| ... | ... | @@ -256,11 +266,10 @@ export default { |
| 256 | 266 | |
| 257 | 267 | // 公司信息 |
| 258 | 268 | companyForm: {}, |
| 259 | - | |
| 260 | - // 核查处置记录 | |
| 269 | + // 网信执法记录 | |
| 261 | 270 | handingList: [], |
| 262 | 271 | |
| 263 | - // 网信执法记录 | |
| 272 | + // 核查处置记录 | |
| 264 | 273 | inspectionList: [], |
| 265 | 274 | |
| 266 | 275 | // 数据日志 |
| ... | ... | @@ -270,7 +279,9 @@ export default { |
| 270 | 279 | pageSize: 10, |
| 271 | 280 | }, |
| 272 | 281 | updataRecordList: [], |
| 273 | - record_total: '' | |
| 282 | + record_total: '', | |
| 283 | + questionTypeOptions : [], | |
| 284 | + stateOptions: [], | |
| 274 | 285 | }; |
| 275 | 286 | }, |
| 276 | 287 | computed: { |
| ... | ... | @@ -283,36 +294,37 @@ export default { |
| 283 | 294 | }, |
| 284 | 295 | watch: {}, |
| 285 | 296 | created() { |
| 297 | + this.initStateTypeOption(); | |
| 286 | 298 | this.initSystemTypeList(); |
| 287 | 299 | }, |
| 288 | 300 | mounted() {}, |
| 289 | 301 | methods: { |
| 302 | + async initStateTypeOption() { | |
| 303 | + let list = this.$store.state.meta.stateTypeList; | |
| 304 | + !list && (list = await this.$store.dispatch('getTypeListByCode', 'stateType')); | |
| 305 | + this.stateOptions = list; | |
| 306 | + }, | |
| 290 | 307 | init(row) { |
| 291 | 308 | this.visible = true; |
| 292 | - this.dataForm.id = row.Id; | |
| 309 | + this.dataForm.id = row.id; | |
| 293 | 310 | this.activeName = '1' |
| 294 | 311 | this.$nextTick(() => { |
| 295 | 312 | this.initSystemForm(this.dataForm.id, row.companyName) |
| 296 | 313 | }); |
| 297 | 314 | }, |
| 298 | 315 | handleClick(e) { |
| 299 | - console.log(e); | |
| 300 | - | |
| 301 | 316 | switch (e.index) { |
| 302 | 317 | case '1': |
| 303 | 318 | // 公司信息 |
| 304 | 319 | this.initCompanyForm(); |
| 305 | - | |
| 306 | 320 | break; |
| 307 | 321 | case '2': |
| 308 | 322 | // 核查处置记录 |
| 309 | - this.initHandingList(this.dataForm.id); | |
| 310 | - | |
| 323 | + this.initInspectionList(this.dataForm.id); | |
| 311 | 324 | break; |
| 312 | 325 | case '3': |
| 313 | 326 | // 网信执法记录 |
| 314 | - this.initInspectionList(this.dataForm.id); | |
| 315 | - | |
| 327 | + this.initHandingList(this.dataForm.id); | |
| 316 | 328 | break; |
| 317 | 329 | case '4': |
| 318 | 330 | // 数据日志 |
| ... | ... | @@ -323,11 +335,9 @@ export default { |
| 323 | 335 | }; |
| 324 | 336 | this.initInfoRecord(); |
| 325 | 337 | break; |
| 326 | - | |
| 327 | 338 | default: |
| 328 | 339 | break; |
| 329 | 340 | } |
| 330 | - | |
| 331 | 341 | }, |
| 332 | 342 | |
| 333 | 343 | // 初始化应用信息-----------------------------------------------------------------------------0 |
| ... | ... | @@ -411,11 +421,17 @@ export default { |
| 411 | 421 | }; |
| 412 | 422 | </script> |
| 413 | 423 | <style lang="scss" scoped> |
| 424 | +.system-info-tabs { | |
| 425 | + width: 100%; | |
| 426 | + height: 100%; | |
| 427 | + border-radius: 15px; | |
| 428 | +} | |
| 414 | 429 | .el-dialog__wrapper.NCC-dialog.NCC-dialog_center.systemInfoDialog { |
| 415 | 430 | :deep(.el-tabs__content) { |
| 416 | - background: #f5f5f5; | |
| 417 | - border-radius: 10px; | |
| 431 | + //background: #f5f5f5; | |
| 432 | + //border-radius: 10px; | |
| 418 | 433 | padding: 10px; |
| 434 | + margin: 10px; | |
| 419 | 435 | } |
| 420 | 436 | } |
| 421 | 437 | ... | ... |
src/views/baseSystemInfo/InspectForm.vue
| ... | ... | @@ -30,13 +30,13 @@ |
| 30 | 30 | </el-form-item> |
| 31 | 31 | </el-col> |
| 32 | 32 | <el-col :span="24"> |
| 33 | - <el-form-item label="平台名称" prop="platformName"> | |
| 33 | + <el-form-item label="应用名称" prop="platformName"> | |
| 34 | 34 | <el-select |
| 35 | 35 | v-model="dataForm.platformName" |
| 36 | 36 | filterable |
| 37 | 37 | remote |
| 38 | 38 | reserve-keyword |
| 39 | - placeholder="请输入平台名称" | |
| 39 | + placeholder="请输入应用名称" | |
| 40 | 40 | :remote-method="loadList" |
| 41 | 41 | :loading="name_loading"> |
| 42 | 42 | <el-option |
| ... | ... | @@ -49,7 +49,7 @@ |
| 49 | 49 | </el-form-item> |
| 50 | 50 | </el-col> |
| 51 | 51 | <el-col :span="24"> |
| 52 | - <el-form-item label="平台类型" prop="platformType"> | |
| 52 | + <el-form-item label="应用类型" prop="platformType"> | |
| 53 | 53 | <el-radio-group v-model="dataForm.platformType" :style="{}"> |
| 54 | 54 | <el-radio |
| 55 | 55 | v-for="(item, index) in platformTypeOptions" |
| ... | ... | @@ -280,7 +280,7 @@ export default { |
| 280 | 280 | this.isDetail = isDetail || false; |
| 281 | 281 | this.$nextTick(async () => { |
| 282 | 282 | this.$refs["elForm"].resetFields(); |
| 283 | - this.dataForm.platformName = row.Id; | |
| 283 | + this.dataForm.platformName = row.id; | |
| 284 | 284 | this.dataForm.platformType = row.systemType; |
| 285 | 285 | this.dataForm.obtainEvidence = []; |
| 286 | 286 | this.dataForm.annex = []; | ... | ... |
src/views/baseSystemInfo/index.vue
| ... | ... | @@ -12,7 +12,7 @@ |
| 12 | 12 | <el-input |
| 13 | 13 | clearable |
| 14 | 14 | v-model="query.keyword" |
| 15 | - placeholder="请输入应用名称、企业名称进行查询" | |
| 15 | + placeholder="请输入应用名称、运营主体名称进行查询" | |
| 16 | 16 | /> |
| 17 | 17 | </el-form-item> |
| 18 | 18 | </el-col> |
| ... | ... | @@ -37,7 +37,7 @@ |
| 37 | 37 | <el-form-item label=""> |
| 38 | 38 | <el-select |
| 39 | 39 | v-model="query.proId" |
| 40 | - placeholder="请选择系统分类" | |
| 40 | + placeholder="请选择应用分类" | |
| 41 | 41 | :disabled="!query.systemType" |
| 42 | 42 | clearable |
| 43 | 43 | > |
| ... | ... | @@ -87,7 +87,7 @@ |
| 87 | 87 | <el-table-column |
| 88 | 88 | show-overflow-tooltip |
| 89 | 89 | prop="companyName" |
| 90 | - label="主体企业" | |
| 90 | + label="运营主体名称" | |
| 91 | 91 | align="center" |
| 92 | 92 | /> |
| 93 | 93 | <el-table-column |
| ... | ... | @@ -104,13 +104,13 @@ |
| 104 | 104 | </el-table-column> |
| 105 | 105 | <el-table-column |
| 106 | 106 | show-overflow-tooltip |
| 107 | - prop="principalName" | |
| 107 | + prop="contactUser" | |
| 108 | 108 | label="联系人" |
| 109 | 109 | align="center" |
| 110 | 110 | /> |
| 111 | 111 | <el-table-column |
| 112 | 112 | show-overflow-tooltip |
| 113 | - prop="principalPhone" | |
| 113 | + prop="contactPhone" | |
| 114 | 114 | label="联系电话" |
| 115 | 115 | align="center" |
| 116 | 116 | /> |
| ... | ... | @@ -120,7 +120,7 @@ |
| 120 | 120 | <el-table-column label="操作" width="250"> |
| 121 | 121 | <!-- 查看,修改,归属地变更,上报 --> |
| 122 | 122 | <template slot-scope="scope"> |
| 123 | - <infoForm class="btn_dialog" type="edit" :systemId="scope.row.Id" @reInit="search"> | |
| 123 | + <infoForm class="btn_dialog" type="edit" :systemId="scope.row.id" @reInit="search"> | |
| 124 | 124 | <el-button size="mini" type="text">修改</el-button> |
| 125 | 125 | </infoForm> |
| 126 | 126 | <el-button size="mini" type="text" @click="toDetail(scope.row)">查看</el-button> |
| ... | ... | @@ -341,8 +341,6 @@ export default { |
| 341 | 341 | }); |
| 342 | 342 | }, |
| 343 | 343 | toDetail(row) { |
| 344 | - console.log(row); | |
| 345 | - | |
| 346 | 344 | this.DetailFormVisible = true; |
| 347 | 345 | this.$nextTick(() => { |
| 348 | 346 | this.$refs.DetailForm.init(row); |
| ... | ... | @@ -355,13 +353,6 @@ export default { |
| 355 | 353 | this.$refs.InspectionForm.init(row); |
| 356 | 354 | }); |
| 357 | 355 | }, |
| 358 | - // 整改清单 | |
| 359 | - toChangeRecord(row) { | |
| 360 | - this.ChangeRecordVisible = true; | |
| 361 | - this.$nextTick(() => { | |
| 362 | - this.$refs.ChangeRecord.init(row); | |
| 363 | - }); | |
| 364 | - }, | |
| 365 | 356 | refresh(isrRefresh) { |
| 366 | 357 | this.InspectionFormVisible = false; |
| 367 | 358 | if (isrRefresh) this.reset(); |
| ... | ... | @@ -371,7 +362,7 @@ export default { |
| 371 | 362 | this.areaDialogLoading = true; |
| 372 | 363 | this.activeAreaId = row.areaId; |
| 373 | 364 | this.areaForm.areaId = row.areaId; |
| 374 | - this.activeSystemId = row.Id; | |
| 365 | + this.activeSystemId = row.id; | |
| 375 | 366 | await this.initAreaTypeList(); |
| 376 | 367 | this.areaDialogLoading = false; |
| 377 | 368 | }, |
| ... | ... | @@ -437,7 +428,7 @@ export default { |
| 437 | 428 | type: 'warning' |
| 438 | 429 | }).then(async () => { |
| 439 | 430 | let res = await request({ |
| 440 | - url: `/Extend/basesysteminfo/${row.Id}`, | |
| 431 | + url: `/Extend/basesysteminfo/${row.id}`, | |
| 441 | 432 | method: "DELETE", |
| 442 | 433 | }); |
| 443 | 434 | this.$message({ | ... | ... |
src/views/homePage/HomePage.vue
src/views/homePage/components/UserInfoPage.vue
| ... | ... | @@ -118,7 +118,7 @@ export default { |
| 118 | 118 | this.$refs["form"].validate(async (valid) => { |
| 119 | 119 | if(valid) { |
| 120 | 120 | request({ |
| 121 | - url: `/permission/users/${this.user.id}`, | |
| 121 | + url: `/permission/Users/${this.user.id}/UpdateUserInfo`, | |
| 122 | 122 | method: 'PUT', |
| 123 | 123 | data: { realName: this.user.realName } |
| 124 | 124 | }).then((res) => { | ... | ... |
src/views/overView/Overview.vue
| ... | ... | @@ -3,7 +3,7 @@ |
| 3 | 3 | <el-row :gutter="20"> |
| 4 | 4 | <el-col :span="16"> |
| 5 | 5 | <div class="item-box todo"> |
| 6 | - <div class="item-title"> | |
| 6 | + <div class="item-title public-title"> | |
| 7 | 7 | <div class="left">任务中心</div> |
| 8 | 8 | <div class="right"> |
| 9 | 9 | <!-- <el-button type="success" size="mini" style="margin-right: 10px;" v-if="isSHILevel" @click="announceMsg">发布</el-button> --> |
| ... | ... | @@ -14,7 +14,7 @@ |
| 14 | 14 | </div> |
| 15 | 15 | <div class="item-body"> |
| 16 | 16 | <template> |
| 17 | - <el-table :data="taskList" style="width: 100%" stripe v-loading="taskLoading"> | |
| 17 | + <el-table :data="taskList" style="width: 100%" stripe v-loading="taskLoading" size="small"> | |
| 18 | 18 | <el-table-column type="index" width="40"> </el-table-column> |
| 19 | 19 | <el-table-column prop="taskTitle" label="任务名称" show-overflow-tooltip/> |
| 20 | 20 | <el-table-column prop="taskType" label="任务类型" show-overflow-tooltip width="100"/> |
| ... | ... | @@ -379,8 +379,14 @@ export default { |
| 379 | 379 | .item-box { |
| 380 | 380 | width: 100%; |
| 381 | 381 | border-radius: 10px; |
| 382 | - background-color: rgba(244, 244, 245, 0.38); | |
| 383 | - margin-bottom: 15px; | |
| 382 | + background-color: rgba(228, 231, 237, 0.23); | |
| 383 | + // margin-bottom: 15px; | |
| 384 | + // border-image-source:url('/src/assets/images/box-bc.png'); | |
| 385 | + // border-image-slice:33%; | |
| 386 | + // border-image-width:40px; | |
| 387 | + // border-image-outset:0; | |
| 388 | + // border-image-repeat:repeat; | |
| 389 | + overflow: hidden; | |
| 384 | 390 | &.todo { |
| 385 | 391 | height: calc(100vh - 160px); |
| 386 | 392 | } |
| ... | ... | @@ -395,14 +401,37 @@ export default { |
| 395 | 401 | height: calc(100vh - 160px); |
| 396 | 402 | margin-bottom: 0; |
| 397 | 403 | } |
| 404 | + .public-title { | |
| 405 | + width: calc(100% - 20px); | |
| 406 | + height: 30px; | |
| 407 | + position: relative; | |
| 408 | + top: 0; | |
| 409 | + left: 5px; | |
| 410 | + color: white; | |
| 411 | + padding-left: 16px; | |
| 412 | + line-height: 30px; | |
| 413 | + font-size: 14px; | |
| 414 | + &::before { | |
| 415 | + width: 4px; | |
| 416 | + height: 20px; | |
| 417 | + top: 5px; | |
| 418 | + position: absolute; | |
| 419 | + content: ""; | |
| 420 | + background: #2997e4; | |
| 421 | + border-radius: 2px; | |
| 422 | + left: 5px; | |
| 423 | + } | |
| 424 | + } | |
| 398 | 425 | .item-title { |
| 399 | 426 | display: flex; |
| 400 | 427 | justify-content: space-between; |
| 401 | 428 | align-items: center; |
| 402 | - color: rgba(255, 255, 255, 1); | |
| 403 | - font-size: 16px; | |
| 404 | - line-height: 23px; | |
| 405 | - padding: 10px; | |
| 429 | + padding: 0px 15px; | |
| 430 | + margin: 6px 10px; | |
| 431 | + // color: rgba(255, 255, 255, 1); | |
| 432 | + // font-size: 16px; | |
| 433 | + // line-height: 23px; | |
| 434 | + // padding: 10px; | |
| 406 | 435 | .el-link.el-link--default { |
| 407 | 436 | color: #fff !important; |
| 408 | 437 | } | ... | ... |