Skip to content

F
founder_vue
Commit 28d67405 by hd
Options

fix: 修改了一些bug

parent 6cff5416
Showing with 253 additions and 114 deletions
package-lock.json
......@@ -1829,6 +1829,37 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"debug": {
"version": "4.2.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz",
......@@ -1838,11 +1869,35 @@
"ms": "2.1.2"
}
},
"loader-utils": {
"version": "2.0.4",
"resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
"dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
}
}
},
......@@ -3609,8 +3664,8 @@
},
"clone-deep": {
"version": "4.0.1",
"resolved": "https://registry.npm.taobao.org/clone-deep/download/clone-deep-4.0.1.tgz",
"integrity": "sha1-wZ/Zvbv4WUK0/ZechNz31fB8I4c=",
"resolved": "https://registry.npmmirror.com/clone-deep/-/clone-deep-4.0.1.tgz",
"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
"dev": true,
"requires": {
"is-plain-object": "^2.0.4",
......@@ -6686,6 +6741,12 @@
"integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=",
"dev": true
},
"immutable": {
"version": "4.2.1",
"resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.2.1.tgz",
"integrity": "sha512-7WYV7Q5BTs0nlQm7tl92rDYYoyELLKHoDMBKhrxEoiV4mrfVdRz8hzPiYOzH7yWjzoVEamxRuAqhxL2PLRwZYQ==",
"dev": true
},
"import-cwd": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz",
......@@ -8971,8 +9032,7 @@
"version": "2.2.2",
"resolved": "https://registry.npm.taobao.org/picomatch/download/picomatch-2.2.2.tgz",
"integrity": "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0=",
"dev": true,
"optional": true
"dev": true
},
"pify": {
"version": "4.0.1",
......@@ -10464,6 +10524,118 @@
"integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
"dev": true
},
"sass": {
"version": "1.57.1",
"resolved": "https://registry.npmmirror.com/sass/-/sass-1.57.1.tgz",
"integrity": "sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==",
"dev": true,
"requires": {
"chokidar": ">=3.0.0 <4.0.0",
"immutable": "^4.0.0",
"source-map-js": ">=0.6.2 <2.0.0"
},
"dependencies": {
"anymatch": {
"version": "3.1.3",
"resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
"dev": true,
"requires": {
"normalize-path": "^3.0.0",
"picomatch": "^2.0.4"
}
},
"binary-extensions": {
"version": "2.2.0",
"resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
"dev": true
},
"braces": {
"version": "3.0.2",
"resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz",
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
"dev": true,
"requires": {
"fill-range": "^7.0.1"
}
},
"chokidar": {
"version": "3.5.3",
"resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",
"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
"dev": true,
"requires": {
"anymatch": "~3.1.2",
"braces": "~3.0.2",
"fsevents": "~2.3.2",
"glob-parent": "~5.1.2",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
"normalize-path": "~3.0.0",
"readdirp": "~3.6.0"
}
},
"fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz",
"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
"dev": true,
"requires": {
"to-regex-range": "^5.0.1"
}
},
"fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"dev": true,
"optional": true
},
"glob-parent": {
"version": "5.1.2",
"resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
"dev": true,
"requires": {
"is-glob": "^4.0.1"
}
},
"is-binary-path": {
"version": "2.1.0",
"resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
"dev": true,
"requires": {
"binary-extensions": "^2.0.0"
}
},
"is-number": {
"version": "7.0.0",
"resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
"dev": true
},
"readdirp": {
"version": "3.6.0",
"resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
"dev": true,
"requires": {
"picomatch": "^2.2.1"
}
},
"to-regex-range": {
"version": "5.0.1",
"resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
"dev": true,
"requires": {
"is-number": "^7.0.0"
}
}
}
},
"sass-graph": {
"version": "2.2.5",
"resolved": "https://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.5.tgz?cache=0&sync_timestamp=1588596752763&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass-graph%2Fdownload%2Fsass-graph-2.2.5.tgz",
......@@ -10477,22 +10649,22 @@
}
},
"sass-loader": {
"version": "8.0.2",
"resolved": "https://registry.npm.taobao.org/sass-loader/download/sass-loader-8.0.2.tgz?cache=0&sync_timestamp=1602249026065&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass-loader%2Fdownload%2Fsass-loader-8.0.2.tgz",
"integrity": "sha1-3r7NjDziQ8dkVPLoKQSCFQOACQ0=",
"version": "7.3.1",
"resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-7.3.1.tgz",
"integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
"dev": true,
"requires": {
"clone-deep": "^4.0.1",
"loader-utils": "^1.2.3",
"neo-async": "^2.6.1",
"schema-utils": "^2.6.1",
"loader-utils": "^1.0.1",
"neo-async": "^2.5.0",
"pify": "^4.0.1",
"semver": "^6.3.0"
},
"dependencies": {
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz",
"integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=",
"resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
}
}
......@@ -10759,8 +10931,8 @@
},
"shallow-clone": {
"version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/shallow-clone/download/shallow-clone-3.0.1.tgz",
"integrity": "sha1-jymBrZJTH1UDWwH7IwdppA4C76M=",
"resolved": "https://registry.npmmirror.com/shallow-clone/-/shallow-clone-3.0.1.tgz",
"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
"dev": true,
"requires": {
"kind-of": "^6.0.2"
......@@ -11025,6 +11197,12 @@
"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
"dev": true
},
"source-map-js": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
"dev": true
},
"source-map-resolve": {
"version": "0.5.3",
"resolved": "https://registry.npm.taobao.org/source-map-resolve/download/source-map-resolve-0.5.3.tgz",
......@@ -12377,63 +12555,6 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.1",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
"integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-quill-editor": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz",
......
package.json
......@@ -44,7 +44,8 @@
"jquery": "^3.5.1",
"node-sass": "^4.14.1",
"prettier": "^1.19.1",
"sass-loader": "^8.0.2",
"sass": "^1.57.1",
"sass-loader": "^7.3.1",
"video.js": "^7.10.2",
"vue-cli-plugin-axios": "^0.0.4",
"vue-cli-plugin-element": "^1.0.1",
......
src/views/caseInforCollet/individualCases.vue
......@@ -873,7 +873,7 @@ export default {
name: "地位作用:",
id: "zhfzxyrGtfzfzxyrsadwzydm",
// prop: "tbrxm",
// prop: "checkEmpty",
prop: "checkEmpty",
type: "codeTree",
value: "",
placeholder: "请选择地位作用",
......@@ -885,7 +885,7 @@ export default {
name: "身份:",
id: "zhfzxyrAsjxgrysfAsjxgrysfdm",
// prop: "tbrxm",
// prop: "checkEmpty",
prop: "checkEmpty",
type: "codeTree",
value: "",
placeholder: "请选择身份",
......@@ -1086,7 +1086,7 @@ export default {
name: "职业:",
id: "zhfzxyrZyZylbdm",
// prop: "tbrxm",
// prop: "checkEmpty",
prop: "checkEmpty",
type: "codeTree",
value: "",
placeholder: "请选择职业",
......
src/views/index/shouye.vue
......@@ -190,6 +190,7 @@
</div>
<el-pagination
class="msgPag"
:current-page="currentPage1"
:layout="!total ? null : 'prev, pager, next'"
:page-size="page_size"
:total="!total ? null : total"
......@@ -1074,11 +1075,7 @@
<div class="shuju_Bt">
<div
v-loading="loadingSjhyly"
style="
display: inline-block;
position: relative;
width: calc(100% / 2 - 32px);
"
style="display: inline-block;position: relative;width: calc(100% / 2 - 32px)"
>
<el-button
v-if="isson1"
......@@ -4677,6 +4674,7 @@ export default {
getPagMsgList(curPage, type) {
debugger;
let self = this
self.currentPage1 = curPage
if (type != 3) {
this.msgLoading[type] = true;
const all = this.isAll ? null : 0;
......
src/views/xsDetail/detailsForm.vue
......@@ -110,7 +110,7 @@
colspan="1"
style="text-align: right; padding-right: 1px"
>
2021
{{ssyhxx.fcsj?ssyhxx.fcsj.substr(0,4):''}}
</td>
<td class="nofillcontent" colspan="1">年</td>
<td
......@@ -118,7 +118,7 @@
colspan="1"
style="text-align: right; padding-right: 1px"
>
08
{{ssyhxx.fcsj?ssyhxx.fcsj.substr(5,2):''}}
</td>
<td class="nofillcontent" colspan="1">月</td>
<td
......@@ -126,7 +126,7 @@
colspan="1"
style="text-align: right; padding-right: 1px"
>
03
{{ssyhxx.fcsj?ssyhxx.fcsj.substr(8,2):''}}
</td>
<td class="nofillcontent" colspan="1">日</td>
<td class="nofillcontent" colspan="10"></td>
......@@ -227,19 +227,19 @@
</tr>
<tr>
<td colspan="2" class="nofillcontent">
{{ ssyhxx.zfdwStr }}
{{ ssyhxx.jsdqStr }}
</td>
<td colspan="2" class="nofillcontent">省（区、市）</td>
<td colspan="2" class="nofillcontent">
{{ ssyhxx.zfdwStr }}
{{ ssyhxx.jsdqStr }}
</td>
<td colspan="2" class="nofillcontent">市（地、州、盟）</td>
<td colspan="2" class="nofillcontent">
{{ ssyhxx.zfdwStr }}
{{ ssyhxx.jsdqStr }}
</td>
<td colspan="2" class="nofillcontent">县（市、区、旗）</td>
<td colspan="2" class="nofillcontent">
{{ ssyhxx.zfdwStr }}
{{ ssyhxx.jsdqStr }}
</td>
<td colspan="2" class="nofillcontent">( 单位名称 )</td>
</tr>
......@@ -263,7 +263,7 @@
colspan="1"
style="text-align: right; padding-right: 1px"
>
2021
{{ssyhxx.jssj?ssyhxx.jssj.substr(0,4):''}}
</td>
<td class="nofillcontent" colspan="1">年</td>
<td
......@@ -271,7 +271,7 @@
colspan="1"
style="text-align: right; padding-right: 1px"
>
08
{{ssyhxx.jssj?ssyhxx.jssj.substr(5,2):''}}
</td>
<td class="nofillcontent" colspan="1">月</td>
<td
......@@ -279,7 +279,7 @@
colspan="1"
style="text-align: right; padding-right: 1px"
>
03
{{ssyhxx.jssj?ssyhxx.jssj.substr(8,2):''}}
</td>
<td class="nofillcontent" colspan="1">日</td>
<td class="nofillcontent" colspan="10"></td>
......@@ -444,11 +444,7 @@
<el-button
type="primary"
@click="exportExcel"
style="
margin-left: 100px;
background-color: #fe9200;
border: 1px solid #fe9200;
"
style="margin-left: 100px;background-color: #fe9200;border: 1px solid #fe9200;"
>
<i class="iconfont icondaochu"></i><span>导出</span>
</el-button>
......
src/views/xsDetail/fjsc.vue
......@@ -1014,11 +1014,12 @@
<el-date-picker
v-model="reakData[item4.id]"
v-else-if="item4.type == 'date'"
:placeholder="item4.placeholder"
:placeholder="item4.placeholder+'1'"
format="yyyy 年 MM 月 dd 日"
value-format="timestamp"
value-format="yyyy-MM-dd"
clearable
>
<!-- value-format="timestamp" -->
</el-date-picker>
<!--日期框-->
<div v-else-if="item4.type == 'date1'">
......
src/views/xsDetail/xsDetail.vue
......@@ -1761,7 +1761,7 @@ export default {
}
else if (type == 'xyr' || type == 'bjbr') {
this.xsList[0].xsss[0].page.currentPage = val
this.getXyrDetail()
this.getXyrDetail(this.xsList, this.shsexsbh)
} else if (type == 'jbr' || type == 'tbr' || type == 'tgr') {
this.xsList[0].xsss[1].page.currentPage = val
this.getJbrDetail()
......@@ -1867,6 +1867,7 @@ export default {
},
//嫌疑人信息
getXyrDetail (list, shsexsbh, miy) {
debugger
list[0].xsss[0].shuju = []
list[0].xsss[5].shuju = []
var self = this
......
src/views/xsSearch/queryPages/queryCommonPage.vue
......@@ -394,6 +394,7 @@ export default {
},
/*左侧菜单有子集的点击事件*/
getFields(id, key, index, isDisable, auth, name) {
console.log(id, key, index, isDisable, auth, name)
debugger
window.sessionStorage.setItem('currentId', id)
window.sessionStorage.setItem('currentName', name)
......@@ -663,8 +664,9 @@ export default {
this.selectedPropdefaultCheckedThead = this.propdefaultCheckedThead[id]
this.$set(this.selectedPropAllformThead[0], 'zdy', 1)
//默认表头数据
debugger
// debugger
this.selectQueryPath = this.CommonConfig['queryRouterPath'][index] //接口参数配置
console.log(this.selectQueryPath)
//找不到这组件的该变量在哪改，所以直接这里打个补丁
if (this.selectQueryPath == '' || this.selectQueryPath == null) {
this.selectQueryPath = 'thgl/getThjbxxList';
......@@ -744,7 +746,7 @@ export default {
//初始化给个本单位数据
created() {
debugger
// debugger
var self = this
let routerIndex = self.$route.name
self.currentId = window.sessionStorage.getItem('currentId')
......
src/views/xsSearch/queryPages/queryrightcommon.vue
......@@ -1154,6 +1154,7 @@
type="primary"
:class="propDisabled ? 'btn1' : 'btn'"
>
<!-- propDisabled -->
<i
class="iconfont icontianjia"
aria-hidden="true"
......@@ -2382,7 +2383,7 @@
<!--分页-->
<el-pagination
@current-change="handleCurrentChange"
:current-page.sync="currentPage1"
:current-page="currentPage1"
@size-change="handleSizeChange"
:page-sizes="page_sizes"
:page-size="page_size"
......@@ -2646,7 +2647,7 @@
<el-pagination
@current-change="handleCurrentChange2"
layout="total, prev, pager, next"
:current-page.sync="currentPage2"
:current-page="currentPage2"
:page-size="2"
:total="
tableData2 && tableData2.count ? parseInt(tableData2.count) : 0
......@@ -2697,7 +2698,7 @@
<el-pagination
@current-change="handleCurrentChange1"
layout="total, prev, pager, next"
:current-page.sync="currentPage"
:current-page="currentPage"
@size-change="handleSizeChange1"
:page-size="row"
:total="
......@@ -3317,6 +3318,7 @@ export default {
selectOption: "",
startnum: 0, //开始
endnum: 9, //结束
currentPage0: 1,
currentPage1: 1,
page_size: 10,
page_sizes: [10, 15, 20, 30, 40],
......@@ -4658,7 +4660,7 @@ export default {
this.pxmc = "xs.djsj";
}
}
this.formData.page = this.currentPage1;
this.formData.page = this.currentPage0;
this.formData.rows = this.page_size;
post(`${base.alyIP}/${this.selectQueryPath}`, this.formData)
.then((res) => {
......@@ -4957,7 +4959,7 @@ export default {
this.formData.sfbxqPdbz = this.radioHj;
this.formData.sfdm = this.radioSf;
this.formData.nld = this.radioNl;
this.formData.page = this.currentPage1;
this.formData.page = this.currentPage0;
this.formData.rows = this.page_size;
if (this.radioAj == "qt") {
this.formData.ajlb = this.radioAj;
......@@ -6003,6 +6005,9 @@ export default {
//人员标签透视分页
handleCurrentChange2(sizeval) {
this.currentPage2 = sizeval;
this.currentPage0 = sizeval
this.currentPage = 1;
this.currentPage1 = 1;
if (this.shujuly == "sfpj") {
this.sentence(this.scopeParams);
} else if (this.shujuly == "sffx") {
......@@ -6497,6 +6502,8 @@ export default {
},
//调转详情页面
goDetail(primarykey) {
console.log(primarykey)
// jbxxzjbh=150412345678202212300000000009&name&navIndex=1
debugger;
window.sessionStorage.setItem("shsexsbh", primarykey.shsexsbh);
window.sessionStorage.setItem("xxzjbh", primarykey.zlbh);
......@@ -6583,7 +6590,7 @@ export default {
this.$router.pushToTab({
path: "/ajDetail",
query: {
jbxxzjbh: primarykey.jbxxzjbh,
jbxxzjbh: primarykey?.xxzjbh || primarykey?.jbxxzjbh,
name: primarykey.dqjdspbz,
navIndex: this.navIndex,
},
......@@ -6815,7 +6822,7 @@ export default {
this.formData.sfbxqPdbz = this.radioHj;
this.formData.sfdm = this.radioSf;
this.formData.nld = this.radioNl;
this.formData.page = "1";
this.formData.page = 1;
this.formData.rows = this.page_size;
if (
this.selectQueryPath == "dbxs/qryDbxsList?qryType=sjxf" &&
......@@ -6854,6 +6861,7 @@ export default {
if (this.formData.rybq == "") {
delete this.formData["rybq"];
}
console.log(this.selectQueryPath)
post(`${base.alyIP}/${this.selectQueryPath}`, this.formData)
.then((res) => {
debugger;
......@@ -6897,7 +6905,7 @@ export default {
}
});
self.tableData = {
count: res.data.total || 0,
count: res.data.total || 0, //res.data.total
data: res.data.rows,
};
if (this.selectQueryPath == "jlaj/getJlajList") {
......@@ -7119,7 +7127,7 @@ export default {
this.formData.sfbxqPdbz = this.radioHj;
this.formData.sfdm = this.radioSf;
this.formData.nld = this.radioNl;
this.formData.page = this.currentPage1;
this.formData.page = this.currentPage0;
this.formData.rows = this.page_size;
this.formData.zxdx = this.zxdx;
this.formData.pxmc = this.pxmc;
......@@ -7134,6 +7142,7 @@ export default {
if (this.formData.rybq == "") {
delete this.formData["rybq"];
}
console.log(this.selectQueryPath)
post(`${base.alyIP}/${this.selectQueryPath}`, this.formData)
.then((res) => {
debugger;
......@@ -7177,7 +7186,7 @@ export default {
}
});
self.tableData = {
count: res.data.total || 0,
count: res.data.total || 0, //res.data.total
data: res.data.rows,
};
if (this.selectQueryPath == "jlaj/getJlajList") {
......@@ -7407,8 +7416,12 @@ export default {
this.selectedXs = selection;
},
handleCurrentChange(val) {
debugger
//此方法调用接口获取当前页数据
this.currentPage1 = val;
this.currentPage0 = val
this.currentPage = 1;
this.currentPage2 = 1;
this.doQuery();
// this.startnum = (val - 1) * this.page_size; //开始
// this.endnum = val * this.page_size - 1; //结束 0-9 10-19
......@@ -8012,6 +8025,9 @@ export default {
},
handleCurrentChange1(val) {
this.currentPage = val;
this.currentPage0 = val;
this.currentPage1 = 1;
this.currentPage2 = 1;
if (this.currentTable == 0) {
this.queryAjList(
this.dwdmcopy,
......@@ -8223,6 +8239,9 @@ export default {
},
selectQueryPath: {
handler(newName, oldName) {
this.currentPage0 = 1
this.currentPage1 = 1
this.currentPage2 = 1
this.loading = true;
if (newName == "dbxs/qryDbxsList?qryType=sjxf") {
this.xzButton = false;
......
vue.config.js
......@@ -63,8 +63,8 @@ module.exports = {
// http://39.98.114.80:8081/tldxyr/getXyrList
"/api": {
// target: "http://192.168.0.107:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
//target: "http://192.168.1.116:8080/",
target: "http://localhost:8081/",
target: "http://192.168.2.104:8080/",
// target: "http://39.99.155.173:8878",
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -72,9 +72,9 @@ module.exports = {
}
},
"/ap": {
// target: "http://192.168.1.117:8080/",
target: "http://192.168.2.104:8080/",
//target: "http://26.13.5.68:8001/", //内蒙
target: "http://localhost:8081/",
// target: "http://39.99.155.173:8878",
ws: true,
changeOrigin: true,
pathRewrite: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment