Skip to content

F
founder_vue
Commit eb439605 by 米嘉伟
Options

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

parents ecc88398 f09cec3f
Showing with 170 additions and 65 deletions
src/views/Home.vue
......@@ -512,6 +512,9 @@ export default {
}
}
.el-icon-close {
&::before{
transform: scale(1.1)
}
display: none;
position: absolute;
top: 0;
......
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/cxyrd/QueryConfirm.vue
......@@ -156,11 +156,11 @@
<el-button type="info" @click="batch">批量操作</el-button>
<div class="middle">
<div class="font" @click="clearAll()">
全部数据&nbsp>
全部数据&nbsp;>
<!-- <span>共找到{{ reqParam.page.total }}条</span>-->
</div>
<el-tag
style="margin-right: 10px;"
style="margin-right: 10px"
:key="index"
v-for="(tag, index) in dynamicTags"
closable
......@@ -209,18 +209,21 @@
</div>
</div>
<el-tag
style="width:100%;color:#666666;margin-top:1rem;"
style="width: 100%; color: #666666; margin-top: 1rem"
v-show="isShowTip"
>
<i class="el-icon-info" style="color:#055FE7;font-size:.9375rem"></i>
<i
class="el-icon-info"
style="color: #055fe7; font-size: 0.9375rem"
></i>
已选择
<span style="color:#055FE7">{{ selectionData.length }}</span> 项​
<span style="color: #055fe7">{{ selectionData.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link
type="primary"
:underline="false"
style="margin-left:1.25rem;"
style="margin-left: 1.25rem"
@click="toggleSelection()"
>清除</el-link
>
......@@ -249,13 +252,22 @@
<el-table-column prop="" label="任务号/查询号" :width="cxyrdWidth1">
<template slot-scope="scope">
<svg-icon
style="width: .875rem;height: .6875rem;margin-bottom: .125rem ;margin-left: .3125rem ;"
style="
width: 0.875rem;
height: 0.6875rem;
margin-bottom: 0.125rem;
margin-left: 0.3125rem;
"
v-if="scope.row.children || scope.row.children === null"
icon-class="tree_f"
>
</svg-icon>
<svg-icon
style="width: .8125rem;height: .375rem;margin: 0 0 .1875rem 0 ;"
style="
width: 0.8125rem;
height: 0.375rem;
margin: 0 0 0.1875rem 0;
"
v-else-if="!scope.row.children || scope.row.children !== null"
icon-class="tree_c"
></svg-icon>
......@@ -279,27 +291,32 @@
:label="item.colume"
:prop="item.prop"
:width="item.width"
:sortable="
item.prop == 'affirmtime' || item.prop == 'requestdatetime'
? true
: false
"
>
<template slot-scope="scope">
<template v-if="item.prop === 'querytype'">
<div v-if="scope.row.querytype === '3'" style="color: #FFA219">
<div v-if="scope.row.querytype === '3'" style="color: #ffa219">
{{ scope.row.queryTypeName }}
</div>
<div
v-else-if="scope.row.querytype === '0'"
style="color: #005FE7"
style="color: #005fe7"
>
{{ scope.row.queryTypeName }}
</div>
<div
v-else-if="scope.row.querytype === '1'"
style="color:#E60012 "
style="color: #e60012"
>
{{ scope.row.queryTypeName }}
</div>
<div
v-else-if="scope.row.querytype === '2'"
style="color:#08BD9E"
style="color: #00b47a"
>
{{ scope.row.queryTypeName }}
</div>
......@@ -348,12 +365,12 @@
class="img"
@click="edit(scope.row)"
type="text"
style="font-size:1.5rem"
style="font-size: 1.5rem"
v-if="scope.row.barcode"
>
<i>
<img
style="width:1rem;height:1rem;cursor: pointer;"
style="width: 1rem; height: 1rem; cursor: pointer"
:src="editUrl"
alt
/>
......@@ -364,11 +381,11 @@
class="img"
@click.stop="delOne(scope.row.qqid)"
type="text"
style="font-size:1.5rem"
style="font-size: 1.5rem"
>
<i>
<img
style="width:.75rem;height:.875rem;cursor: pointer;"
style="width: 0.75rem; height: 0.875rem; cursor: pointer"
:src="delUrl"
alt
/>
......@@ -631,6 +648,18 @@ export default {
item => item.value !== value
);
} else {
//点击优先级先清除优先级的按钮在添加
if (type == "queryclasss") {
this.queryClassBtns.forEach(i => {
let listIndex = list.findIndex(j => j == i.value);
let dynamicTagsIndex = this.dynamicTags.findIndex(
j => j.name == i.name
);
if (listIndex >= 0) list.splice(listIndex, 1);
if (dynamicTagsIndex >= 0)
this.dynamicTags.splice(dynamicTagsIndex, 1);
});
}
list.push(value);
this.dynamicTags.push(data);
}
......@@ -921,7 +950,7 @@ export default {
}
});
this.dynamicTags = newdynamicTags;
this.reqParam.contrastCustomSearchReq.querytypes = [];
this.$set(this.reqParam.contrastCustomSearchReq, "querystates", []);
this.search();
},
showHistory() {
......
src/views/cxyrd/TT.scss
// 电话验证颜色
$phone: var(--phone, #606266); //#ff4242;
$phone: var(--phone, #606266); //#ff4242;
* {
box-sizing: border-box;
......@@ -62,8 +62,8 @@ $phone: var(--phone, #606266); //#ff4242;
color: #055fe7;
}
&:active {
border: 1px solid #044CB9;
color: #044CB9;
border: 1px solid #044cb9;
color: #044cb9;
}
}
.rdwccancel {
......@@ -71,12 +71,12 @@ $phone: var(--phone, #606266); //#ff4242;
background: #055fe7;
color: #ffffff;
&:hover {
background: #377FEC;
color: #FFFFFF;
background: #377fec;
color: #ffffff;
}
&:active {
background: #044CB9;
color: #FFFFFF;
background: #044cb9;
color: #ffffff;
}
}
}
......@@ -144,14 +144,14 @@ $phone: var(--phone, #606266); //#ff4242;
font-size: 14px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #FFA219;
color: #ffa219;
}
.dot {
margin-bottom: 2px;
margin-right: 5px;
width: 6px;
height: 6px;
background: #FFA219;
background: #ffa219;
border-radius: 50%;
}
}
......@@ -196,7 +196,7 @@ $phone: var(--phone, #606266); //#ff4242;
right: 36px;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #FF3745;
color: #ff3745;
}
.input-error {
position: absolute;
......@@ -257,7 +257,8 @@ $phone: var(--phone, #606266); //#ff4242;
align-items: center;
margin-left: 287px;
margin-top: 30px;
.bzconfirm,.bzcancel {
.bzconfirm,
.bzcancel {
cursor: pointer;
display: flex;
justify-content: center;
......@@ -273,14 +274,14 @@ $phone: var(--phone, #606266); //#ff4242;
}
.bzcancel {
margin-left: 24px;
background: #055FE7;
color: #FFFFFF;
background: #055fe7;
color: #ffffff;
}
}
}
}
.detail{
.detail {
z-index: 1000;
position: absolute;
display: flex;
......@@ -288,21 +289,24 @@ $phone: var(--phone, #606266); //#ff4242;
text-align: center;
//justify-content:center;
//top: auto;
top: calc(50% - 470px);
left: calc(50% - 225px);
.head-title{
width: 450px;
height: 28px;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
height: 100vh;
.head-title {
width: calc(50vh - 35px);
height: 30px;
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #333333;
line-height: 28px;
line-height: 30px;
}
.finger{
.finger {
box-sizing: border-box;
border: #001e33 1px solid;
width: 450px;
height: 450px;
width: calc(50vh - 35px);
height: calc(50vh - 35px);;
margin-bottom: 20px;
}
}
\ No newline at end of file
}
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,7 +97,8 @@ 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://www.meetfood.cn:2390/", // 湖南-线上
// target: "http://192.168.128.109:8765", // 湖南-王
target: "http://www.meetfood.cn:2390/", // 湖南-线上
ws: true,
changeOrigin: 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