Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
founder_vue
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
founder_vue
Commits
cd75776e
Commit
cd75776e
authored
Dec 06, 2021
by
liyuhang19990520
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
5462da81
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
23 additions
and
112 deletions
+23
-112
src/plugins/axios.js
+1
-2
src/utils/requestLoading.js
+1
-2
src/views/Home.vue
+0
-3
src/views/SystemManage/GroupManage.vue
+2
-3
src/views/SystemManage/GroupPermission.vue
+1
-0
src/views/SystemManage/PermissionManage.vue
+2
-0
src/views/SystemManage/UserManage.vue
+0
-0
src/views/cxyrd/modules/LLCandidate.vue
+6
-92
vue.config.js
+6
-6
yarn.lock
+4
-4
No files found.
src/plugins/axios.js
View file @
cd75776e
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-06 1
0:47:24
* @LastEditTime: 2021-12-06 1
6:26:53
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
...
...
@@ -57,7 +57,6 @@ _axios.interceptors.request.use(
}
// 判断当前请求是否设置了不显示Loading,默认显示
console
.
log
(
config
);
if
(
config
.
loading
!==
false
)
{
showLoading
(
config
.
loadingTarget
);
// 如果设置了targer,使用设置的target,比如el-table
// console.log(document.querySelector('.loading'));
...
...
src/utils/requestLoading.js
View file @
cd75776e
/*
* @Author: your name
* @Date: 2021-11-26 16:37:59
* @LastEditTime: 2021-12-0
4 11:02:16
* @LastEditTime: 2021-12-0
6 16:22:17
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\utils\requestLoading.js
...
...
@@ -19,7 +19,6 @@ let needLoadingRequestCount = 0;
export
function
showLoading
(
target
)
{
// 后面这个判断很重要,因为关闭时加了抖动,此时loading对象可能还存在,
// 但needLoadingRequestCount已经变成0.避免这种情况下会重新创建个loading
console
.
log
(
needLoadingRequestCount
,
loading
);
if
(
needLoadingRequestCount
===
0
&&
!
loading
)
{
// loading = Loading.service({ // 通过cdn引入的element-ui
// customClass: 'screen',
...
...
src/views/Home.vue
View file @
cd75776e
...
...
@@ -470,13 +470,10 @@ export default {
},
watch
:
{
enLargeFace
(
newValue
,
oldValue
)
{
console
.
log
(
newValue
);
},
menuActive
(
newValue
,
oldValue
)
{
console
.
log
(
newValue
);
},
loading
(
newValue
,
oldValue
)
{
console
.
log
(
newValue
);
},
$route
:
{
handler
(
newValue
,
oldValue
)
{
...
...
src/views/SystemManage/GroupManage.vue
View file @
cd75776e
...
...
@@ -643,7 +643,7 @@
<div
class=
"btn1"
@
click=
"canceluser"
>
确认
</div>
<div
class=
"btn2"
@
click=
"canceluser"
>
取消
</div>
</div>
</div>
</div>
</el-container>
</template>
...
...
@@ -1419,8 +1419,7 @@ export default {
.groupYonghuDialog
/
deep
/
{
.el-table
{
.el-tooltip
{
width
:
auto
!important
;
width
:
auto
!important
;
}
}
}
...
...
src/views/SystemManage/GroupPermission.vue
View file @
cd75776e
...
...
@@ -47,6 +47,7 @@
v-for=
"item in userData &&
userData.roleNames &&
userData.roleNames.split(',').slice(0, 3)"
v-show=
"item != ''"
:title=
"item"
:key=
"item"
>
...
...
src/views/SystemManage/PermissionManage.vue
View file @
cd75776e
...
...
@@ -129,6 +129,7 @@
class=
"tags"
v-for=
"item in strArr(scope.row.roleNames).arr"
:key=
"item"
v-show=
"item !== ''"
>
{{
item
}}
</div>
...
...
@@ -310,6 +311,7 @@
class=
"tags"
v-for=
"item in strArr(scope.row.roleNames).arr"
:key=
"item"
v-show=
"item !== ''"
>
{{
item
}}
</div>
...
...
src/views/SystemManage/UserManage.vue
View file @
cd75776e
This diff is collapsed.
Click to expand it.
src/views/cxyrd/modules/LLCandidate.vue
View file @
cd75776e
...
...
@@ -86,99 +86,13 @@
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"destseqno"
label=
"指位"
:width=
"width3"
:render-header=
"icons"
>
<el-table-column
prop=
"destseqno"
label=
"序号"
:width=
"width3"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.removeFlag === 1"
>
{{
scope
.
row
.
destseqno
==
"1"
?
"拇指"
:
scope
.
row
.
destseqno
==
"2"
?
"食指"
:
scope
.
row
.
destseqno
==
"3"
?
"中指"
:
scope
.
row
.
destseqno
==
"4"
?
"环指"
:
scope
.
row
.
destseqno
==
"5"
?
"小指"
:
scope
.
row
.
destseqno
==
"6"
?
"拇指"
:
scope
.
row
.
destseqno
==
"7"
?
"食指"
:
scope
.
row
.
destseqno
==
"8"
?
"中指"
:
scope
.
row
.
destseqno
==
"9"
?
"环指"
:
scope
.
row
.
destseqno
==
"10"
?
"小指"
:
scope
.
row
.
destseqno
==
"11"
?
"拇指"
:
scope
.
row
.
destseqno
==
"12"
?
"食指"
:
scope
.
row
.
destseqno
==
"13"
?
"中指"
:
scope
.
row
.
destseqno
==
"14"
?
"环指"
:
scope
.
row
.
destseqno
==
"15"
?
"小指"
:
scope
.
row
.
destseqno
==
"16"
?
"拇指"
:
scope
.
row
.
destseqno
==
"17"
?
"食指"
:
scope
.
row
.
destseqno
==
"18"
?
"中指"
:
scope
.
row
.
destseqno
==
"19"
?
"环指"
:
"小指"
}}
</span>
<span
v-else
>
{{
scope
.
row
.
destseqno
==
"1"
?
"拇指"
:
scope
.
row
.
destseqno
==
"2"
?
"食指"
:
scope
.
row
.
destseqno
==
"3"
?
"中指"
:
scope
.
row
.
destseqno
==
"4"
?
"环指"
:
scope
.
row
.
destseqno
==
"5"
?
"小指"
:
scope
.
row
.
destseqno
==
"6"
?
"拇指"
:
scope
.
row
.
destseqno
==
"7"
?
"食指"
:
scope
.
row
.
destseqno
==
"8"
?
"中指"
:
scope
.
row
.
destseqno
==
"9"
?
"环指"
:
scope
.
row
.
destseqno
==
"10"
?
"小指"
:
scope
.
row
.
destseqno
==
"11"
?
"拇指"
:
scope
.
row
.
destseqno
==
"12"
?
"食指"
:
scope
.
row
.
destseqno
==
"13"
?
"中指"
:
scope
.
row
.
destseqno
==
"14"
?
"环指"
:
scope
.
row
.
destseqno
==
"15"
?
"小指"
:
scope
.
row
.
destseqno
==
"16"
?
"拇指"
:
scope
.
row
.
destseqno
==
"17"
?
"食指"
:
scope
.
row
.
destseqno
==
"18"
?
"中指"
:
scope
.
row
.
destseqno
==
"19"
?
"环指"
:
"小指"
}}
</span>
{{
scope
.
$index
+
1
>=
9
?
scope
.
$index
+
1
:
"0"
+
(
scope
.
$index
+
1
)
}}
</
template
>
</el-table-column>
<el-table-column
prop=
"destbarcode"
label=
"目标条码号"
width=
"auto"
>
...
...
vue.config.js
View file @
cd75776e
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-06
09:55:33
* @LastEditTime: 2021-12-06
16:52:09
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
...
...
@@ -107,13 +107,13 @@ module.exports = {
}
},
"/login"
:
{
//
target: "http://www.meetfood.cn:2390/", // 登录
target
:
"http://192.168.128.121:8764/"
,
// 登录
target
:
"http://www.meetfood.cn:2390/"
,
// 登录
//
target: "http://192.168.128.121:8764/", // 登录
// target: "http://192.168.128.114:8099", // 登录-马
ws
:
true
,
changeOrigin
:
true
,
pathRewrite
:
{
"^/login"
:
""
"^/login"
:
"
/login
"
}
},
// "/system": {
...
...
@@ -128,8 +128,8 @@ module.exports = {
"/security"
:
{
//target: "http://192.168.128.106:8765", // 湖南-王
target
:
"http://192.168.128.121:8764"
,
// 湖南-张
//
target: "http://www.meetfood.cn:2390", // 湖南-王
//
target: "http://192.168.128.121:8764", // 湖南-张
target
:
"http://www.meetfood.cn:2390"
,
// 湖南-王
ws
:
true
,
changeOrigin
:
true
,
pathRewrite
:
{
...
...
yarn.lock
View file @
cd75776e
...
...
@@ -3817,10 +3817,10 @@ electron-to-chromium@^1.3.896:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.904.tgz#52a353994faeb0f2a9fab3606b4e0614d1af7b58"
integrity sha512-x5uZWXcVNYkTh4JubD7KSC1VMKz0vZwJUqVwY3ihsW0bst1BXDe494Uqbg3Y0fDGVjJqA8vEeGuvO5foyH2+qw==
element-ui@^2.
4.5
:
version "2.15.
6
"
resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.15.
6.tgz#c9609add35af5a686a4b7685dc1d757c75e01df3
"
integrity sha512-
rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw
==
element-ui@^2.
15.7
:
version "2.15.
7
"
resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.15.
7.tgz#9e5f8461edb53cfd89a88614b6caa82bd110ee38
"
integrity sha512-
+J6rnXajxzLwV6w8Q6bf7Yqzk1FO1ewbIrCy/4B5alnd7tj8WEpfQoAvISirVaUGVGy77d9Ji3o2bF4f0AsJLQ
==
dependencies:
async-validator "~1.8.1"
babel-helper-vue-jsx-merge-props "^2.0.0"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment