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