Skip to content

F
founder_vue
Commit 3b828447 by liyuhang19990520
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 8c53df63 eb439605
Showing with 108 additions and 38 deletions
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -306,8 +306,8 @@
<el-radio-group v-model="ruleForm.cxlx.querytype">
<el-radio
label="2"
style="color: #00ccb5"
class='color_00ccb5'
style="color: #00b47a"
class='color_00b47a'
>正查</el-radio>
<el-radio
label="3"
......@@ -1085,8 +1085,8 @@ export default {
/deep/.color_fa9500 .el-radio__input.is-checked + .el-radio__label {
color: #fa9500;
}
/deep/.color_00ccb5 .el-radio__input.is-checked + .el-radio__label {
color: #00ccb5;
/deep/.color_00b47a .el-radio__input.is-checked + .el-radio__label {
color: #00b47a;
}
/deep/.color_055fe7 .el-radio__input.is-checked + .el-radio__label {
color: #055fe7;
......
src/views/SystemManage/GroupManage.vue
......@@ -48,6 +48,7 @@
</div>
<div class="operation">
<div class="btn1" @click="batch">批量操作</div>
<div @click="addgroup" class="clear-btn">addgroup</div>
<div class="btns">
<div class="btn1" @click="delMore()">删除</div>
<div class="add" @click="open">
......@@ -593,6 +594,18 @@ export default {
}
},
methods: {
addgroup() {
var group = {
userId: 39898889,
status: -17476821,
describe: "sit laborum Excepteur officia",
name: "ullamco esse",
roleId: -70041648
};
this.$axios.post("/system/user-groups", group).then(res => {
console.info(res);
});
},
clear() {
this.searchParams.page.page = 1; //必填
this.searchParams.page.total = 20; //必填
......
src/views/SystemManage/RoleManage.vue
......@@ -60,6 +60,7 @@
数据权限
</div>
</div>
<div @click="addrole">addrole</div>
<div class="save">
<div class="btn" @click="save">保存</div>
<!-- <el-button @click="add">add</el-button>-->
......@@ -333,6 +334,15 @@ export default {
};
},
methods: {
addrole() {
var role = {
name: "do aute officia irure voluptate",
permissionIds: []
};
this.$axios.post("/system/roles", role).then(res => {
console.info(res);
});
},
// 复制
copy() {
console.info("复制数据");
......
src/views/SystemManage/UserManage.vue
......@@ -56,6 +56,8 @@
</div>
<div class="operation">
<div class="btn1" @click="batch">批量操作</div>
<div class="clear-btn" @click="adduser">adduser</div>
<div class="clear-btn" @click="searchuser">searchuser</div>
<div class="btns">
<div class="btn1" @click="delMore()">删除</div>
<div class="add" @click="open">
......@@ -384,6 +386,8 @@
<script>
import "@/icons/ic_add.svg";
import qs from "qs";
export default {
name: "UserManage",
created() {
......@@ -632,6 +636,28 @@ export default {
}
},
methods: {
adduser() {
var user = {
username: "2021",
phoneNumber: "15806613121",
password: "2021",
policeNumber: "223",
unitName: "长沙",
unitCode: "123",
name: "王明光",
status: 1,
userGroupId: 1,
roleId: 1
};
this.$axios.post("/system/users", user).then(res => {
console.info(res);
});
},
searchuser() {
this.$axios.get("/system/users").then(res => {
console.info(res);
});
},
// 新增
submitForm(formName) {
this.$refs.addFormParams.validate(valid => {
......
src/views/cxyrd/LT.vue
......@@ -87,7 +87,11 @@
</div>
<div class="bzitem">
<div class="bzname">比中人联系电话：</div>
<el-input class="bzphone" v-model="phone" placeholder="请输入内容"></el-input>
<el-input
class="bzphone"
v-model="phone"
placeholder="请输入内容"
></el-input>
<div class="input-error" v-show="isPhoneError">
<!-- <img src="@/assets/img/inputerror.png" alt=""> -->
<svg-icon icon-class="error" class="icon" />
......@@ -100,7 +104,12 @@
<div class="line"></div>
<div class="bzfooter">
<div class="footer-title">备注</div>
<el-input type="textarea" :rows="5" placeholder="在此输入备注信息" v-model="textarea">
<el-input
type="textarea"
:rows="5"
placeholder="在此输入备注信息"
v-model="textarea"
>
</el-input>
</div>
<div class="bzbtns">
......@@ -111,7 +120,11 @@
</div>
<!-- 认定完成确认框 -->
<div class="rdwcDialog" v-show="isShowrdwcDialogBg" @click="cancelrdwc"></div>
<div
class="rdwcDialog"
v-show="isShowrdwcDialogBg"
@click="cancelrdwc"
></div>
<div class="rdwccontent" v-show="isShowrdwcDialog">
<div class="title">当前候选未全部查看，是否确认认定完成？</div>
<div class="rdwcbtns">
......@@ -136,7 +149,7 @@ export default {
LTCandidate,
ImageEd
},
data () {
data() {
return {
qid: null,
radio: 6,
......@@ -161,12 +174,12 @@ export default {
isShowrdwcDialog: false
};
},
created () {
created() {
this.qid = this.$route.query.rowData;
console.log("源qid====>", this.qid);
},
watch: {
phone (newValue, oldValue) {
phone(newValue, oldValue) {
if (newValue.length < 7) {
this.isPhoneError = true;
document
......@@ -186,7 +199,7 @@ export default {
* @param {*}
* @return {*}
*/
confirmrdwc () {
confirmrdwc() {
let self = this;
this.isShowrdwcDialogBg = false;
this.isShowrdwcDialog = false;
......@@ -228,7 +241,7 @@ export default {
* @param {*}
* @return {*}
*/
cancelrdwc () {
cancelrdwc() {
this.isShowrdwcDialogBg = false;
this.isShowrdwcDialog = false;
},
......@@ -237,7 +250,7 @@ export default {
* @param {*}
* @return {*}
*/
cancelbz () {
cancelbz() {
this.isShowbzDialogBg = false;
this.isShowbzDialog = false;
},
......@@ -246,7 +259,7 @@ export default {
* @param {*}
* @return {*}
*/
confirmbz () {
confirmbz() {
let self = this;
console.log("比中");
let affirmstatus = "1";
......@@ -302,7 +315,7 @@ export default {
* @param {*}
* @return {*}
*/
getUserInfo2 () {
getUserInfo2() {
let self = this;
let destbarcode = sessionStorage.getItem("destbarcode") || "";
console.log(destbarcode);
......@@ -323,7 +336,7 @@ export default {
* @param {*} id
* @return {*}
*/
getUserInfo (id = 1234) {
getUserInfo(id = 1234) {
let self = this;
this.$axios({
method: "post",
......@@ -354,7 +367,7 @@ export default {
* @param {*}
* @return {*}
*/
Bz () {
Bz() {
this.getUserInfo();
this.getUserInfo2();
this.asjbh = sessionStorage.getItem("srcbarcode");
......@@ -369,7 +382,7 @@ export default {
* @param {*}
* @return {*}
*/
Rdwc () {
Rdwc() {
console.log("认定完成");
let qqid = sessionStorage.getItem("qqid") || "";
......@@ -396,7 +409,7 @@ export default {
* @param {*} code
* @return {*}
*/
judgeZw (code) {
judgeZw(code) {
console.log(code);
switch (code) {
case 1:
......@@ -462,7 +475,7 @@ export default {
}
}
},
beforeDestroy () {
beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.$off("updateFinderSource");
}
......@@ -508,7 +521,7 @@ div {
height: 22px;
font-size: 16px;
font-weight: bold;
color: #00ccb5;
color: #00b47a;
line-height: 22px;
margin-top: 14px;
}
......
src/views/drFPTX/Index.vue
......@@ -85,8 +85,8 @@
>
</el-table-column>
<el-table-column
prop="name"
label="文件名称"
prop="index"
label="内序"
>
</el-table-column>
<!-- <el-table-column label="条码号">
......@@ -150,8 +150,8 @@
>
</el-table-column>
<el-table-column
prop="name"
label="文件名称"
prop="index"
label="内序"
>
</el-table-column>
<el-table-column
......@@ -225,7 +225,7 @@
<template slot-scope="scope">
<div
v-if='scope.row.type==0'
style="color: #ffa219;"
style="color: #fa9500;"
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==1'
......@@ -233,7 +233,7 @@
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==2'
style="color: #08BD9E;"
style="color: #00b47a;"
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==3'
......@@ -282,7 +282,7 @@
<el-table
height="550"
:data="selectArr"
ref="selection"
ref="dataTable"
@selection-change="checkRightAll"
style="width: 100%"
>
......@@ -306,7 +306,7 @@
<template slot-scope="scope">
<div
v-if='scope.row.type==0'
style="color: #ffa219;"
style="color: #fa9500;"
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==1'
......@@ -314,7 +314,7 @@
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==2'
style="color: #08BD9E;"
style="color: #00b47a;"
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==3'
......@@ -584,7 +584,6 @@ export default {
var reader = new FileReader();
reader.readAsText(file);
if (this.drlx == 3) {
console.log('333333')
that.action = '/api/upload/person'
reader.onload = function () {
const reg = /\<ysxt_asjxgrybh\>(.*?)\<\/ysxt_asjxgrybh\>/
......@@ -592,7 +591,7 @@ export default {
that.$set(newlist[i], 'barcode', barcode[1])
}
} else if (this.drlx == 6) {
that.action = '/api/upload/person'
that.action = '/api/upload/case'
reader.onload = function () {
const reg = /\<ysxt_asjbh\>(.*?)\<\/ysxt_asjbh\>/
let barcode = this.result.match(reg)
......@@ -813,12 +812,13 @@ export default {
this.nowSelectData = val;
},
checkRightAll (val) {
console.log('val', val)
console.log('val111', val)
this.nowSelectRightData = val;
},
// 选中
handelSelect () {
this.selectArr = this.handleConcatArr(this.selectArr, this.nowSelectData)
this.nowSelectRightData = this.selectArr
this.handleRemoveTabList(this.nowSelectData, this.datas);
this.nowSelectData = [];
},
......
vue.config.js
......@@ -8,13 +8,13 @@
*/
const path = require("path");
// 引入等比适配插件
const px2rem = require('postcss-px2rem')
const px2rem = require("postcss-px2rem");
// 配置基本大小
const postcss = px2rem({
// 基准大小 baseSize，需要和rem.js中相同
remUnit: 16
})
});
// const CompressionPlugin = require('compression-webpack-plugin');
// const productionGzipExtensions = /\.(js|css|json|txt|html|ico|svg)(\?.*)?$/i;
......@@ -97,6 +97,7 @@ module.exports = {
// 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://192.168.128.109:8765", // 湖南-王
target: "http://www.meetfood.cn:2390/", // 湖南-线上
ws: true,
......@@ -107,11 +108,20 @@ module.exports = {
},
"/login": {
target: "http://47.92.226.24:3004/", // 登录
// target: "http://192.168.128.109:8765/", // 王
ws: true,
changeOrigin: true,
pathRewrite: {
"^/login": ""
}
},
"/system": {
target: "http://192.168.128.109:8765", // 湖南-王
ws: true,
changeOrigin: true,
pathRewrite: {
"^/system": ""
}
}
// 阿里
// "/api": {
......@@ -127,9 +137,7 @@ module.exports = {
css: {
loaderOptions: {
postcss: {
plugins: [
postcss
]
plugins: [postcss]
}
},
sourceMap: process.env.NODE_ENV === "development" ? true : false // 在开发环境下开启 CSS sourcemaps
......
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