Skip to content

F
founder_vue
Commit 8cae6db4 by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

parents 393d62cc 29645260
Showing with 255 additions and 258 deletions
src/router/modules/leftMenu.js
......@@ -245,8 +245,8 @@ export default [
path: '/tjbb',
name: 'tjbb',
hidden: false,
icon_d: '/img/cxyrd_d.png',
icon_a: '/img/cxyrd_a.png',
icon_d: '/img/baobiao_d.png',
icon_a: '/img/baobiao_a.png',
meta: {
title: '统计报表',
auth: 'H'
......
src/views/AllPersonnelBase/dclb.vue
......@@ -939,6 +939,11 @@ export default {
cursor: pointer;
}
}
/deep/.el-button:first-child{
span{
color: #055fe7;
}
}
}
}
.buttons {
......
src/views/AllPersonnelBase/gzlb.vue
......@@ -1421,6 +1421,11 @@ export default {
background: #044cb9 !important;
}
}
/deep/.el-button:first-child{
span{
color: #055fe7;
}
}
}
}
.buttons {
......
src/views/AllPersonnelBase/modules/fztm.vue
......@@ -178,13 +178,22 @@ export default {
<style lang="scss" scoped>
.inputBh {
/deep/.el-input-group__prepend {
width: 40px;
text-align: center;
padding: 0;
}
/deep/.el-input__inner {
width: 224px;
}
display: flex;
justify-content: center;
align-items: center;
width: 18px !important;
height: 18px !important;
background: #ECEDF1;
border-radius: 3px;
position: absolute;
margin:11px 8px;
padding:0
}
/deep/.el-input__inner {
// width: 224px;
padding-left: 30px;
}
}
/deep/.el-dialog {
border-radius: 6px;
......
src/views/AllPersonnelBase/modules/ggrytm.vue
<template>
<el-dialog
:title="title"
:visible.sync="dialogVisible"
width="26.125rem"
append-to-body
:before-close="handleClose"
:close-on-click-modal='false'
:modal='false'
>
<el-form
:label-position="labelPosition"
label-width="7.5rem"
:model="reqParam"
:rules="rules"
ref="reqParam"
hide-required-asterisk
>
<el-form-item
label="源条码号："
v-if="this.type == 'ry'"
>
<el-input
v-model="rowData.ysxtAsjxgrybh"
:disabled="true"
></el-input>
<el-dialog :title="title" :visible.sync="dialogVisible" width="26.125rem" append-to-body :before-close="handleClose"
:close-on-click-modal='false' :modal='false'>
<el-form :label-position="labelPosition" label-width="7.5rem" :model="reqParam" :rules="rules" ref="reqParam"
hide-required-asterisk>
<el-form-item label="源条码号：" v-if="this.type == 'ry'">
<el-input v-model="rowData.ysxtAsjxgrybh" :disabled="true"></el-input>
</el-form-item>
<el-form-item
label="源条码号："
v-if="this.type == 'aj'"
>
<el-input
v-model="rowData.ysxtAsjbh"
:disabled="true"
></el-input>
<el-form-item label="源条码号：" v-if="this.type == 'aj'">
<el-input v-model="rowData.ysxtAsjbh" :disabled="true"></el-input>
</el-form-item>
<div style="height:16px"></div>
<el-form-item
label="修改条码号："
prop='barcode'
>
<el-input
class="inputBh"
v-model.trim="reqParam.barcode"
placeholder="请修改条码号"
maxlength='22'
show-word-limit
><template slot="prepend">{{this.type=='ry'?'R':'A'}}</template></el-input>
<el-form-item label="修改条码号：" prop='barcode'>
<el-input class="inputBh" v-model.trim="reqParam.barcode" placeholder="请修改条码号" maxlength='22' show-word-limit>
<template slot="prepend">{{this.type=='ry'?'R':'A'}}</template></el-input>
</el-form-item>
</el-form>
<div class='tip1'>提示：</div>
<div class='tip2'>新条码号必须由数字组成；</div>
<div
class='tip3'
v-if="type== 'ry'"
>组成方式：人员数据（R）+单位代码（12位）+年月（6位）+流水号（4位），条码号长度为23位。</div>
<div
class='tip3'
v-else
>组成方式：案件数据（A）+单位代码（12位）+年月（6位）+流水号（4位），条码号长度为23位。</div>
<span
slot="footer"
class="dialog-footer"
>
<el-button
class="confirmBtn"
@click="updata('reqParam')"
>确 定</el-button>
<el-button
class="cancelBtn"
@click="resetForm('reqParam')"
type="primary"
>取 消</el-button>
<div class='tip3' v-if="type== 'ry'">组成方式：人员数据（R）+单位代码（12位）+年月（6位）+流水号（4位），条码号长度为23位。</div>
<div class='tip3' v-else>组成方式：案件数据（A）+单位代码（12位）+年月（6位）+流水号（4位），条码号长度为23位。</div>
<span slot="footer" class="dialog-footer">
<el-button class="confirmBtn" @click="updata('reqParam')">确 定</el-button>
<el-button class="cancelBtn" @click="resetForm('reqParam')" type="primary">取 消</el-button>
</span>
</el-dialog>
</template>
<script>
export default {
name: "ggrytm",
props: {
isShowGgrytm: {
type: [Number, String, Boolean],
default: false
export default {
name: "ggrytm",
props: {
isShowGgrytm: {
type: [Number, String, Boolean],
default: false
},
rowData: {
default: false
},
type: {
default: false
}
},
rowData: {
default: false
data() {
return {
title: "",
labelPosition: 'left', // 标签对齐方式
dialogVisible: false, // 弹窗状态
reqParam: { // 请求参数
barcode: '',
id: '',
},
rules: {
barcode: [
{ required: true, message: '请输入', trigger: 'blur' },
{ min: 19, max: 23, message: '根据部门要求必须19位或23位', trigger: 'blur' }
]
}
};
},
type: {
default: false
}
},
data () {
return {
title: "",
labelPosition: 'left', // 标签对齐方式
dialogVisible: false, // 弹窗状态
reqParam: { // 请求参数
barcode: '',
id: '',
mounted() {
this.dialogVisible = this.isShowGgrytm;
// //console.log('更改条码类型', this.type)
this.type == 'ry' ? this.title = '更改人员条码' : this.title = '更改案件条码'
},
watch: {
isShowGgrytm(newVal, oldVal) {
this.dialogVisible = newVal;
},
rules: {
barcode: [
{ required: true, message: '请输入', trigger: 'blur' },
{ min: 19, max: 23, message: '根据部门要求必须19位或23位', trigger: 'blur' }
]
dialogVisible(val) {
//console.log(this.dialogVisible, 123)
this.$emit('closeGgrytm', this.dialogVisible);
}
};
},
mounted () {
this.dialogVisible = this.isShowGgrytm;
// //console.log('更改条码类型', this.type)
this.type == 'ry' ? this.title = '更改人员条码' : this.title = '更改案件条码'
},
watch: {
isShowGgrytm (newVal, oldVal) {
this.dialogVisible = newVal;
},
dialogVisible (val) {
//console.log(this.dialogVisible, 123)
this.$emit('closeGgrytm', this.dialogVisible);
}
},
methods: {
updata (formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
// alert('submit!');
let reqUrl = '';
let newReqParams = {};
if (this.type == 'ry') {
reqUrl = '/api/personstore/updateBarcode'
newReqParams.id = this.rowData.id
newReqParams.barcode = 'R' + this.reqParam.barcode
} else if (this.type == 'aj') {
reqUrl = '/api/casestore/updateBarcode'
newReqParams.id = this.rowData.id
newReqParams.barcode = 'A' + this.reqParam.barcode
methods: {
updata(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
// alert('submit!');
let reqUrl = '';
let newReqParams = {};
if (this.type == 'ry') {
reqUrl = '/api/personstore/updateBarcode'
newReqParams.id = this.rowData.id
newReqParams.barcode = 'R' + this.reqParam.barcode
} else if (this.type == 'aj') {
reqUrl = '/api/casestore/updateBarcode'
newReqParams.id = this.rowData.id
newReqParams.barcode = 'A' + this.reqParam.barcode
}
// 确认提示
this.$axios
.post(reqUrl + '?' + 'id' + '=' + newReqParams.id + '&' + 'barcode' + '=' + newReqParams.barcode)
.then(response => {
if (response.data.code === 0) {
this.$message.success("更改成功");
this.reqParam.barcode = '';
this.dialogVisible = false;
} else {
this.$message.error("更改失败");
}
});
} else {
//console.log('error submit!!');
return false;
}
// 确认提示
this.$axios
.post(reqUrl + '?' + 'id' + '=' + newReqParams.id + '&' + 'barcode' + '=' + newReqParams.barcode)
.then(response => {
if (response.data.code === 0) {
this.$message.success("更改成功");
this.reqParam.barcode = '';
this.dialogVisible = false;
} else {
this.$message.error("更改失败");
}
});
} else {
//console.log('error submit!!');
return false;
}
});
});
},
handleClose () {
this.resetForm('reqParam');
this.dialogVisible = false;
},
resetForm (formName) {
this.$refs[formName].resetFields();
this.dialogVisible = false;
},
handleClose() {
this.resetForm('reqParam');
this.dialogVisible = false;
},
resetForm(formName) {
this.$refs[formName].resetFields();
this.dialogVisible = false;
}
}
}
};
};
</script>
<style lang="scss" scoped>
.inputBh {
/deep/.el-input-group__prepend {
width: 40px;
.inputBh {
/deep/.el-input-group__prepend {
display: flex;
justify-content: center;
align-items: center;
width: 18px !important;
height: 18px !important;
background: #ECEDF1;
border-radius: 3px;
position: absolute;
margin:11px 8px;
padding:0
}
/deep/.el-input__inner {
// width: 224px;
padding-left: 30px;
}
}
/deep/.el-dialog {
border-radius: 6px;
}
/deep/.el-dialog {
border-radius: 6px;
font-family: HarmonyOS_Sans_SC;
}
/deep/.el-dialog__header {
border-bottom: 1px solid #eee;
padding: 15px 20px 8px;
}
/deep/.el-dialog__title {
font-size: 16px;
}
/deep/.el-dialog__footer {
text-align: center;
}
/deep/.el-input__prefix,
/deep/.el-input__suffix {
top: 30px;
right: -4px;
}
/deep/.el-form-item__label {
padding: 0;
}
/deep/.el-input__inner {
width: 224px;
.tip1 {
margin-top: 26px;
height: 22px;
line-height: 22px;
font-size: 14px;
color: #666666;
margin-bottom: 15px;
}
.tip2 {
height: 20px;
font-size: 12px;
color: #666666;
line-height: 20px;
margin-bottom: 6px;
}
.tip3 {
height: 20px;
font-size: 12px;
color: #666666;
line-height: 20px;
margin-bottom: 10px;
}
/deep/.el-button--primary {
border-color: #055fe7;
background: #055fe7;
}
/deep/.el-button+.el-button {
margin-left: 24px;
}
.confirmBtn,
.cancelBtn {
width: 72px;
height: 40px;
}
.confirmBtn {
background-color: #fff;
color: #333333;
}
}
/deep/.el-dialog {
border-radius: 6px;
}
/deep/.el-dialog {
border-radius: 6px;
font-family: HarmonyOS_Sans_SC;
}
/deep/.el-dialog__header {
border-bottom: 1px solid #eee;
padding: 15px 20px 8px;
}
/deep/.el-dialog__title {
font-size: 16px;
}
/deep/.el-dialog__footer {
text-align: center;
}
/deep/.el-input__prefix,
/deep/.el-input__suffix {
top: 30px;
right: -4px;
}
/deep/.el-form-item__label {
padding: 0;
}
.tip1 {
margin-top: 26px;
height: 22px;
line-height: 22px;
font-size: 14px;
color: #666666;
margin-bottom: 15px;
}
.tip2 {
height: 20px;
font-size: 12px;
color: #666666;
line-height: 20px;
margin-bottom: 6px;
}
.tip3 {
height: 20px;
font-size: 12px;
color: #666666;
line-height: 20px;
margin-bottom: 10px;
}
/deep/.el-button--primary {
border-color: #055fe7;
background: #055fe7;
}
/deep/.el-button + .el-button {
margin-left: 24px;
}
.confirmBtn,
.cancelBtn {
width: 72px;
height: 40px;
}
.confirmBtn {
background-color: #fff;
color: #333333;
}
</style>
\ No newline at end of file
src/views/Home.vue
......@@ -904,9 +904,11 @@ export default {
background: #001e33;
width: 100%;
height: 64px;
display: flex;
/* display: flex;
align-items: center;
justify-content: center;
justify-content: center; */
padding-left: 18px;
line-height: 64px;
}
.aside .logo .jh {
......
src/views/SystemManage/QueryPermission.vue
......@@ -47,13 +47,13 @@
<div class="labelBack blue"></div>
<numberInput
v-bind:text="numTotalSt"
v-bind:preText="numTotalStUsed.toString() + '/'"
v-bind:preText="numTotalStUsed.toString() +' /'"
v-on:change="changeStTotalNum"
></numberInput>
<div class="awayLeft">其中高优先级：</div>
<numberInput
v-bind:text="numGaoSt"
v-bind:preText="numGaoStUsed.toString() + '/'"
v-bind:preText="numGaoStUsed.toString() + ' /'"
v-on:change="changeStGaoNum"
></numberInput>
</div>
......@@ -103,13 +103,13 @@
<div class="labelBack pink"></div>
<numberInput
v-bind:text="numTotalDs"
v-bind:preText="numTotalDsUsed.toString() + '/'"
v-bind:preText="numTotalDsUsed.toString() + ' /'"
v-on:change="changeDsTotalNum"
></numberInput>
<div class="awayLeft">其中高优先级：</div>
<numberInput
v-bind:text="numGaoDs"
v-bind:preText="numGaoDsUsed.toString() + '/'"
v-bind:preText="numGaoDsUsed.toString() + ' /'"
v-on:change="changeDsGaoNum"
></numberInput>
</div>
......@@ -682,7 +682,7 @@ export default {
.maps {
& .map {
width: 55rem;
height: 46rem;
height: 50rem;
background: #ffffff;
border-radius: 8px;
border: 1px solid #d1d1d1;
......@@ -856,5 +856,8 @@ export default {
background: #044cb9 !important;
}
}
/deep/.el-input-number.is-controls-right .el-input__inner{
padding-left: 30px;
}
// @import "@/assets/css/globalBase.scss";
</style>
src/views/cxyrd/modules/Recognition_dialog.vue
......@@ -21,7 +21,7 @@
<el-input
type="text"
placeholder="请输入内容"
v-model="ruleForm.originCode"
v-model.trim="ruleForm.originCode"
maxlength="23"
show-word-limit
>
......@@ -39,7 +39,7 @@
<el-input
type="text"
placeholder="请输入内容"
v-model="ruleForm.targetCode"
v-model.trim="ruleForm.targetCode"
maxlength="23"
show-word-limit
>
......
src/views/drFPTX/Index.vue
......@@ -1419,7 +1419,7 @@ export default {
width: 86px;
height: 32px;
line-height: 32px;
background: #f6f8fa;
background: #F6F8FA;
border-radius: 2px;
text-align: center;
font-size: 14px;
......@@ -1432,12 +1432,12 @@ export default {
}
/deep/ .el-radio__input.is-checked + .el-radio__label {
color: #055fe7;
color: #ffffff;
}
}
/deep/ .drlx .is-checked {
background: #ddebff;
background: #055FE7;
}
.drlx /deep/ .el-radio__input {
......
src/views/drFPTX/RAList.vue
......@@ -1698,7 +1698,7 @@ export default {
// height: 500px;
}
/deep/.el-radio__input.is-checked .el-radio__inner {
border-color: #055fe7;
/* border-color: #055fe7; */
background: #055fe7;
cursor: pointer;
}
......@@ -1866,14 +1866,14 @@ export default {
}
/deep/ .el-radio__input.is-checked + .el-radio__label {
color: #055fe7;
color: #ffffff;
}
/deep/ .el-radio__input {
display: none;
}
}
/deep/ .is-checked {
background-color: #ddebff;
background-color: #055FE7;
}
}
}
......
src/views/zzwcj/fingerprint.vue
......@@ -1492,8 +1492,8 @@ export default {
}
}
// self.rGdzw = [1,1,1,1,1,1,1,1,1,1]
// self.rPmzw = [0,0,0,0,0,0,0,0,0,0]
self.rGdzw = [1,1,1,1,1,1,1,1,1,1]
self.rPmzw = [0,0,0,0,0,0,0,0,0,0]
// //console.log(self.rGdzw);
// //console.log(self.rPmzw);
// 测试全部采集用***************************
......@@ -8813,12 +8813,12 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--settingIsCheckedDisable', '#6e6e6e');
document.getElementsByTagName('body')[0].style.setProperty('--settingAfter', '#1b1b1b');
document.getElementsByTagName('body')[0].style.setProperty('--settingTitleChange', '#9F9F9F');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtn', '#9F9F9F');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnBg', '#3f3f3f');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnBorder', '#909090');
document.getElementsByTagName('body')[0].style.setProperty('--dialogSpan', '#9f9f9f');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnHover', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnHoverSpan', '#dddddd');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtn', '#282F3C');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnBg', '#ffffff');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnBorder', '#AEB5C2');
document.getElementsByTagName('body')[0].style.setProperty('--dialogSpan', '#282F3C');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnHover', '#0060F0');
document.getElementsByTagName('body')[0].style.setProperty('--dialogBtnHoverSpan', '#0060F0');
document.getElementsByTagName('body')[0].style.setProperty('--versionColor', '#000');//设备型号
this.isShowColor = false
},
......
src/views/zzwlr/xzry.scss
......@@ -105,6 +105,10 @@
width: 40px;
text-align: center;
padding: 0;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
line-height: 19px;
}
/deep/.el-input__inner {
......@@ -213,7 +217,7 @@
background: #F6F8FA;
box-shadow: inset 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
border-radius: 4px;
border: 1px solid #EEEEEE;
// border: 1px solid #EEEEEE;
}
......@@ -258,10 +262,6 @@
.el-form-item {
width: 1300px;
// background: #F6F8FA;
// box-shadow: inset 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
// border-radius: 4px;
// border: 1px solid #EEEEEE;
}
/deep/.el-form-item__label {
......
vue.config.js
......@@ -113,12 +113,12 @@ module.exports = {
// target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.104:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.114:8099", // 湖南-张呈光
target: "http://192.168.128.117:8099", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
target: "http://zwpt.xzclub.top:9333/",
// target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.119:8099", // 江
ws: true,
changeOrigin: true,
......@@ -129,9 +129,9 @@ module.exports = {
"/security": {
// target: "http://192.168.128.106:8765", // 湖南-王
// target: "http://192.168.128.117:8765/", // 张 认定
target: "http://192.168.128.117:8765/", // 张 认定
// target: "http://www.meetfood.cn:2390", // 湖南-王
target: "http://zwpt.xzclub.top:9333/",
// target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.109:8765",
ws: true,
changeOrigin: true,
......
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