Commit bae8b00438183ef10292a0c34ad1e662b405f926
1 parent
e8dbf78f
1
Showing
15 changed files
with
122 additions
and
38 deletions
src/assets/images/user2.jpg
0 → 100644
12 KB
src/components/InfoForm/index.vue
| @@ -199,14 +199,19 @@ | @@ -199,14 +199,19 @@ | ||
| 199 | </el-col> | 199 | </el-col> |
| 200 | <el-col :span="12" v-show="infoForm.systemType == '580634746028033285'"> | 200 | <el-col :span="12" v-show="infoForm.systemType == '580634746028033285'"> |
| 201 | <el-form-item label="粉丝量" prop="followerCount"> | 201 | <el-form-item label="粉丝量" prop="followerCount"> |
| 202 | - <el-input-number | 202 | + <el-input |
| 203 | + v-model="infoForm.followerCount" | ||
| 204 | + placeholder="请输入粉丝量" | ||
| 205 | + maxlength="500" | ||
| 206 | + ></el-input> | ||
| 207 | + <!-- <el-input-number | ||
| 203 | v-model="infoForm.followerCount" | 208 | v-model="infoForm.followerCount" |
| 204 | placeholder="请输入粉丝量" | 209 | placeholder="请输入粉丝量" |
| 205 | :min="0" | 210 | :min="0" |
| 206 | :precision="0" | 211 | :precision="0" |
| 207 | controls-position="right" | 212 | controls-position="right" |
| 208 | style="width: 100%;" | 213 | style="width: 100%;" |
| 209 | - ></el-input-number> | 214 | + ></el-input-number> --> |
| 210 | </el-form-item> | 215 | </el-form-item> |
| 211 | </el-col> | 216 | </el-col> |
| 212 | <!-- <el-col :span="12"> | 217 | <!-- <el-col :span="12"> |
| @@ -310,6 +315,12 @@ | @@ -310,6 +315,12 @@ | ||
| 310 | </el-radio-group> | 315 | </el-radio-group> |
| 311 | </el-form-item> | 316 | </el-form-item> |
| 312 | </el-col> | 317 | </el-col> |
| 318 | + <el-col :span="24"> | ||
| 319 | + <el-form-item label="备注" prop="remark"> | ||
| 320 | + <el-input type="textarea" v-model="infoForm.remark" placeholder="请输入备注" clearable maxlength="500"/> | ||
| 321 | + </el-form-item> | ||
| 322 | + </el-col> | ||
| 323 | + | ||
| 313 | <!-- <el-col :span="24"> | 324 | <!-- <el-col :span="24"> |
| 314 | <el-form-item label="所属外协" prop="externalAssistanceId"> | 325 | <el-form-item label="所属外协" prop="externalAssistanceId"> |
| 315 | <el-radio-group | 326 | <el-radio-group |
| @@ -390,11 +401,11 @@ export default { | @@ -390,11 +401,11 @@ export default { | ||
| 390 | message: "请输入应用名称", | 401 | message: "请输入应用名称", |
| 391 | trigger: "blur", | 402 | trigger: "blur", |
| 392 | }, | 403 | }, |
| 393 | - systemClass: { | ||
| 394 | - required: true, | ||
| 395 | - message: "请输入应用分类", | ||
| 396 | - trigger: "blur", | ||
| 397 | - }, | 404 | + // systemClass: { |
| 405 | + // required: true, | ||
| 406 | + // message: "请输入应用分类", | ||
| 407 | + // trigger: "blur", | ||
| 408 | + // }, | ||
| 398 | systemType: { | 409 | systemType: { |
| 399 | required: true, | 410 | required: true, |
| 400 | message: "请输入应用类型", | 411 | message: "请输入应用类型", |
src/components/MoreSelect/index.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <el-select v-model="accept_id" v-selectloadmore:rangeNum="() => rangeNum += 10" filterable :filter-method="filterMethod" placeholder="选择接收方"> | ||
| 3 | + <el-option v-for="item in acceptList.slice(0,rangeNum)" :key="item.id" :value="item.id" :label="item.name"> | ||
| 4 | + {{ item.name }} | ||
| 5 | + </el-option> | ||
| 6 | + </el-select> | ||
| 7 | +</template> | ||
| 8 | +<script> | ||
| 9 | + export default { | ||
| 10 | + props: ["value"], | ||
| 11 | + directives: { | ||
| 12 | + 'selectloadmore': { | ||
| 13 | + bind(el, binding) { | ||
| 14 | + const selectDom = el.querySelector('.el-select-dropdown .el-select-dropdown__wrap') | ||
| 15 | + selectDom.addEventListener('scroll', () => { | ||
| 16 | + if (selectDom.scrollHeight - selectDom.scrollTop <= selectDom.clientHeight + 20) { | ||
| 17 | + binding.value() | ||
| 18 | + } | ||
| 19 | + }) | ||
| 20 | + } | ||
| 21 | + } | ||
| 22 | + }, | ||
| 23 | + data(){ | ||
| 24 | + return { | ||
| 25 | + accept_id:undefined, | ||
| 26 | + acceptList:[], | ||
| 27 | + copyAcceptList:[], | ||
| 28 | + rangeNum: 20, | ||
| 29 | + } | ||
| 30 | + }, | ||
| 31 | + mounted(){ | ||
| 32 | + //获得acceptList的数据 | ||
| 33 | + }, | ||
| 34 | + methods:{ | ||
| 35 | + filterMethod (){ | ||
| 36 | + this.rangeNum = 20 | ||
| 37 | + //请求接口,筛选数据 | ||
| 38 | + } | ||
| 39 | + } | ||
| 40 | +} | ||
| 41 | +</script> | ||
| 0 | \ No newline at end of file | 42 | \ No newline at end of file |
src/store/modules/meta.js
| @@ -17,6 +17,7 @@ const meta = { | @@ -17,6 +17,7 @@ const meta = { | ||
| 17 | externalAssistanceList: '', // 外协 | 17 | externalAssistanceList: '', // 外协 |
| 18 | specialRecordTypeList: '', // 特殊备案 | 18 | specialRecordTypeList: '', // 特殊备案 |
| 19 | stateTypeList: '', | 19 | stateTypeList: '', |
| 20 | + searchKey: '', | ||
| 20 | }, | 21 | }, |
| 21 | 22 | ||
| 22 | mutations: { | 23 | mutations: { |
| @@ -38,6 +39,9 @@ const meta = { | @@ -38,6 +39,9 @@ const meta = { | ||
| 38 | SET_STATETYPE_LIST: (state, data) => { | 39 | SET_STATETYPE_LIST: (state, data) => { |
| 39 | state.stateTypeList = data; | 40 | state.stateTypeList = data; |
| 40 | }, | 41 | }, |
| 42 | + SET_SEARCHKEY: (state, data) => { | ||
| 43 | + state.searchKey = data; | ||
| 44 | + }, | ||
| 41 | }, | 45 | }, |
| 42 | 46 | ||
| 43 | actions: { | 47 | actions: { |
src/views/DisposalSuggestions/index.vue
| @@ -120,7 +120,7 @@ | @@ -120,7 +120,7 @@ | ||
| 120 | <el-button type="text" @click="addOrUpdateHandle(scope.row.id, false, 'edit')" v-if="isSHILevel && scope.row.stage == '577006666214540549'" >建议修改</el-button> | 120 | <el-button type="text" @click="addOrUpdateHandle(scope.row.id, false, 'edit')" v-if="isSHILevel && scope.row.stage == '577006666214540549'" >建议修改</el-button> |
| 121 | <!-- 未研判 ‘577006621985604869’/未下发 ‘577006641364189019’ / 已处置 ‘577006696312866053’ 可以研判 --> | 121 | <!-- 未研判 ‘577006621985604869’/未下发 ‘577006641364189019’ / 已处置 ‘577006696312866053’ 可以研判 --> |
| 122 | <!-- <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" :disabled="['577006621985604869', '577006641364189019', '577006696312866053'].includes(scope.row.stage) == -1">{{ scope.row.stage == '577006641364189019' ? '下发' : '研判'}}</el-button> --> | 122 | <!-- <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" :disabled="['577006621985604869', '577006641364189019', '577006696312866053'].includes(scope.row.stage) == -1">{{ scope.row.stage == '577006641364189019' ? '下发' : '研判'}}</el-button> --> |
| 123 | - <el-button type="text" v-if="isSHILevel && scope.row.stage != '577006666214540549'" @click="addOrUpdateHandle(scope.row.id)" :disabled="!['577006621985604869','577006641364189019','577006696312866053'].includes(scope.row.stage)">研判</el-button> | 123 | + <el-button type="text" v-if="isSHILevel && scope.row.stage != '577006666214540549'" @click="addOrUpdateHandle(scope.row.id)" :disabled="scope.row.isYP">研判</el-button> |
| 124 | <!-- 待处置进行处理 --> | 124 | <!-- 待处置进行处理 --> |
| 125 | <el-button type="text" v-if="!isSHILevel" @click="toHandle(scope.row.id)" :disabled="scope.row.stage != '577006131314196155'" >处理</el-button> | 125 | <el-button type="text" v-if="!isSHILevel" @click="toHandle(scope.row.id)" :disabled="scope.row.stage != '577006131314196155'" >处理</el-button> |
| 126 | <el-button type="text" @click="toDetail(scope.row.id)">详情</el-button> | 126 | <el-button type="text" @click="toDetail(scope.row.id)">详情</el-button> |
| @@ -150,6 +150,7 @@ import { | @@ -150,6 +150,7 @@ import { | ||
| 150 | } from "@/api/systemData/dataInterface"; | 150 | } from "@/api/systemData/dataInterface"; |
| 151 | import ReportForm from "@/views/baseInspectionReport/Form.vue"; // 巡查处置 | 151 | import ReportForm from "@/views/baseInspectionReport/Form.vue"; // 巡查处置 |
| 152 | import define from '@/utils/define' | 152 | import define from '@/utils/define' |
| 153 | +import { version } from "vue/types/umd"; | ||
| 153 | 154 | ||
| 154 | export default { | 155 | export default { |
| 155 | components: { NCCForm, HandleForm, ReportForm, ADDNCCForm }, | 156 | components: { NCCForm, HandleForm, ReportForm, ADDNCCForm }, |
| @@ -252,6 +253,7 @@ export default { | @@ -252,6 +253,7 @@ export default { | ||
| 252 | } | 253 | } |
| 253 | }, | 254 | }, |
| 254 | initData() { | 255 | initData() { |
| 256 | + this.list = []; | ||
| 255 | this.listLoading = true; | 257 | this.listLoading = true; |
| 256 | let _query = { | 258 | let _query = { |
| 257 | ...this.listQuery, | 259 | ...this.listQuery, |
| @@ -267,11 +269,14 @@ export default { | @@ -267,11 +269,14 @@ export default { | ||
| 267 | } | 269 | } |
| 268 | } | 270 | } |
| 269 | query.creatorTime && delete query.creatorTime; | 271 | query.creatorTime && delete query.creatorTime; |
| 270 | - | ||
| 271 | getListForJudge(query).then((res) => { | 272 | getListForJudge(query).then((res) => { |
| 273 | + res.data.list.forEach(v => { | ||
| 274 | + v.isYP = (v.stage != '577006621985604869' && v.stage != '577006641364189019' && v.stage != '577006696312866053') | ||
| 275 | + }); | ||
| 272 | this.list = res.data.list; | 276 | this.list = res.data.list; |
| 273 | this.total = res.data.pagination.total; | 277 | this.total = res.data.pagination.total; |
| 274 | this.listLoading = false; | 278 | this.listLoading = false; |
| 279 | + this.$forceUpdate() | ||
| 275 | }); | 280 | }); |
| 276 | }, | 281 | }, |
| 277 | 282 |
src/views/baseCaseHandling/index.vue
src/views/baseComapnyInfo/index.vue
| @@ -151,6 +151,7 @@ export default { | @@ -151,6 +151,7 @@ export default { | ||
| 151 | }, | 151 | }, |
| 152 | methods: { | 152 | methods: { |
| 153 | initData() { | 153 | initData() { |
| 154 | + this.list = []; | ||
| 154 | this.listLoading = true; | 155 | this.listLoading = true; |
| 155 | let _query = { | 156 | let _query = { |
| 156 | ...this.listQuery, | 157 | ...this.listQuery, |
src/views/baseListHazardousSamples/index.vue
| @@ -167,7 +167,7 @@ export default { | @@ -167,7 +167,7 @@ export default { | ||
| 167 | ], | 167 | ], |
| 168 | levelOptions: [ | 168 | levelOptions: [ |
| 169 | { fullName: "核查处置", id: "核查处置" }, | 169 | { fullName: "核查处置", id: "核查处置" }, |
| 170 | - { fullName: "网信执法", id: "网信执法" }, | 170 | + { fullName: "监管执法", id: "监管执法" }, |
| 171 | ], | 171 | ], |
| 172 | companyOptions: [], | 172 | companyOptions: [], |
| 173 | 173 | ||
| @@ -212,6 +212,7 @@ export default { | @@ -212,6 +212,7 @@ export default { | ||
| 212 | // }) | 212 | // }) |
| 213 | // }, | 213 | // }, |
| 214 | initData() { | 214 | initData() { |
| 215 | + this.list = []; | ||
| 215 | this.listLoading = true; | 216 | this.listLoading = true; |
| 216 | let _query = { | 217 | let _query = { |
| 217 | ...this.listQuery, | 218 | ...this.listQuery, |
| @@ -290,7 +291,7 @@ export default { | @@ -290,7 +291,7 @@ export default { | ||
| 290 | this.$refs.ReportForm.init(row.inspectionReportId, true); | 291 | this.$refs.ReportForm.init(row.inspectionReportId, true); |
| 291 | }); | 292 | }); |
| 292 | break; | 293 | break; |
| 293 | - case "网信执法": | 294 | + case "监管执法": |
| 294 | this.HandFormVisible = true; | 295 | this.HandFormVisible = true; |
| 295 | this.$nextTick(() => { | 296 | this.$nextTick(() => { |
| 296 | this.$refs.HandForm.init(row.caseHandlingId, true); | 297 | this.$refs.HandForm.init(row.caseHandlingId, true); |
src/views/basePrincipalResponsibility/index.vue
| @@ -125,6 +125,7 @@ export default { | @@ -125,6 +125,7 @@ export default { | ||
| 125 | this.fileTypeOptions = [...res.data.list, { fullName: '其他', id: '0' }]; | 125 | this.fileTypeOptions = [...res.data.list, { fullName: '其他', id: '0' }]; |
| 126 | }, | 126 | }, |
| 127 | initData() { | 127 | initData() { |
| 128 | + this.list = []; | ||
| 128 | this.listLoading = true; | 129 | this.listLoading = true; |
| 129 | let _query = { | 130 | let _query = { |
| 130 | ...this.listQuery, | 131 | ...this.listQuery, |
src/views/baseSpecialAction/index.vue
| @@ -139,6 +139,7 @@ export default { | @@ -139,6 +139,7 @@ export default { | ||
| 139 | this.communicationOutOptions = list; | 139 | this.communicationOutOptions = list; |
| 140 | }, | 140 | }, |
| 141 | initData() { | 141 | initData() { |
| 142 | + this.list = []; | ||
| 142 | this.listLoading = true; | 143 | this.listLoading = true; |
| 143 | let _query = { | 144 | let _query = { |
| 144 | ...this.listQuery, | 145 | ...this.listQuery, |
src/views/baseSpecialhandle/index.vue
| @@ -128,6 +128,7 @@ export default { | @@ -128,6 +128,7 @@ export default { | ||
| 128 | this.viewportHeight = window.innerHeight || document.documentElement.clientHeight; | 128 | this.viewportHeight = window.innerHeight || document.documentElement.clientHeight; |
| 129 | }, | 129 | }, |
| 130 | initData() { | 130 | initData() { |
| 131 | + this.list = []; | ||
| 131 | this.listLoading = true; | 132 | this.listLoading = true; |
| 132 | let _query = { | 133 | let _query = { |
| 133 | ...this.listQuery, | 134 | ...this.listQuery, |
src/views/baseSystemInfo/DetailForm.vue
| @@ -35,12 +35,7 @@ | @@ -35,12 +35,7 @@ | ||
| 35 | <p class="text">{{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }}</p> | 35 | <p class="text">{{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }}</p> |
| 36 | </div> | 36 | </div> |
| 37 | </el-col> | 37 | </el-col> |
| 38 | - <el-col :span="24" v-if="dataForm.systemType != '580634746028033285'"> | ||
| 39 | - <div class="form-item"> | ||
| 40 | - <div class="label w-120">备案号:</div> | ||
| 41 | - <p class="text">{{ dataForm.systemRecordNumber || "--" }}</p> | ||
| 42 | - </div> | ||
| 43 | - </el-col> | 38 | + |
| 44 | <template | 39 | <template |
| 45 | v-if=" | 40 | v-if=" |
| 46 | dataForm.systemType && | 41 | dataForm.systemType && |
| @@ -59,6 +54,12 @@ | @@ -59,6 +54,12 @@ | ||
| 59 | <p class="text">{{ dataForm.specialRecordContent || "--" }}</p> | 54 | <p class="text">{{ dataForm.specialRecordContent || "--" }}</p> |
| 60 | </div> | 55 | </div> |
| 61 | </el-col> | 56 | </el-col> |
| 57 | + <el-col :span="24" v-if="dataForm.systemType != '580634746028033285'"> | ||
| 58 | + <div class="form-item"> | ||
| 59 | + <div class="label w-120">备案号:</div> | ||
| 60 | + <p class="text">{{ dataForm.systemRecordNumber || "--" }}</p> | ||
| 61 | + </div> | ||
| 62 | + </el-col> | ||
| 62 | <el-col :span="24" v-if="dataForm.systemType == '576280043370579205'"> | 63 | <el-col :span="24" v-if="dataForm.systemType == '576280043370579205'"> |
| 63 | <div class="form-item"> | 64 | <div class="form-item"> |
| 64 | <div class="label w-120">域名:</div> | 65 | <div class="label w-120">域名:</div> |
| @@ -152,6 +153,12 @@ | @@ -152,6 +153,12 @@ | ||
| 152 | <p class="text">{{ dataForm.areaId | dynamicText(areaOptions) }}</p> | 153 | <p class="text">{{ dataForm.areaId | dynamicText(areaOptions) }}</p> |
| 153 | </div> | 154 | </div> |
| 154 | </el-col> | 155 | </el-col> |
| 156 | + <el-col :span="24"> | ||
| 157 | + <div class="form-item"> | ||
| 158 | + <div class="label w-120">备注:</div> | ||
| 159 | + <p class="text">{{ dataForm.remark || "--" }}</p> | ||
| 160 | + </div> | ||
| 161 | + </el-col> | ||
| 155 | <!-- <el-col :span="24"> | 162 | <!-- <el-col :span="24"> |
| 156 | <div class="form-item"> | 163 | <div class="form-item"> |
| 157 | <div class="label w-120">所属外协:</div> | 164 | <div class="label w-120">所属外协:</div> |
src/views/baseSystemInfo/HandleInspectForm.vue
| @@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
| 30 | placeholder="请选择所属区县" | 30 | placeholder="请选择所属区县" |
| 31 | style="line-height: 22px" | 31 | style="line-height: 22px" |
| 32 | > | 32 | > |
| 33 | - <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio> | 33 | + <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id" :disabled="!!dataForm.id">{{ v.fullName }}</el-radio> |
| 34 | </el-radio-group> | 34 | </el-radio-group> |
| 35 | </el-form-item> | 35 | </el-form-item> |
| 36 | <el-form-item label="内容描述" prop="applnycontent"> | 36 | <el-form-item label="内容描述" prop="applnycontent"> |
| @@ -39,9 +39,10 @@ | @@ -39,9 +39,10 @@ | ||
| 39 | v-model="dataForm.applnycontent" | 39 | v-model="dataForm.applnycontent" |
| 40 | placeholder="请输入内容描述" | 40 | placeholder="请输入内容描述" |
| 41 | maxlength="300" | 41 | maxlength="300" |
| 42 | + :disabled="!!dataForm.id" | ||
| 42 | ></el-input> | 43 | ></el-input> |
| 43 | </el-form-item> | 44 | </el-form-item> |
| 44 | - <el-form-item label="处理意见" prop="processingresults"> | 45 | + <el-form-item label="处理结果" prop="processingresults"> |
| 45 | <el-radio-group v-model="dataForm.processingresults"> | 46 | <el-radio-group v-model="dataForm.processingresults"> |
| 46 | <el-radio label="同意">同意</el-radio> | 47 | <el-radio label="同意">同意</el-radio> |
| 47 | <el-radio label="不同意">不同意</el-radio> | 48 | <el-radio label="不同意">不同意</el-radio> |
src/views/baseSystemInfo/index.vue
| @@ -144,6 +144,7 @@ import DetailForm from './DetailForm.vue'; | @@ -144,6 +144,7 @@ import DetailForm from './DetailForm.vue'; | ||
| 144 | import ChangeRecord from "./ChangeRecord.vue"; | 144 | import ChangeRecord from "./ChangeRecord.vue"; |
| 145 | import ExportBox from "./ExportBox.vue"; | 145 | import ExportBox from "./ExportBox.vue"; |
| 146 | import define from '@/utils/define' | 146 | import define from '@/utils/define' |
| 147 | +import { mapState } from 'vuex'; | ||
| 147 | 148 | ||
| 148 | export default { | 149 | export default { |
| 149 | name: "SystemInfo", | 150 | name: "SystemInfo", |
| @@ -157,7 +158,6 @@ export default { | @@ -157,7 +158,6 @@ export default { | ||
| 157 | IsLogin: true, | 158 | IsLogin: true, |
| 158 | }, | 159 | }, |
| 159 | query: { | 160 | query: { |
| 160 | - keyword: "", | ||
| 161 | systemType: "", | 161 | systemType: "", |
| 162 | systemClass: "", | 162 | systemClass: "", |
| 163 | principalName: "", | 163 | principalName: "", |
| @@ -234,15 +234,15 @@ export default { | @@ -234,15 +234,15 @@ export default { | ||
| 234 | return this.$store.state.user.laderType; | 234 | return this.$store.state.user.laderType; |
| 235 | } | 235 | } |
| 236 | }, | 236 | }, |
| 237 | - watch: { | ||
| 238 | - $route: { | ||
| 239 | - handler: function (route) { | ||
| 240 | - this.query.keyword = route.query.keyword || ""; | ||
| 241 | - this.initList(); | ||
| 242 | - }, | ||
| 243 | - immediate: true, | ||
| 244 | - }, | ||
| 245 | - }, | 237 | + // watch: { |
| 238 | + // $route: { | ||
| 239 | + // handler: function (route) { | ||
| 240 | + // this.query.keyword = this.$store.state.meta.searchKey; | ||
| 241 | + // this.initList(); | ||
| 242 | + // }, | ||
| 243 | + // immediate: true, | ||
| 244 | + // }, | ||
| 245 | + // }, | ||
| 246 | methods: { | 246 | methods: { |
| 247 | uploadSuccess(response, file, fileList) { | 247 | uploadSuccess(response, file, fileList) { |
| 248 | let type = response.code == 200 ? 'success' : 'error'; | 248 | let type = response.code == 200 ? 'success' : 'error'; |
| @@ -283,7 +283,9 @@ export default { | @@ -283,7 +283,9 @@ export default { | ||
| 283 | let query = { | 283 | let query = { |
| 284 | ...this.listQuery, | 284 | ...this.listQuery, |
| 285 | ...this.query, | 285 | ...this.query, |
| 286 | + keyword: this.$store.state.meta.searchKey | ||
| 286 | }; | 287 | }; |
| 288 | + console.log(query, 'query') | ||
| 287 | getList(query).then(({ data }) => { | 289 | getList(query).then(({ data }) => { |
| 288 | // let list = []; | 290 | // let list = []; |
| 289 | // data.list.length && | 291 | // data.list.length && |
src/views/homePage/HomePage.vue
| @@ -11,6 +11,7 @@ | @@ -11,6 +11,7 @@ | ||
| 11 | <el-input | 11 | <el-input |
| 12 | placeholder="请输入应用名称,运营主体名称进行查询" | 12 | placeholder="请输入应用名称,运营主体名称进行查询" |
| 13 | v-model="searchKeyword" | 13 | v-model="searchKeyword" |
| 14 | + @input="iptKayWord" | ||
| 14 | ></el-input> | 15 | ></el-input> |
| 15 | <el-button | 16 | <el-button |
| 16 | type="primary" | 17 | type="primary" |
| @@ -38,6 +39,7 @@ | @@ -38,6 +39,7 @@ | ||
| 38 | import Header from "./components/Header"; | 39 | import Header from "./components/Header"; |
| 39 | import News from "./components/news/index.vue"; | 40 | import News from "./components/news/index.vue"; |
| 40 | import Menu from "./components/Menu.vue"; | 41 | import Menu from "./components/Menu.vue"; |
| 42 | +import { mapState } from 'vuex'; | ||
| 41 | export default { | 43 | export default { |
| 42 | name: "HomePage", | 44 | name: "HomePage", |
| 43 | components: { | 45 | components: { |
| @@ -47,14 +49,12 @@ export default { | @@ -47,14 +49,12 @@ export default { | ||
| 47 | }, | 49 | }, |
| 48 | data() { | 50 | data() { |
| 49 | return { | 51 | return { |
| 50 | - searchKeyword: "", | 52 | + searchKeyword: '', |
| 51 | }; | 53 | }; |
| 52 | }, | 54 | }, |
| 53 | created() { | 55 | created() { |
| 54 | }, | 56 | }, |
| 55 | mounted() { | 57 | mounted() { |
| 56 | - console.log(this.$route.path, 'this.$router'); | ||
| 57 | - | ||
| 58 | }, | 58 | }, |
| 59 | watch: { | 59 | watch: { |
| 60 | // $route: { | 60 | // $route: { |
| @@ -64,17 +64,24 @@ export default { | @@ -64,17 +64,24 @@ export default { | ||
| 64 | // immediate: true, | 64 | // immediate: true, |
| 65 | // }, | 65 | // }, |
| 66 | }, | 66 | }, |
| 67 | - computed: {}, | 67 | + computed: { |
| 68 | + ...mapState({ | ||
| 69 | + searchKey: state => state.searchKey, | ||
| 70 | + }), | ||
| 71 | + }, | ||
| 68 | methods: { | 72 | methods: { |
| 73 | + iptKayWord(val) { | ||
| 74 | + this.$store.commit('SET_SEARCHKEY', val); | ||
| 75 | + }, | ||
| 69 | toSearchInfoList() { | 76 | toSearchInfoList() { |
| 70 | - // if(this.$route.path == '/baseSystemInfo/index.vue') { | ||
| 71 | - // this.$refs.info.search(); | ||
| 72 | - // } else { | 77 | + let keyword = this.$store.state.meta.searchKey; |
| 78 | + if(this.$route.path == '/baseSystemInfo/index.vue') { | ||
| 79 | + this.$refs.info.search(); | ||
| 80 | + } else { | ||
| 73 | this.$router.push({ | 81 | this.$router.push({ |
| 74 | path: "/baseSystemInfo/index.vue", | 82 | path: "/baseSystemInfo/index.vue", |
| 75 | - query: { keyword: this.searchKeyword }, | ||
| 76 | }); | 83 | }); |
| 77 | - // } | 84 | + } |
| 78 | }, | 85 | }, |
| 79 | }, | 86 | }, |
| 80 | }; | 87 | }; |