antissoft / NetworkInformation

Commit cbd5265de5730849e3e41c1a3eb5900e62653a79

Authored by monkeyhouyi
1 parent 142c4a8e

优化

Inline Side-by-side
Showing 12 changed files with 100 additions and 57 deletions
src/components/CompanyForm/index.vue
  View file @cbd5265
... ... @@ -129,7 +129,14 @@ export default {
129 129 companyName: [
130 130 {
131 131 required: true,
132   - message: '请输入公司名称',
  132 + message: '请输入运营主体/个人名称',
  133 + trigger: 'blur'
  134 + },
  135 + ],
  136 + areaId: [
  137 + {
  138 + required: true,
  139 + message: '请选择所属区县',
133 140 trigger: 'blur'
134 141 },
135 142 ],
... ...
src/components/Generator/components/Upload/UploadFz.vue
  View file @cbd5265
... ... @@ -3,7 +3,7 @@
3 3 <el-upload :action="define.comUploadUrl+'/'+type" :headers="uploadHeaders" ref="elUpload"
4 4 :on-success="handleSuccess" :multiple="limit!==1" :show-file-list="false" :accept="accept"
5 5 :before-upload="beforeUpload" :on-exceed="handleExceed" :disabled="disabled" :limit="limit" v-if="!disabled">
6   - <el-button size="small" icon="el-icon-upload" :disabled="disabled" :on-preview="handlePreview">{{buttonText}}</el-button>
  6 + <el-button size="small" icon="el-icon-upload" v-if="!disabled" :disabled="disabled" :on-preview="handlePreview">{{buttonText}}</el-button>
7 7 <div slot="tip" class="el-upload__tip" v-show="showTip">
8 8 只能上传不超过{{fileSize}}{{sizeUnit}}的{{accept}}文件
9 9 </div>
... ... @@ -13,9 +13,12 @@
13 13 name="el-list">
14 14 <li class="el-upload-list__item is-success" v-for="(file,index) in fileList"
15 15 :key="file.fileId">
16   - <a class="el-upload-list__item-name" @click="handleClick(file)">
17   - <i class="el-icon-document"></i>{{file.name}}
18   - </a>
  16 + <div style="display: flex; align-items: center;">
  17 + <a class="el-upload-list__item-name" @click="handleChaeck(file,index)" style="width: 60px; margin-right: 5px;"><i class="el-icon-view"></i>查看</a>
  18 + <a class="el-upload-list__item-name" @click="handleClick(file)" style="flex: 1;">
  19 + <i class="el-icon-download"></i>{{file.name}}
  20 + </a>
  21 + </div>
19 22 <label class="el-upload-list__item-status-label">
20 23 <i class="el-icon-upload-success el-icon-circle-check"></i>
21 24 </label>
... ... @@ -127,9 +130,10 @@ export default {
127 130 // this.$confirm(`确定移除${file.name}？`, '提示').then(() => {
128 131 // }).catch(() => { })
129 132 },
  133 + handleChaeck(file, index) {
  134 + window.open(`${this.define.comUrl}/api/File/Image/${this.type}/${file.fileId}`)
  135 + },
130 136 handleClick(file) {
131   - console.log(file);
132   -
133 137 // 点击下载文件
134 138 if (!file.fileId) return
135 139 getDownloadUrl(this.type, file.fileId, file.name).then(res => {
... ...
src/views/DisposalSuggestions/index.vue
  View file @cbd5265
1 1 <template>
2 2 <div class="SystemInfo item-box common-info-box">
3   - <div class="item-title">{{ isSHILevel ? "线索研判" : "巡查处理" }}</div>
  3 + <div class="item-title">{{ isSHILevel ? "线索研判" : "线索核查" }}</div>
4 4 <div class="item-body">
5 5 <div class="NCC-common-layout">
6 6 <div class="NCC-common-layout-center">
... ... @@ -11,7 +11,7 @@
11 11 <el-date-picker
12 12 v-model="query.creatorTime"
13 13 type="datetimerange"
14   - value-format="timestamp"
  14 + value-format="yyyy-MM-dd HH:mm:ss"
15 15 format="yyyy-MM-dd HH:mm:ss"
16 16 start-placeholder="登记开始日期"
17 17 end-placeholder="登记结束日期"
... ... @@ -90,15 +90,8 @@
90 90 label="应用名称"
91 91 align="left"
92 92 />
93   - <el-table-column
94   - show-overflow-tooltip
95   - label="应用类型"
96   - prop="platformType"
97   - align="left"
98   - >
99   - <template slot-scope="scope">{{
100   - scope.row.platformNameStr || scope.row.platformName
101   - }}</template>
  93 + <el-table-column label="应用类型" prop="platformType" align="left" show-overflow-tooltip>
  94 + <template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template>
102 95 </el-table-column>
103 96 <el-table-column
104 97 show-overflow-tooltip
... ... @@ -281,6 +274,8 @@ export default {
281 274 let _query = {
282 275 ...this.listQuery,
283 276 ...this.query,
  277 + startTime: this.query.creatorTime[0],
  278 + endTime: this.query.creatorTime[1],
284 279 };
285 280 let query = {};
286 281 for (let key in _query) {
... ... @@ -290,6 +285,8 @@ export default {
290 285 query[key] = _query[key];
291 286 }
292 287 }
  288 + delete query.creatorTime;
  289 +
293 290 getListForJudge(query).then((res) => {
294 291 this.list = res.data.list;
295 292 this.total = res.data.pagination.total;
... ... @@ -347,13 +344,24 @@ export default {
347 344 this.initData();
348 345 },
349 346 exportData() {
  347 + let _query = {
  348 + ...this.query,
  349 + startTime: this.query.creatorTime[0],
  350 + endTime: this.query.creatorTime[1],
  351 + };
  352 + let query = {};
  353 + for (let key in _query) {
  354 + if (Array.isArray(_query[key])) {
  355 + query[key] = _query[key].join();
  356 + } else {
  357 + query[key] = _query[key];
  358 + }
  359 + }
  360 + delete query.creatorTime;
350 361 let obj = {
351 362 url: "/Extend/BaseInspectionReport/Actions/ExportByJudge",
352 363 method: "POST",
353   - data: {
354   - ...this.query,
355   - creatorTime: this.query.creatorTime.toString(),
356   - },
  364 + data: query,
357 365 };
358 366 request(obj).then((res) => {
359 367 if (res.code != 200) return;
... ...
src/views/baseCaseHandling/index.vue
  View file @cbd5265
... ... @@ -11,7 +11,7 @@
11 11 <el-date-picker
12 12 v-model="query.registrationTime"
13 13 type="datetimerange"
14   - value-format="timestamp"
  14 + value-format="yyyy-MM-dd HH:mm:ss"
15 15 format="yyyy-MM-dd HH:mm:ss"
16 16 start-placeholder="开始日期"
17 17 end-placeholder="结束日期"
... ... @@ -135,7 +135,7 @@ export default {
135 135 showAll: false,
136 136 query: {
137 137 number: undefined,
138   - registrationTime: undefined,
  138 + registrationTime: [],
139 139 systemName: undefined,
140 140 category: undefined,
141 141 enforceType: undefined
... ... @@ -208,6 +208,8 @@ export default {
208 208 let _query = {
209 209 ...this.listQuery,
210 210 ...this.query,
  211 + startTime: this.query.registrationTime[0],
  212 + endTime: this.query.registrationTime[1],
211 213 };
212 214 let query = {};
213 215 for (let key in _query) {
... ... @@ -217,6 +219,7 @@ export default {
217 219 query[key] = _query[key];
218 220 }
219 221 }
  222 + delete query.registrationTime;
220 223 request({
221 224 url: `/Extend/BaseCaseHandling`,
222 225 method: "GET",
... ... @@ -277,6 +280,8 @@ export default {
277 280 toExport() {
278 281 let _query = {
279 282 ...this.query,
  283 + startTime: this.query.registrationTime[0],
  284 + endTime: this.query.registrationTime[1],
280 285 };
281 286 let query = {};
282 287 for (let key in _query) {
... ... @@ -286,6 +291,7 @@ export default {
286 291 query[key] = _query[key];
287 292 }
288 293 }
  294 + delete query.registrationTime;
289 295 this.exportBtnLoading = true;
290 296 console.log(111);
291 297 request({
... ...
src/views/baseComapnyInfo/Form.vue
  View file @cbd5265
... ... @@ -117,7 +117,14 @@ export default {
117 117 companyName: [
118 118 {
119 119 required: true,
120   - message: '请输入公司名称',
  120 + message: '请输入运营主体/个人名称',
  121 + trigger: 'blur'
  122 + },
  123 + ],
  124 + areaId: [
  125 + {
  126 + required: true,
  127 + message: '请选择所属区县',
121 128 trigger: 'blur'
122 129 },
123 130 ],
... ...
src/views/baseInspectionReport/Form.vue
  View file @cbd5265
... ... @@ -473,7 +473,7 @@ export default {
473 473 if(res.code != 200) return this.form_loading = false;
474 474 if(!res.data) return;
475 475 this.dataForm = res.data;
476   - if(!this.isDetail) {
  476 + if(!this.isDetail && Array.isArray(this.dataForm.disposalSuggestions)) {
477 477 let disposalSuggestions = this.dataForm.disposalSuggestions;
478 478 this.dataForm.disposalSuggestions = disposalSuggestions[disposalSuggestions.length - 1].disposalSuggestion;
479 479 }
... ...
src/views/baseInspectionReport/index.vue
  View file @cbd5265
... ... @@ -11,7 +11,7 @@
11 11 <el-date-picker
12 12 v-model="query.creatorTime"
13 13 type="datetimerange"
14   - value-format="timestamp"
  14 + value-format="yyyy-MM-dd HH:mm:ss"
15 15 format="yyyy-MM-dd HH:mm:ss"
16 16 start-placeholder="登记开始日期"
17 17 end-placeholder="登记结束日期"
... ... @@ -26,7 +26,7 @@
26 26 </el-col>
27 27 <el-col :span="3">
28 28 <el-form-item label="">
29   - <el-select v-model="query.platformType" placeholder="请选择系统类型" clearable >
  29 + <el-select v-model="query.platformType" placeholder="请选择应用类型" clearable >
30 30 <el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id" />
31 31 </el-select>
32 32 </el-form-item>
... ... @@ -164,8 +164,11 @@
164 164 this.listLoading = true;
165 165 let _query = {
166 166 ...this.listQuery,
167   - ...this.query
  167 + ...this.query,
  168 + startTime: this.query.creatorTime[0],
  169 + endTime: this.query.creatorTime[1],
168 170 };
  171 +
169 172 let query = {}
170 173 for (let key in _query) {
171 174 if (Array.isArray(_query[key])) {
... ... @@ -174,6 +177,8 @@
174 177 query[key] = _query[key]
175 178 }
176 179 }
  180 + delete query.creatorTime;
  181 +
177 182 getList(query).then(res => {
178 183 if(res.data) {
179 184 this.list = res.data.list
... ... @@ -229,13 +234,25 @@
229 234 responseType: 'blob',
230 235 }
231 236 } else {
  237 + let _query = {
  238 + ...this.query,
  239 + startTime: this.query.creatorTime[0],
  240 + endTime: this.query.creatorTime[1],
  241 + };
  242 +
  243 + let query = {}
  244 + for (let key in _query) {
  245 + if (Array.isArray(_query[key])) {
  246 + query[key] = _query[key].join()
  247 + } else {
  248 + query[key] = _query[key]
  249 + }
  250 + }
  251 + delete query.creatorTime;
232 252 obj = {
233 253 url: '/Extend/BaseInspectionReport/Actions/Export',
234 254 method: "POST",
235   - data: {
236   - ...this.query,
237   - creatorTime: this.query.creatorTime.toString(),
238   - },
  255 + data: query,
239 256 }
240 257 }
241 258 request(obj).then((res) => {
... ...
src/views/basePrincipalResponsibility/Form.vue
  View file @cbd5265
... ... @@ -39,7 +39,7 @@
39 39 </el-col>
40 40 <el-col :span="24" v-if="ncc.hasFormP('fileUrl')">
41 41 <el-form-item label="文件地址" prop="fileUrl">
42   - <NCC-UploadFz v-model="dataForm.fileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
  42 + <NCC-UploadFz v-model="dataForm.fileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" :disabled="!!isDetail">
43 43 </NCC-UploadFz>
44 44 </el-form-item>
45 45 </el-col>
... ...
src/views/basePrincipalResponsibility/index.vue
  View file @cbd5265
... ... @@ -36,13 +36,14 @@
36 36 <template slot-scope="scope">{{ scope.row.fileType | dynamicText(fileTypeOptions) }}</template>
37 37 </el-table-column>
38 38 <el-table-column prop="timeTakingEffect" label="生效时间" align="left" show-overflow-tooltip :formatter="ncc.tableDateFormat"/>
39   - <el-table-column prop="content" label="具体内容" align="left" show-overflow-tooltip/>
  39 + <!-- <el-table-column prop="content" label="具体内容" align="left" show-overflow-tooltip/> -->
40 40 <!-- <el-table-column prop="creatorUserId" label="创建用户" align="left" show-overflow-tooltip/> -->
41 41 <el-table-column prop="creatorTime" label="创建时间" :formatter="ncc.tableDateFormat" align="left" show-overflow-tooltip/>
42 42 <!-- <el-table-column prop="lastModifyUserId" label="修改用户" show-overflow-tooltip align="left"/> -->
43 43 <!-- <el-table-column prop="lastModifyTime" :formatter="ncc.tableDateFormat" label="修改时间" align="left" show-overflow-tooltip/> -->
44   - <el-table-column label="操作" fixed="right" width="100">
  44 + <el-table-column label="操作" fixed="right" width="150">
45 45 <template slot-scope="scope">
  46 + <el-button type="text" @click="addOrUpdateHandle(scope.row.id, true)" >详情</el-button>
46 47 <el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
47 48 <el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
48 49 </template>
... ...
src/views/baseSystemInfo/index.vue
  View file @cbd5265
... ... @@ -35,12 +35,12 @@
35 35 </el-col>
36 36 <el-col :span="3">
37 37 <el-form-item label="">
38   - <el-input v-model="query.principalName" placeholder="请输入联系人"/>
  38 + <el-input v-model="query.principalName" placeholder="请输入联系人" clearable/>
39 39 </el-form-item>
40 40 </el-col>
41 41 <el-col :span="3">
42 42 <el-form-item label="">
43   - <el-input v-model="query.principalPhone" placeholder="请输入联系电话"/>
  43 + <el-input v-model="query.principalPhone" placeholder="请输入联系电话" clearable/>
44 44 </el-form-item>
45 45 </el-col>
46 46 <el-col :span="3">
... ... @@ -222,20 +222,12 @@ export default {
222 222 },
223 223 methods: {
224 224 uploadSuccess(response, file, fileList) {
225   - if(response.code == 200) {
226   - this.$message({
227   - type: 'success',
228   - message: response.msg,
229   - onClose: () => {
230   - this.initData()
231   - }
232   - });
233   - } else {
234   - this.$message({
235   - type: 'error',
236   - message: response.msg,
237   - });
238   - }
  225 + let type = response.code == 200 ? 'success' : 'error';
  226 + this.$message({
  227 + type: type,
  228 + message: response.msg,
  229 + });
  230 + this.initList();
239 231 },
240 232 handleSystemTypeChange(val) {
241 233 this.query.systemClass = "";
... ...
src/views/overView/Overview.vue
  View file @cbd5265
... ... @@ -358,7 +358,7 @@ export default {
358 358 // });
359 359 } else {
360 360 let type = row.taskType;
361   - if(row.taskType == '核查处理' || row.taskType == '研判') {
  361 + if(row.taskType == '核查处理' || row.taskType == '核查处置' || row.taskType == '研判') {
362 362 let str = row.taskTitle;
363 363 type = str.slice(1, str.indexOf('】'));
364 364 }
... ...
src/views/overView/msgForm.vue
  View file @cbd5265
... ... @@ -91,13 +91,15 @@
91 91 <div class="content" v-html="dataForm.bodyContent"></div>
92 92 <div class="files" v-if="isSHILevel">
93 93 <h4>查看情况</h4>
  94 + <div style="font-size: 12px; margin: 8px;">
  95 + 注：<el-tag type="success" size="mini">区县</el-tag>表示 【已查看】 的区县， <el-tag type="danger" size="mini">区县</el-tag>表示 【未查看】 的区县
  96 + </div>
94 97 <div class="tag-group">
95 98 <span class="tag-group__title title-tag">传递区域:</span>
96 99 <el-tag
97 100 v-for="(v, i) in dataForm.communicationAreaList"
98 101 :key="i"
99   - :type="`${v.IsRead ? 'success' : 'danger'}`"
100   - :effect="`${v.IsRead ? 'dark' : 'plain'}`">
  102 + :type="`${v.IsRead ? 'success' : 'danger'}`">
101 103 {{ v.FullName }}
102 104 </el-tag>
103 105 </div>
... ... @@ -106,8 +108,7 @@
106 108 <el-tag
107 109 v-for="(v, i) in dataForm.communicationOutList"
108 110 :key="i"
109   - :type="`${v.IsRead ? 'success' : 'danger'}`"
110   - :effect="`${v.IsRead ? 'dark' : 'plain'}`">
  111 + :type="`${v.IsRead ? 'success' : 'danger'}`">
111 112 {{ v.FullName }}
112 113 </el-tag>
113 114 </div>
... ...