Skip to content

F
founder_vue
Commit 28d67405 by hd
Options

fix: 修改了一些bug

parent 6cff5416
Showing with 62 additions and 44 deletions
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
......@@ -1150,10 +1150,11 @@
selectQueryPath != 'dbxs/qryDbxsList?qryType=tbzj' &&
selectQueryPath != 'tldjbxx/getTldxxList?lrmkdm=1&qryType=list'
"
:disabled="propDisabled"
:disabled="propDisabled"
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