antissoft / NetworkInformation

Commit 1dbea7ff9dc6e556c1a17101c17c31ea2995be02

Authored by monkeyhouyi
1 parent 759b1291

1

Inline Side-by-side
Showing 2 changed files with 19 additions and 22 deletions
src/views/DisposalSuggestions/index.vue
  View file @1dbea7f
@@ -36,6 +36,13 @@ @@ -36,6 +36,13 @@
36 </el-form-item> 36 </el-form-item>
37 </el-col> 37 </el-col>
38 <el-col :span="3"> 38 <el-col :span="3">
  39 + <el-form-item label="">
  40 + <el-select v-model="query.state" placeholder="请选择类型" clearable>
  41 + <el-option v-for="item in stateOptions" :key="item" :label="item" :value="item"/>
  42 + </el-select>
  43 + </el-form-item>
  44 + </el-col>
  45 + <el-col :span="3">
39 <el-form-item> 46 <el-form-item>
40 <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button> 47 <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
41 <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button> 48 <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
@@ -102,26 +109,13 @@ @@ -102,26 +109,13 @@
102 </template> 109 </template>
103 </el-table-column> 110 </el-table-column>
104 </NCC-table> 111 </NCC-table>
105 - <pagination  
106 - :total="total"  
107 - :page.sync="listQuery.currentPage"  
108 - :limit.sync="listQuery.pageSize"  
109 - @pagination="initData"  
110 - /> 112 + <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
111 </div> 113 </div>
112 </div> 114 </div>
113 <ADDNCCForm v-if="addformVisible" ref="ADDNCCForm" @refresh="refresh" /> 115 <ADDNCCForm v-if="addformVisible" ref="ADDNCCForm" @refresh="refresh" />
114 <NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" /> 116 <NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
115 - <HandleForm  
116 - v-if="HandleFormVisible"  
117 - ref="HandleForm"  
118 - @refresh="refresh"  
119 - />  
120 - <ReportForm  
121 - v-if="ReportFormVisible"  
122 - ref="ReportForm"  
123 - @refresh="refresh"  
124 - /> 117 + <HandleForm v-if="HandleFormVisible" ref="HandleForm" @refresh="refresh"/>
  118 + <ReportForm v-if="ReportFormVisible" ref="ReportForm" @refresh="refresh"/>
125 </div> 119 </div>
126 </div> 120 </div>
127 </div> 121 </div>
@@ -153,6 +147,7 @@ export default { @@ -153,6 +147,7 @@ export default {
153 questionType: undefined, 147 questionType: undefined,
154 questionClass: undefined, 148 questionClass: undefined,
155 creatorTime: [], 149 creatorTime: [],
  150 + state: undefined,
156 }, 151 },
157 list: [], 152 list: [],
158 listLoading: true, 153 listLoading: true,
@@ -196,6 +191,7 @@ export default { @@ -196,6 +191,7 @@ export default {
196 HandleFormVisible: false, 191 HandleFormVisible: false,
197 ReportFormVisible: false, 192 ReportFormVisible: false,
198 addformVisible: false, 193 addformVisible: false,
  194 + stateOptions: ['待研判', '待进一步处置', '已处置待研判', '转执法', '已存档', '不采纳'],
199 }; 195 };
200 }, 196 },
201 computed: { 197 computed: {
@@ -225,8 +221,8 @@ export default { @@ -225,8 +221,8 @@ export default {
225 let _query = { 221 let _query = {
226 ...this.listQuery, 222 ...this.listQuery,
227 ...this.query, 223 ...this.query,
228 - startTime: this.query.creatorTime[0],  
229 - endTime: this.query.creatorTime[1], 224 + startTime: this.query.creatorTime[0] || '',
  225 + endTime: this.query.creatorTime[1] || '',
230 }; 226 };
231 let query = {}; 227 let query = {};
232 for (let key in _query) { 228 for (let key in _query) {
@@ -236,7 +232,7 @@ export default { @@ -236,7 +232,7 @@ export default {
236 query[key] = _query[key]; 232 query[key] = _query[key];
237 } 233 }
238 } 234 }
239 - delete query.creatorTime; 235 + query.creatorTime && delete query.creatorTime;
240 236
241 getListForJudge(query).then((res) => { 237 getListForJudge(query).then((res) => {
242 this.list = res.data.list; 238 this.list = res.data.list;
@@ -286,6 +282,7 @@ export default { @@ -286,6 +282,7 @@ export default {
286 for (let key in this.query) { 282 for (let key in this.query) {
287 this.query[key] = undefined; 283 this.query[key] = undefined;
288 } 284 }
  285 + this.query.creatorTime = [];
289 this.listQuery = { 286 this.listQuery = {
290 currentPage: 1, 287 currentPage: 1,
291 pageSize: 20, 288 pageSize: 20,
src/views/baseCaseHandling/index.vue
  View file @1dbea7f
@@ -208,8 +208,8 @@ export default { @@ -208,8 +208,8 @@ export default {
208 let _query = { 208 let _query = {
209 ...this.listQuery, 209 ...this.listQuery,
210 ...this.query, 210 ...this.query,
211 - startTime: this.query.registrationTime[0],  
212 - endTime: this.query.registrationTime[1], 211 + startTime: this.query.registrationTime[0] || '',
  212 + endTime: this.query.registrationTime[1] || '',
213 }; 213 };
214 let query = {}; 214 let query = {};
215 for (let key in _query) { 215 for (let key in _query) {
@@ -293,7 +293,6 @@ export default { @@ -293,7 +293,6 @@ export default {
293 } 293 }
294 delete query.registrationTime; 294 delete query.registrationTime;
295 this.exportBtnLoading = true; 295 this.exportBtnLoading = true;
296 - console.log(111);  
297 request({ 296 request({
298 url: `/Extend/BaseCaseHandling/Actions/Export`, 297 url: `/Extend/BaseCaseHandling/Actions/Export`,
299 method: "POST", 298 method: "POST",
@@ -325,6 +324,7 @@ export default { @@ -325,6 +324,7 @@ export default {
325 for (let key in this.query) { 324 for (let key in this.query) {
326 this.query[key] = undefined; 325 this.query[key] = undefined;
327 } 326 }
  327 + this.query.registrationTime = [];
328 this.listQuery = { 328 this.listQuery = {
329 currentPage: 1, 329 currentPage: 1,
330 pageSize: 20, 330 pageSize: 20,