Skip to content

F
founder_vue
Commit 6fc03f7f by 张超军
Options

冲突

parents 18e1585b f8075e03
Showing with 782 additions and 54 deletions
package.json
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
"lib-flexible": "^0.3.2", "lib-flexible": "^0.3.2",
"moment": "^2.29.1", "moment": "^2.29.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinyin-match": "^1.2.2",
"postcss-px2rem": "^0.3.0", "postcss-px2rem": "^0.3.0",
"px2rem": "^0.5.0", "px2rem": "^0.5.0",
"px2rem-loader": "^0.1.9", "px2rem-loader": "^0.1.9",
......
public/iconfont/iconfont.css
@font-face { @font-face {
font-family: "iconfont"; /* Project id 2961960 */ font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1637734956272') format('woff2'), src: url('iconfont.woff2?t=1638273661267') format('woff2'),
url('iconfont.woff?t=1637734956272') format('woff'), url('iconfont.woff?t=1638273661267') format('woff'),
url('iconfont.ttf?t=1637734956272') format('truetype'); url('iconfont.ttf?t=1638273661267') format('truetype');
} }
.iconfont { .iconfont {
...@@ -13,7 +13,167 @@ ...@@ -13,7 +13,167 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-chaxunrending:before {
content: "\e637";
}
.icon-zhizhangwenluru1:before {
content: "\e634";
}
.icon-bianji1:before {
content: "\e635";
}
.icon-xitongguanlibeifen:before {
content: "\e636";
}
.icon-shujuziyuanguanli1:before {
content: "\e631";
}
.icon-zhiliangjianchabeifen:before {
content: "\e632";
}
.icon-xingzhuang:before {
content: "\e633";
}
.icon-danchuangguanbianniu:before {
content: "\e630";
}
.icon-xitongjiaose:before {
content: "\e62e";
}
.icon-ketianjiajiaose1:before {
content: "\e62f";
}
.icon-danganxinxi:before {
content: "\e62d";
}
.icon-xingxing:before {
content: "\e62c";
}
.icon-yiguanzhu:before {
content: "\e62b";
}
.icon-shanchu1:before {
content: "\e62a";
}
.icon-chenggong:before {
content: "\e629";
}
.icon-tanhao:before {
content: "\e628";
}
.icon-riqi:before {
content: "\e627";
}
.icon-xiala:before {
content: "\e626";
}
.icon-fanhui:before { .icon-fanhui:before {
content: "\e601"; content: "\e625";
}
.icon-duihao:before {
content: "\e624";
}
.icon-cishu:before {
content: "\e622";
}
.icon-shijian:before {
content: "\e623";
}
.icon-xiugaiyonghuquanxian-bianji:before {
content: "\e621";
}
.icon-shanchujiaose:before {
content: "\e61c";
}
.icon-tianjiajiaose:before {
content: "\e61b";
}
.icon-shenhe-xiala:before {
content: "\e612";
}
.icon-bujizhanguo:before {
content: "\e60b";
}
.icon-chexiaoshenhe:before {
content: "\e60c";
}
.icon-jiruzhanguo:before {
content: "\e60d";
}
.icon-shenhe:before {
content: "\e60e";
}
.icon-shenhewuxiao:before {
content: "\e60f";
}
.icon-shangbaoshengxingzhuan:before {
content: "\e610";
}
.icon-zhongxinshenhe:before {
content: "\e611";
}
.icon-quxiaoguanzhu:before {
content: "\e60a";
}
.icon-rengongrending:before {
content: "\e608";
}
.icon-shanchu:before {
content: "\e609";
}
.icon-fuzhitiaomahao:before {
content: "\e602";
}
.icon-gaihao:before {
content: "\e604";
}
.icon-fuzhishuju:before {
content: "\e605";
}
.icon-dayin:before {
content: "\e606";
}
.icon-chaxun:before {
content: "\e607";
} }
public/iconfont/iconfont.json
{ {
"id": "2961960", "id": "2961960",
"name": "指纹", "name": "指纹-icon",
"font_family": "iconfont", "font_family": "iconfont",
"css_prefix_text": "icon-", "css_prefix_text": "icon-",
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "25962198", "icon_id": "26116326",
"name": "查询认定",
"font_class": "chaxunrending",
"unicode": "e637",
"unicode_decimal": 58935
},
{
"icon_id": "26116267",
"name": "指掌纹录入",
"font_class": "zhizhangwenluru1",
"unicode": "e634",
"unicode_decimal": 58932
},
{
"icon_id": "26116268",
"name": "编辑",
"font_class": "bianji1",
"unicode": "e635",
"unicode_decimal": 58933
},
{
"icon_id": "26116269",
"name": "系统管理备份",
"font_class": "xitongguanlibeifen",
"unicode": "e636",
"unicode_decimal": 58934
},
{
"icon_id": "26116264",
"name": "数据资源管理",
"font_class": "shujuziyuanguanli1",
"unicode": "e631",
"unicode_decimal": 58929
},
{
"icon_id": "26116265",
"name": "质量检查备份",
"font_class": "zhiliangjianchabeifen",
"unicode": "e632",
"unicode_decimal": 58930
},
{
"icon_id": "26116266",
"name": "形状",
"font_class": "xingzhuang",
"unicode": "e633",
"unicode_decimal": 58931
},
{
"icon_id": "26115969",
"name": "弹窗关闭按钮",
"font_class": "danchuangguanbianniu",
"unicode": "e630",
"unicode_decimal": 58928
},
{
"icon_id": "26114691",
"name": "系统角色",
"font_class": "xitongjiaose",
"unicode": "e62e",
"unicode_decimal": 58926
},
{
"icon_id": "26114692",
"name": "可添加角色",
"font_class": "ketianjiajiaose1",
"unicode": "e62f",
"unicode_decimal": 58927
},
{
"icon_id": "26114348",
"name": "档案信息",
"font_class": "danganxinxi",
"unicode": "e62d",
"unicode_decimal": 58925
},
{
"icon_id": "26108620",
"name": "星形",
"font_class": "xingxing",
"unicode": "e62c",
"unicode_decimal": 58924
},
{
"icon_id": "26107116",
"name": "已关注",
"font_class": "yiguanzhu",
"unicode": "e62b",
"unicode_decimal": 58923
},
{
"icon_id": "26101768",
"name": "删除",
"font_class": "shanchu1",
"unicode": "e62a",
"unicode_decimal": 58922
},
{
"icon_id": "26101621",
"name": "成功",
"font_class": "chenggong",
"unicode": "e629",
"unicode_decimal": 58921
},
{
"icon_id": "26101476",
"name": "叹号",
"font_class": "tanhao",
"unicode": "e628",
"unicode_decimal": 58920
},
{
"icon_id": "26100738",
"name": "日期",
"font_class": "riqi",
"unicode": "e627",
"unicode_decimal": 58919
},
{
"icon_id": "26095338",
"name": "下拉",
"font_class": "xiala",
"unicode": "e626",
"unicode_decimal": 58918
},
{
"icon_id": "26093978",
"name": "返回", "name": "返回",
"font_class": "fanhui", "font_class": "fanhui",
"unicode": "e601", "unicode": "e625",
"unicode_decimal": 58881 "unicode_decimal": 58917
},
{
"icon_id": "26085803",
"name": "对号",
"font_class": "duihao",
"unicode": "e624",
"unicode_decimal": 58916
},
{
"icon_id": "26078043",
"name": "次数",
"font_class": "cishu",
"unicode": "e622",
"unicode_decimal": 58914
},
{
"icon_id": "26078044",
"name": "时间",
"font_class": "shijian",
"unicode": "e623",
"unicode_decimal": 58915
},
{
"icon_id": "26064091",
"name": "修改用户权限-编辑",
"font_class": "xiugaiyonghuquanxian-bianji",
"unicode": "e621",
"unicode_decimal": 58913
},
{
"icon_id": "26048084",
"name": "删除角色",
"font_class": "shanchujiaose",
"unicode": "e61c",
"unicode_decimal": 58908
},
{
"icon_id": "26048083",
"name": "添加角色",
"font_class": "tianjiajiaose",
"unicode": "e61b",
"unicode_decimal": 58907
},
{
"icon_id": "26036713",
"name": "审核-下拉",
"font_class": "shenhe-xiala",
"unicode": "e612",
"unicode_decimal": 58898
},
{
"icon_id": "26036280",
"name": "不计战果",
"font_class": "bujizhanguo",
"unicode": "e60b",
"unicode_decimal": 58891
},
{
"icon_id": "26036281",
"name": "撤销审核",
"font_class": "chexiaoshenhe",
"unicode": "e60c",
"unicode_decimal": 58892
},
{
"icon_id": "26036282",
"name": "计入战果",
"font_class": "jiruzhanguo",
"unicode": "e60d",
"unicode_decimal": 58893
},
{
"icon_id": "26036283",
"name": "审核",
"font_class": "shenhe",
"unicode": "e60e",
"unicode_decimal": 58894
},
{
"icon_id": "26036284",
"name": "审核无效",
"font_class": "shenhewuxiao",
"unicode": "e60f",
"unicode_decimal": 58895
},
{
"icon_id": "26036285",
"name": "上报省刑专",
"font_class": "shangbaoshengxingzhuan",
"unicode": "e610",
"unicode_decimal": 58896
},
{
"icon_id": "26036286",
"name": "重新审核",
"font_class": "zhongxinshenhe",
"unicode": "e611",
"unicode_decimal": 58897
},
{
"icon_id": "25988681",
"name": "取消关注",
"font_class": "quxiaoguanzhu",
"unicode": "e60a",
"unicode_decimal": 58890
},
{
"icon_id": "25980862",
"name": "人工认定",
"font_class": "rengongrending",
"unicode": "e608",
"unicode_decimal": 58888
},
{
"icon_id": "25980863",
"name": "删除",
"font_class": "shanchu",
"unicode": "e609",
"unicode_decimal": 58889
},
{
"icon_id": "25980856",
"name": "复制条码号",
"font_class": "fuzhitiaomahao",
"unicode": "e602",
"unicode_decimal": 58882
},
{
"icon_id": "25980858",
"name": "改号",
"font_class": "gaihao",
"unicode": "e604",
"unicode_decimal": 58884
},
{
"icon_id": "25980859",
"name": "复制数据",
"font_class": "fuzhishuju",
"unicode": "e605",
"unicode_decimal": 58885
},
{
"icon_id": "25980860",
"name": "打印",
"font_class": "dayin",
"unicode": "e606",
"unicode_decimal": 58886
},
{
"icon_id": "25980861",
"name": "查询",
"font_class": "chaxun",
"unicode": "e607",
"unicode_decimal": 58887
} }
] ]
} }
public/index.html
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>icon.ico"> <link rel="icon" href="<%= BASE_URL %>icon.ico">
<link rel="stylesheet" href="./iconfont/iconfont.css">
<!-- <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> --> <!-- <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> -->
<!-- <link rel="icon" sizes="any" mask href="//www.baidu.com/img/baidu_85beaf5496f291521eb75ba38eacbd87.svg"> --> <!-- <link rel="icon" sizes="any" mask href="//www.baidu.com/img/baidu_85beaf5496f291521eb75ba38eacbd87.svg"> -->
<link rel="stylesheet" href="<%= BASE_URL %>image-edit/css/tui-color-picker.css"> <link rel="stylesheet" href="<%= BASE_URL %>image-edit/css/tui-color-picker.css">
......
src/App.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-29 13:42:22 * @LastEditTime: 2021-11-30 17:43:22
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue * @FilePath: \指纹系统\founder_vue\src\App.vue
...@@ -14,7 +14,17 @@ ...@@ -14,7 +14,17 @@
<script> <script>
import zoom from "./utils/autosize"; import zoom from "./utils/autosize";
export default {}; export default {
created() {
var lett = this;
document.onkeydown = function (e) {
var key = window.event.keyCode;
if (key == 13) {
lett.$bus.emit("enter");
}
};
},
};
</script> </script>
<style lang="scss"> <style lang="scss">
...@@ -113,6 +123,26 @@ export default {}; ...@@ -113,6 +123,26 @@ export default {};
color: #2e3846; color: #2e3846;
} }
} }
.el-message-box {
display: inline-block;
width: 26.25rem;
padding-bottom: 0.625rem;
vertical-align: middle;
background-color: #fff;
height: 190px!important;
border-radius: 0.25rem;
border: 0.0625rem solid #ebeef5;
font-size: 1.125rem;
-webkit-box-shadow: 0 0.125rem 0.75rem 0 rgba(0, 0, 0, 0.1);
box-shadow: 0 0.125rem 0.75rem 0 rgba(0, 0, 0, 0.1);
text-align: left;
overflow: hidden;
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
}
.el-message-box__status {
display: none !important;
}
.el-popconfirm__main { .el-popconfirm__main {
margin: 23px 24px 17px 24px; margin: 23px 24px 17px 24px;
font-size: 14px; font-size: 14px;
......
src/components/Cascader.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-15 14:15:58 * @Date: 2021-11-15 14:15:58
* @LastEditTime: 2021-11-26 14:05:08 * @LastEditTime: 2021-11-30 13:45:59
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue * @FilePath: \founder_vue\src\components\confrim.vue
...@@ -72,6 +72,9 @@ export default { ...@@ -72,6 +72,9 @@ export default {
})); }));
} }
}, },
offOption() {
this.$refs.cascader.dropDownVisible = false;
},
}, },
mounted() { mounted() {
let self = this; let self = this;
......
src/components/SelectCode.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-25 10:15:01 * @Date: 2021-11-25 10:15:01
* @LastEditTime: 2021-11-29 14:17:01 * @LastEditTime: 2021-11-30 19:59:08
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\SelectCode.vue * @FilePath: \founder_vue\src\components\SelectCode.vue
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<el-select <el-select
v-model="newForm[id]" v-model="newForm[id]"
filterable filterable
ref="select"
:class="{ multiple: multiple }" :class="{ multiple: multiple }"
popper-class="popperClass" popper-class="popperClass"
:multiple="multiple" :multiple="multiple"
...@@ -21,21 +22,23 @@ ...@@ -21,21 +22,23 @@
@focus="placeholder = '请输入'" @focus="placeholder = '请输入'"
@blur="placeholder = '请选择'" @blur="placeholder = '请选择'"
:clearable="clearable" :clearable="clearable"
:filter-method="!multiple ? pinyingMatch : null"
collapse-tags collapse-tags
@change="change" @change="change"
@visible-change="visibleChange"
> >
<el-checkbox-group v-model="newForm[id]"> <el-checkbox-group v-model="newForm[id]">
<el-option <el-option
ref="option" ref="option"
v-for="item in options" v-for="item in options"
:key="item.id" :key="item.id"
:label="item.name" :label="item.str"
:value="item.code" :value="item.code"
> >
<div class="options" v-if="multiple" @click.stop="() => {}"> <div class="options" v-if="multiple" @click.stop="() => {}">
<el-checkbox :label="item.code">{{ item.name }}</el-checkbox> <el-checkbox :label="item.code">{{ item.str }}</el-checkbox>
</div> </div>
<div class="options" v-else>{{ item.name }}</div> <div class="options" v-else>{{ item.str }}</div>
</el-option> </el-option>
</el-checkbox-group> </el-checkbox-group>
</el-select> </el-select>
...@@ -51,6 +54,7 @@ export default { ...@@ -51,6 +54,7 @@ export default {
value: [], value: [],
checkList: [], checkList: [],
newForm: this.form, newForm: this.form,
allData: [],
}; };
}, },
props: { props: {
...@@ -88,6 +92,29 @@ export default { ...@@ -88,6 +92,29 @@ export default {
// }, // },
}, },
methods: { methods: {
pinyingMatch(val) {
const pinyingMatch = require("pinyin-match");
if (val) {
var result = [];
result = this.options.filter((i) => i.str.indexOf(val) >= 0);
if (result.length <= 0) {
result = this.options.filter((i) => {
let m = pinyingMatch.default.match(i.str, val);
if (m) return i;
});
}
this.options = result;
} else {
this.options = JSON.parse(JSON.stringify(this.allData));
}
},
visibleChange(a) {
if (!a && !this.multiple) {
setTimeout(() => {
this.options = JSON.parse(JSON.stringify(this.allData));
}, 200);
}
},
change(val) { change(val) {
let newVal = val; let newVal = val;
if (!newVal) newVal = ""; if (!newVal) newVal = "";
...@@ -99,10 +126,18 @@ export default { ...@@ -99,10 +126,18 @@ export default {
(res.data.code == 0 || res.data.code == 200) && (res.data.code == 0 || res.data.code == 200) &&
(res.data.message == "success" || res.data.info == "success") (res.data.message == "success" || res.data.info == "success")
) { ) {
this.options = res.data.ret || res.data.detail || []; let result = res.data.ret || res.data.detail || [];
this.options = result.map((i) => {
i.str = `${i.name}[${i.code}]`;
return i;
});
this.allData = JSON.parse(JSON.stringify(this.options));
} }
}); });
}, },
offOption() {
this.$refs.select.blur();
},
}, },
mounted() { mounted() {
this.getOptions(); this.getOptions();
...@@ -116,6 +151,11 @@ export default { ...@@ -116,6 +151,11 @@ export default {
padding: 0 10px; padding: 0 10px;
} }
.el-select /deep/ { .el-select /deep/ {
.el-select-dropdown__item.selected {
color: #606266;
font-weight: 400;
background-color: #f5f7fa;
}
width: 100% !important; width: 100% !important;
.popperClass { .popperClass {
.el-select-dropdown__item { .el-select-dropdown__item {
......
src/plugins/axios.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-30 09:16:35 * @LastEditTime: 2021-11-30 17:46:05
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js * @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
...@@ -76,11 +76,10 @@ _axios.interceptors.request.use( ...@@ -76,11 +76,10 @@ _axios.interceptors.request.use(
// Add a response interceptor // Add a response interceptor
_axios.interceptors.response.use( _axios.interceptors.response.use(
function (response) { function (response) {
// console.log(response)
if (response.data.code == 401) { if (response.data.code == 401) {
if (resTimer) clearTimeout(resTimer) if (resTimer) clearTimeout(resTimer)
resTimer = setTimeout(() => { resTimer = setTimeout(() => {
MessageBox.confirm('没有登陆账号，请登录, 是否继续?', '提示', { MessageBox.confirm('登陆超时请重新登录, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
...@@ -88,7 +87,7 @@ _axios.interceptors.response.use( ...@@ -88,7 +87,7 @@ _axios.interceptors.response.use(
router.replace("/Login"); router.replace("/Login");
}).catch(() => { }).catch(() => {
}); });
}, 200); }, 500);
} }
if (response.config.loading !== false) { if (response.config.loading !== false) {
hideLoading(response.config.loadingTarget); hideLoading(response.config.loadingTarget);
......
src/views/AllPersonnelBase/modules/ryxxk.vue
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
<div class='jbxxCenter'> <div class='jbxxCenter'>
<div class="sjx l1"> <div class="sjx l1">
<div class='sjxLeft'> <div class='sjxLeft'>
<svg
class="icon"
aria-hidden="true"
>
<use xlink:href="#icon-cishu"></use>
</svg>
</div> </div>
<div class='sjxRight'> <div class='sjxRight'>
<div> <div>
...@@ -56,7 +62,12 @@ ...@@ -56,7 +62,12 @@
</div> </div>
<div class="sjx l2"> <div class="sjx l2">
<div class='sjxLeft'> <div class='sjxLeft'>
<svg
class="icon"
aria-hidden="true"
>
<use xlink:href="#icon-shijian"></use>
</svg>
</div> </div>
<div class='sjxRight'> <div class='sjxRight'>
<div> <div>
...@@ -564,6 +575,13 @@ export default { ...@@ -564,6 +575,13 @@ export default {
background: #ddebff; background: #ddebff;
border-radius: 4px; border-radius: 4px;
margin-right: 10px; margin-right: 10px;
display: flex;
justify-content: center;
align-items: center;
.icon {
width: 20px;
height: 20px;
}
} }
.sjxRight { .sjxRight {
div { div {
......
src/views/SystemManage/PermissionManage.vue
...@@ -135,6 +135,7 @@ ...@@ -135,6 +135,7 @@
<div <div
v-for="item in scope.row.roleNames && v-for="item in scope.row.roleNames &&
scope.row.roleNames.split(',')" scope.row.roleNames.split(',')"
:title="item"
:key="item" :key="item"
> >
{{ item }} {{ item }}
...@@ -313,6 +314,7 @@ ...@@ -313,6 +314,7 @@
v-for="item in scope.row.roleNames && v-for="item in scope.row.roleNames &&
scope.row.roleNames.split(',')" scope.row.roleNames.split(',')"
:key="item" :key="item"
:title="item"
> >
{{ item }} {{ item }}
</div> </div>
...@@ -792,7 +794,29 @@ export default { ...@@ -792,7 +794,29 @@ export default {
.catch((failResponse) => {}); .catch((failResponse) => {});
}, },
}, },
activated() {
this.$bus.on("enter", () => {
if (this.isUser) {
this.searchUser();
} else {
this.searchGroup();
}
});
},
deactivated() {
this.$bus.off("enter");
},
beforeDestroy() {
this.$bus.off("enter");
},
mounted() { mounted() {
this.$bus.on("enter", () => {
if (this.isUser) {
this.searchUser();
} else {
this.searchGroup();
}
});
this.isUser = true; this.isUser = true;
if (this.isUser) { if (this.isUser) {
this.searchUser(); this.searchUser();
......
src/views/SystemManage/UserManage.vue
...@@ -165,6 +165,7 @@ ...@@ -165,6 +165,7 @@
<div <div
v-for="item in scope.row.roleNames && v-for="item in scope.row.roleNames &&
scope.row.roleNames.split(',')" scope.row.roleNames.split(',')"
:title="item"
:key="item" :key="item"
> >
{{ item }} {{ item }}
...@@ -740,11 +741,20 @@ export default { ...@@ -740,11 +741,20 @@ export default {
// 新增 // 新增
submitForm(formName) { submitForm(formName) {
//console.log(this.addFormParams, 22222222222); //console.log(this.addFormParams, 22222222222);
let params = {};
for (let key in this.addFormParams) {
if (key == "roleId" || key == "userGroupId") {
params[key] =
this.addFormParams[key] && this.addFormParams[key].join(",");
} else {
params[key] = this.addFormParams[key];
}
}
this.$refs.addFormParams.validate((valid) => { this.$refs.addFormParams.validate((valid) => {
//console.log(valid); //console.log(valid);
if (valid) { if (valid) {
this.$axios this.$axios
.post("/security/users", this.addFormParams) .post("/security/users", params)
.then((res) => { .then((res) => {
if (res.data.code == 201) { if (res.data.code == 201) {
setTimeout(() => { setTimeout(() => {
...@@ -924,12 +934,12 @@ export default { ...@@ -924,12 +934,12 @@ export default {
this.$set( this.$set(
this.editFormParams, this.editFormParams,
"userGroupId", "userGroupId",
result["userGroupIds"] && result["userGroupIds"].split(",") result["userGroupIds"] && result["userGroupIds"].split(",") || []
); );
this.$set( this.$set(
this.editFormParams, this.editFormParams,
"roleId", "roleId",
result["roleIds"] && result["roleIds"].split(",") result["roleIds"] && result["roleIds"].split(",") || []
); );
} }
}); });
...@@ -998,8 +1008,22 @@ export default { ...@@ -998,8 +1008,22 @@ export default {
this.search(); this.search();
}, },
}, },
activated() {
this.$bus.on("enter", () => {
this.search();
});
},
deactivated() {
this.$bus.off("enter");
},
beforeDestroy() {
this.$bus.off("enter");
},
mounted() { mounted() {
this.search(); this.search();
this.$bus.on("enter", () => {
this.search();
});
this.$nextTick(() => { this.$nextTick(() => {
document.body.appendChild(this.$refs.addUserDialog); document.body.appendChild(this.$refs.addUserDialog);
document.body.appendChild(this.$refs.isShowEditUserDialog); document.body.appendChild(this.$refs.isShowEditUserDialog);
...@@ -1109,7 +1133,12 @@ const data1 = [ ...@@ -1109,7 +1133,12 @@ const data1 = [
.info { .info {
margin-top: 0px !important; margin-top: 0px !important;
} }
/deep/ .is-indeterminate {
.el-checkbox__inner {
background-color: #055fe7;
border-color: #055fe7;
}
}
@import "scss/user"; @import "scss/user";
@import "./scss/dialog_table"; @import "./scss/dialog_table";
</style> </style>
src/views/SystemManage/UserPermission.vue
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</div> </div>
</div> </div>
<div class="save"> <div class="save">
<div @click="redact" class="editText"> <div @click="redact" class="editText" v-if="editBoo">
<i class="el-icon-edit"></i> <i class="el-icon-edit"></i>
<span>编辑</span> <span>编辑</span>
</div> </div>
...@@ -428,6 +428,7 @@ export default { ...@@ -428,6 +428,7 @@ export default {
userPermissions: [], //用户权限 userPermissions: [], //用户权限
countArr: [], //三个权限的总和 countArr: [], //三个权限的总和
checkMap: {}, //判断层叠以及是否选中 checkMap: {}, //判断层叠以及是否选中
editBoo: false
}; };
}, },
methods: { methods: {
...@@ -446,6 +447,7 @@ export default { ...@@ -446,6 +447,7 @@ export default {
}, },
// 保存 // 保存
save() { save() {
this.editBoo = true
if (this.isSave) { if (this.isSave) {
return; return;
} }
......
src/views/SystemManage/scss/group.scss
.tooTipBtn { .tooTipBtn {
padding: 10px; padding: 10px;
max-height: 317px;
overflow: auto;
// 滚动条的宽度
&::-webkit-scrollbar {
width: 6px; /*高宽分别对应横竖滚动条的尺寸*/
height: 1px;
}
/* 滚动槽 */
&::-webkit-scrollbar-track {
height: 65px;
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
border-radius: 10px;
}
/* 滚动条滑块 */
&::-webkit-scrollbar-thumb {
border-radius: 10px;
height: 65px;
background: #595a5a;
}
> div { > div {
width: 100px; width: 100px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
word-wrap: break-word;
height: 24px; height: 24px;
background: #5e5e5e; background: #5e5e5e;
border-radius: 4px; border-radius: 4px;
...@@ -13,8 +36,15 @@ ...@@ -13,8 +36,15 @@
} }
} }
} }
.groupEditDialog /deep/ {
height: 20rem !important;
width: 39.6rem !important;
.el-form-item__label {
width: 6rem !important;
}
}
.el-checkbox /deep/ { .el-checkbox /deep/ {
.el-checkbox__label{ .el-checkbox__label {
color: #666666 !important; color: #666666 !important;
} }
.is-checked { .is-checked {
...@@ -752,7 +782,7 @@ ...@@ -752,7 +782,7 @@
.content { .content {
display: inline-block; display: inline-block;
width: calc(100% - 105px); width: calc(100% - 105px);
max-height: 94px !important; height: 94px !important;
box-sizing: border-box; box-sizing: border-box;
overflow: auto; overflow: auto;
.contentItem { .contentItem {
...@@ -776,7 +806,7 @@ ...@@ -776,7 +806,7 @@
box-sizing: border-box; box-sizing: border-box;
padding: 0 10px; padding: 0 10px;
} }
> img { > .icon {
position: absolute; position: absolute;
top: -6px; top: -6px;
right: -6px; right: -6px;
......
src/views/SystemManage/scss/permission.scss
.tooTipBtn { .tooTipBtn {
padding: 10px; padding: 10px;
max-height: 317px;
overflow: auto;
// 滚动条的宽度
&::-webkit-scrollbar {
width: 6px; /*高宽分别对应横竖滚动条的尺寸*/
height: 1px;
}
/* 滚动槽 */
&::-webkit-scrollbar-track {
height: 65px;
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
border-radius: 10px;
}
/* 滚动条滑块 */
&::-webkit-scrollbar-thumb {
border-radius: 10px;
height: 65px;
background: #595a5a;
}
> div { > div {
width: 100px; width: 100px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
word-wrap: break-word;
height: 24px; height: 24px;
background: #5e5e5e; background: #5e5e5e;
border-radius: 4px; border-radius: 4px;
......
src/views/SystemManage/scss/user.scss
.tooTipBtn { .tooTipBtn {
padding: 10px; padding: 10px;
max-height: 317px;
overflow: auto;
// 滚动条的宽度
&::-webkit-scrollbar {
width: 6px; /*高宽分别对应横竖滚动条的尺寸*/
height: 1px;
}
/* 滚动槽 */
&::-webkit-scrollbar-track {
height: 65px;
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
border-radius: 10px;
}
/* 滚动条滑块 */
&::-webkit-scrollbar-thumb {
border-radius: 10px;
height: 65px;
background: #595a5a;
}
> div { > div {
width: 100px; width: 100px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
word-wrap: break-word;
height: 24px; height: 24px;
background: #5e5e5e; background: #5e5e5e;
border-radius: 4px; border-radius: 4px;
......
src/views/cxyrd/QueryConfirm.vue
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
</el-select> </el-select>
</div> </div>
<div class="display_style"> <div class="display_style">
<span>查询ID：</span> <span>任务号/查询ID：</span>
<el-input <el-input
class="el_input" class="el_input"
placeholder="请输入查询ID" placeholder="请输入任务号/查询ID"
v-model="reqParam.contrastCustomSearchReq.qqid" v-model="reqParam.contrastCustomSearchReq.qqid"
></el-input> ></el-input>
</div> </div>
...@@ -271,12 +271,13 @@ ...@@ -271,12 +271,13 @@
@row-click="confirm" @row-click="confirm"
@expand-change="hadnlExpandChange" @expand-change="hadnlExpandChange"
> >
<!-- @select-all="handleSelectAll" -->
<el-table-column <el-table-column
type="selection" type="selection"
height height
width="auto" width="auto"
></el-table-column> ></el-table-column>
<el-table-column prop="" label="查询ID" :width="cxyrdWidth1"> <el-table-column prop="" label="任务号/查询ID" :width="cxyrdWidth1">
<template slot-scope="scope"> <template slot-scope="scope">
<svg-icon <svg-icon
style=" style="
...@@ -395,19 +396,19 @@ ...@@ -395,19 +396,19 @@
</el-table-column> </el-table-column>
<el-table-column width="auto" label="操作" align="left"> <el-table-column width="auto" label="操作" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<Confirmation content="编辑用户" v-if="scope.row.barcode"> <Confirmation content="复制条码" v-if="scope.row.barcode">
<img <img
style=" style="
width: 1.125rem; width: 1rem;
height: 1.125rem; height: 1rem;
margin-right: 1.125rem; margin-right: 1.125rem;
cursor: pointer; cursor: pointer;
" "
:src="editUrl" src="@/assets/img/qbryk/fz.svg"
@click.stop=" @click.stop="
() => { () => {
delSelect(); delSelect();
edit(scope.row.id); edit(scope.row);
} }
" "
/> />
...@@ -594,7 +595,6 @@ export default { ...@@ -594,7 +595,6 @@ export default {
// //console.log(item); // //console.log(item);
self.$set(item, "width", (item.width * w2) / w1); self.$set(item, "width", (item.width * w2) / w1);
}); });
//console.log(content);
}, },
watch: { watch: {
selectBoo: { selectBoo: {
...@@ -755,6 +755,10 @@ export default { ...@@ -755,6 +755,10 @@ export default {
}, },
// 多选删除 // 多选删除
delMore() { delMore() {
if (this.selectBoo == false) {
this.selectBoo = true;
return;
}
// 检查table选择的数据 如果没有选择则不可以删除 // 检查table选择的数据 如果没有选择则不可以删除
// this.selectBoo = !this.selectBoo; // this.selectBoo = !this.selectBoo;
if (this.selectionData.length === 0) { if (this.selectionData.length === 0) {
...@@ -943,7 +947,36 @@ export default { ...@@ -943,7 +947,36 @@ export default {
this.toggleSelection(); this.toggleSelection();
}, },
// 编辑 // 编辑
edit() {}, edit(row) {
let self = this;
this.$copyText(row.barcode).then(
function (e) {
self.$message({
type: "success",
// message: "复制条码号:" + this.copyNum + "成功！"
message: "已复制到剪切板",
});
},
function (e) {
this.$message.error("抱歉，复制条码号失败！");
}
);
},
// handleSelectAll(val) {
// console.log(val);
// for (let item of this.list) {
// //一级数据 加入到toggleRowSelection中会触发handleSelectionChange
// this.$refs.confirmTable.toggleRowSelection(item);
// if (item.children !== null && !item.barcode) {
// //一级数据，children数据
// for (let item1 of item.children) {
// //加入到toggleRowSelection中会触发handleSelectionChange方法
// this.$refs.confirmTable.toggleRowSelection(item1);
// }
// }
// }
// },
// 展开或关闭行 // 展开或关闭行
hadnlExpandChange(row, expanded) { hadnlExpandChange(row, expanded) {
// 获取展开标志 // 获取展开标志
...@@ -1006,17 +1039,14 @@ export default { ...@@ -1006,17 +1039,14 @@ export default {
getBarcode() { getBarcode() {
let self = this; let self = this;
this.barcode = []; this.barcode = [];
// if (this.selectionData.length === 0) { if (this.selectBoo == false) {
// this.$message.error("请选择需要复制条码号的数据！"); this.selectBoo = true;
// } else if (this.selectionData.length === 1) { return;
// this.barcode = this.selectionData[0].barcode; }
// } else {
// this.$message.error("只能复制单条数据的条码号！");
// }
if (this.selectionData.length === 0) { if (this.selectionData.length === 0) {
this.$message.error("请选择需要复制条码号的数据！"); this.$message.error("请选择需要复制条码号的数据！");
} else { } else {
//console.log(this.selectionData);
self.selectionData.forEach((item) => { self.selectionData.forEach((item) => {
self.barcode.push(item.barcode); self.barcode.push(item.barcode);
}); });
...@@ -1040,6 +1070,7 @@ export default { ...@@ -1040,6 +1070,7 @@ export default {
}, },
// 自定义展示列 多选框 // 自定义展示列 多选框
changeCheckbox() { changeCheckbox() {
this.tableKey++;
// //console.info("默认", this.defaultTableProps); // //console.info("默认", this.defaultTableProps);
// //console.info("table", this.tableProps); // //console.info("table", this.tableProps);
// //console.info("选中", this.checkedProps); // //console.info("选中", this.checkedProps);
...@@ -1153,7 +1184,21 @@ export default { ...@@ -1153,7 +1184,21 @@ export default {
//console.log(this.selectionData); //console.log(this.selectionData);
}, },
}, },
activated() {
this.$bus.on("enter", () => {
this.search();
});
},
deactivated() {
this.$bus.off("enter");
},
beforeDestroy() {
this.$bus.off("enter");
},
mounted() { mounted() {
this.$bus.on("enter", () => {
this.search();
});
//console.log(this.$moment, 222222222222); //console.log(this.$moment, 222222222222);
// //console.log(window.innerHeight); // //console.log(window.innerHeight);
// //console.log(window.innerWidth); // //console.log(window.innerWidth);
...@@ -1676,6 +1721,10 @@ b { ...@@ -1676,6 +1721,10 @@ b {
</style> </style>
<style lang="scss"> <style lang="scss">
.el-table__expand-icon { .el-table__expand-icon {
.el-icon-arrow-right {
cursor: pointer !important;
}
cursor: pointer !important;
position: absolute; position: absolute;
right: 45px; right: 45px;
cursor: pointer; cursor: pointer;
......
src/views/login/Login1.vue
...@@ -131,12 +131,15 @@ export default { ...@@ -131,12 +131,15 @@ export default {
() => { () => {
setTimeout(() => { setTimeout(() => {
this.loginShow = true; this.loginShow = true;
}, 10); }, 50);
} }
); );
}, },
}, },
created() {}, created() {},
beforeDestroy() {
self.player.dispose();
},
mounted() { mounted() {
let self = this; let self = this;
this.loginType.accountStatus = true; this.loginType.accountStatus = true;
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-30 09:39:32 * @LastEditTime: 2021-12-01 09:52:46
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js * @FilePath: \指纹系统\founder_vue\vue.config.js
...@@ -91,14 +91,14 @@ module.exports = { ...@@ -91,14 +91,14 @@ module.exports = {
"/api": { "/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定 // target: "http://172.18.108.2:8099/", // 张 认定
// target: "http://192.168.128.166:8099", // 湖南-张 target: "http://192.168.128.108:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马 // target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王 // target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光 // target: "http://192.168.128.118:8764", // 湖南-张呈光
// 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", // 湖南-线上
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
...@@ -107,7 +107,6 @@ module.exports = { ...@@ -107,7 +107,6 @@ module.exports = {
} }
}, },
"/login": { "/login": {
// target: "http://192.168.128.108:8764/", // 登录
target: "http://www.meetfood.cn:2390/", // 登录 target: "http://www.meetfood.cn:2390/", // 登录
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
...@@ -127,8 +126,8 @@ module.exports = { ...@@ -127,8 +126,8 @@ module.exports = {
"/security": { "/security": {
//target: "http://192.168.128.106:8765", // 湖南-王 //target: "http://192.168.128.106:8765", // 湖南-王
// target: "http://192.168.128.108:8764", // 湖南-张 target: "http://192.168.128.108:8764", // 湖南-张
target: "http://www.meetfood.cn:2390", // 湖南-王 // target: "http://www.meetfood.cn:2390", // 湖南-王
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
yarn.lock
...@@ -7372,6 +7372,13 @@ pinkie@^2.0.0: ...@@ -7372,6 +7372,13 @@ pinkie@^2.0.0:
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
pinyin-match@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/pinyin-match/-/pinyin-match-1.2.2.tgz#24a60a5bce89fb2903f33f37492782d3f8e34eeb"
integrity sha512-C0yOq4LkToJMkDHiQFKOY69El2GRcwdS2lVEjgWjIV8go3wE4mloGFNkVicGHFGYHDg523m2/lKzW8Hh+JR9nw==
dependencies:
rollup "^2.44.0"
pkcs7@^1.0.4: pkcs7@^1.0.4:
version "1.0.4" version "1.0.4"
resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.4.tgz#6090b9e71160dabf69209d719cbafa538b00a1cb" resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.4.tgz#6090b9e71160dabf69209d719cbafa538b00a1cb"
...@@ -8426,6 +8433,13 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: ...@@ -8426,6 +8433,13 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
hash-base "^3.0.0" hash-base "^3.0.0"
inherits "^2.0.1" inherits "^2.0.1"
rollup@^2.44.0:
version "2.60.2"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.60.2.tgz#3f45ace36a9b10b4297181831ea0719922513463"
integrity sha512-1Bgjpq61sPjgoZzuiDSGvbI1tD91giZABgjCQBKM5aYLnzjq52GoDuWVwT/cm/MCxCMPU8gqQvkj8doQ5C8Oqw==
optionalDependencies:
fsevents "~2.3.2"
run-async@^2.4.0: run-async@^2.4.0:
version "2.4.1" version "2.4.1"
resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
......
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