diff --git a/src/utils/request.js b/src/utils/request.js index ffb0d21..74d3db7 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,7 +17,7 @@ const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: process.env.VUE_APP_BASE_API, // 超时 - timeout: 10000 + timeout: 100000 }) // request拦截器 diff --git a/src/views/tcZz/networkEcology/aqg/index.vue b/src/views/tcZz/networkEcology/aqg/index.vue index 79c4483..a76e983 100644 --- a/src/views/tcZz/networkEcology/aqg/index.vue +++ b/src/views/tcZz/networkEcology/aqg/index.vue @@ -9,13 +9,19 @@ label-width="auto" > - + > + + - + + + @@ -240,11 +253,11 @@ labelClassName="desLable" > {{ - selectDictLabel(dict.type.tc_area,form.areaId) + selectDictLabel(dict.type.tc_area, form.areaId) }} {{ - selectDictLabel(dict.type.tc_start,form.isStatus) + selectDictLabel(dict.type.tc_start, form.isStatus) }} {{ @@ -301,7 +314,7 @@ import { export default { name: "Aqg", //注释字典 - dicts: ["tc_start"], + dicts: ["tc_start", "tc_area"], data() { return { tableHeigth: 0, diff --git a/src/views/tcZz/networkEcology/fb/index.vue b/src/views/tcZz/networkEcology/fb/index.vue index db2b7fe..31e9ab1 100644 --- a/src/views/tcZz/networkEcology/fb/index.vue +++ b/src/views/tcZz/networkEcology/fb/index.vue @@ -275,7 +275,7 @@ }} {{ - form.type + selectDictLabel(dict.type.tc_sjbd,form.type) }} {{ diff --git a/src/views/tcZz/networkEcology/wlaqzcqy/index.vue b/src/views/tcZz/networkEcology/wlaqzcqy/index.vue index 761d56d..0ad30a7 100644 --- a/src/views/tcZz/networkEcology/wlaqzcqy/index.vue +++ b/src/views/tcZz/networkEcology/wlaqzcqy/index.vue @@ -284,7 +284,7 @@ import { export default { name: "Wlaqzcqy", //注释字典 - dicts: ["tc_area", "tc_start"], + dicts: ["tc_area", "tc_start",], data() { return { tableHeigth: 0, diff --git a/src/views/tcZz/networkEcology/wlwmzyz/index.vue b/src/views/tcZz/networkEcology/wlwmzyz/index.vue index 63f5a99..195fcae 100644 --- a/src/views/tcZz/networkEcology/wlwmzyz/index.vue +++ b/src/views/tcZz/networkEcology/wlwmzyz/index.vue @@ -295,7 +295,7 @@ }} {{ - form.type + selectDictLabel(dict.type.tc_wlwmzyzlx,form.type) }} {{ diff --git a/src/views/tcZz/networkEcology/wpwzlyqk/index.vue b/src/views/tcZz/networkEcology/wpwzlyqk/index.vue index c5d6ffe..ff9415c 100644 --- a/src/views/tcZz/networkEcology/wpwzlyqk/index.vue +++ b/src/views/tcZz/networkEcology/wpwzlyqk/index.vue @@ -53,7 +53,7 @@ /> - + {{ - selectDictLabel(dict.type.tc_area,form.areaId) + selectDictLabel(dict.type.tc_area, form.areaId) }} {{ - selectDictLabel(dict.type.tc_start,form.isStatus) + selectDictLabel(dict.type.tc_start, form.isStatus) }} {{ - form.type + selectDictLabel(dict.type.tc_wpwzlylx, form.type) }} {{ diff --git a/src/views/tcZz/networkEcology/wpy/index.vue b/src/views/tcZz/networkEcology/wpy/index.vue index 3b93226..f474477 100644 --- a/src/views/tcZz/networkEcology/wpy/index.vue +++ b/src/views/tcZz/networkEcology/wpy/index.vue @@ -8,7 +8,6 @@ v-show="showSearch" label-width="auto" > - - + - + @@ -275,11 +274,11 @@ labelClassName="desLable" > {{ - selectDictLabel(dict.type.tc_area,form.areaId) + selectDictLabel(dict.type.tc_area, form.areaId) }} {{ - selectDictLabel(dict.type.tc_start,form.isStatus) + selectDictLabel(dict.type.tc_start, form.isStatus) }} {{ @@ -311,7 +310,7 @@ }} {{ - form.type + selectDictLabel(dict.type.tc_wpylx, form.type) }} {{ diff --git a/src/views/tcZz/networkSecurity/DataSourceTj/index.vue b/src/views/tcZz/networkSecurity/DataSourceTj/index.vue index 28534e0..f9840bc 100644 --- a/src/views/tcZz/networkSecurity/DataSourceTj/index.vue +++ b/src/views/tcZz/networkSecurity/DataSourceTj/index.vue @@ -8,7 +8,7 @@ v-show="showSearch" label-width="auto" > - + - +
@@ -65,6 +65,7 @@ size="mini" @click="handleAdd()" v-hasPermi="['tcZz/networkSecurity:DataSourceTj:add']" + :disabled="isShowAdd" >新增 { this.DataSourceTjList = response.rows; + if (response.rows.length > 0) this.isShowAdd = true; + else this.isShowAdd = false; this.total = response.total; this.loading = false; }); diff --git a/src/views/tcZz/networkSecurity/dbxt/index.vue b/src/views/tcZz/networkSecurity/dbxt/index.vue index 17f921a..bc232eb 100644 --- a/src/views/tcZz/networkSecurity/dbxt/index.vue +++ b/src/views/tcZz/networkSecurity/dbxt/index.vue @@ -32,32 +32,7 @@ @keyup.enter.native="handleQuery" /> - - - - - - - - - - + + + + @@ -245,7 +223,7 @@ size="small" v-model="form.startTime" type="date" - value-format="yyyy-MM-dd" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择投入运行使用日期" > @@ -259,7 +237,7 @@ size="small" v-model="form.systemDjtime" type="date" - value-format="yyyy-MM-dd" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择系统定级时间" > @@ -319,7 +297,7 @@ labelClassName="desLable" > {{ - selectDictLabel(dict.type.tc_area,form.areaId) + selectDictLabel(dict.type.tc_area, form.areaId) }} {{ @@ -391,7 +369,7 @@ }} {{ - selectDictLabel(dict.type.tc_start,form.isStatus) + selectDictLabel(dict.type.tc_start, form.isStatus) }} {{ diff --git a/src/views/tcZz/networkSecurity/jgdw/index.vue b/src/views/tcZz/networkSecurity/jgdw/index.vue index e4a65f7..52079f3 100644 --- a/src/views/tcZz/networkSecurity/jgdw/index.vue +++ b/src/views/tcZz/networkSecurity/jgdw/index.vue @@ -304,7 +304,7 @@ }} {{ - form.type + selectDictLabel(dict.type.tc_jslx,form.type) }} {{ diff --git a/src/views/tcZz/networkSecurity/map/index.vue b/src/views/tcZz/networkSecurity/map/index.vue index fcd2f9d..a16140b 100644 --- a/src/views/tcZz/networkSecurity/map/index.vue +++ b/src/views/tcZz/networkSecurity/map/index.vue @@ -164,18 +164,8 @@ - - + + - {{ form.type }} + {{ + selectDictLabel(dict.type.tc_dttjlx, form.type) + }} {{ form.remark diff --git a/src/views/tcZz/networkSecurity/ryz/index.vue b/src/views/tcZz/networkSecurity/ryz/index.vue index 19d4a34..491a4a8 100644 --- a/src/views/tcZz/networkSecurity/ryz/index.vue +++ b/src/views/tcZz/networkSecurity/ryz/index.vue @@ -266,7 +266,7 @@ }} {{ - form.type + selectDictLabel(dict.type.tc_yrtzlx,form.type) }} {{ diff --git a/src/views/tcZz/networkSecurity/sdtb/index.vue b/src/views/tcZz/networkSecurity/sdtb/index.vue index d89100a..d5418c5 100644 --- a/src/views/tcZz/networkSecurity/sdtb/index.vue +++ b/src/views/tcZz/networkSecurity/sdtb/index.vue @@ -9,14 +9,21 @@ label-width="auto" > - + > + + + @@ -169,7 +176,14 @@ class="dialog-from" > - + + + @@ -181,10 +195,10 @@ > - + - + @@ -212,11 +226,11 @@ labelClassName="desLable" > {{ - form.area + selectDictLabel(dict.type.tc_sdtbmc, form.area) }} {{ - selectDictLabel(dict.type.tc_start,form.isStatus) + selectDictLabel(dict.type.tc_start, form.isStatus) }} {{ @@ -247,7 +261,7 @@ import { export default { name: "Sdtb", //注释字典 - dicts: ["tc_start"], + dicts: ["tc_start", "tc_sdtbmc"], data() { return { tableHeigth: 0, diff --git a/src/views/tcZz/networkSecurity/top5/index.vue b/src/views/tcZz/networkSecurity/top5/index.vue index 2ad496e..420e83e 100644 --- a/src/views/tcZz/networkSecurity/top5/index.vue +++ b/src/views/tcZz/networkSecurity/top5/index.vue @@ -8,26 +8,25 @@ v-show="showSearch" label-width="auto" > - - + - + - + - - + + - - + + - + @@ -175,11 +178,11 @@ labelClassName="desLable" > {{ - form.sAttackIp + form.sattackIp }} {{ - form.sAttackCount + form.sattackCount }} {{ @@ -239,9 +242,9 @@ export default { pageSize: 10, id: null, - sAttackIp: null, + sattackIp: null, - sAttackCount: null, + sattackCount: null, createBy: null, @@ -293,9 +296,9 @@ export default { this.form = { id: null, - sAttackIp: null, + sattackIp: null, - sAttackCount: null, + sattackCount: null, createBy: null, diff --git a/src/views/tcZz/networkSecurity/wljgtj/index.vue b/src/views/tcZz/networkSecurity/wljgtj/index.vue index 6bb20d3..402a50b 100644 --- a/src/views/tcZz/networkSecurity/wljgtj/index.vue +++ b/src/views/tcZz/networkSecurity/wljgtj/index.vue @@ -1,122 +1,163 @@