提交修改

This commit is contained in:
quyixiao 2020-09-29 18:27:32 +08:00
parent 65e2f1f8b3
commit 98f8ef7c9a
3 changed files with 112 additions and 106 deletions

View File

@ -63,9 +63,9 @@ const webpackConfig = merge(baseWebpackConfig, {
// see https://github.com/ampedandwired/html-webpack-plugin // see https://github.com/ampedandwired/html-webpack-plugin
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
filename: process.env.NODE_ENV === 'testing' filename: process.env.NODE_ENV === 'testing'
? 'own.vue.html' ? 'index.html'
: config.build.index, : config.build.index,
template: 'own.vue.html', template: 'index.html',
inject: true, inject: true,
minify: { minify: {
removeComments: true, removeComments: true,

View File

@ -15,6 +15,7 @@
<script> <script>
import {apiDingtalkLuck} from '@/api/api_staff' import {apiDingtalkLuck} from '@/api/api_staff'
import * as dd from 'dingtalk-jsapi' import * as dd from 'dingtalk-jsapi'
var dingCode = null var dingCode = null
export default { export default {
data () { data () {
@ -38,7 +39,6 @@ export default {
}, },
mounted () { mounted () {
if (this.isDingtalk()) { if (this.isDingtalk()) {
console.log('走钉钉免登流程') console.log('走钉钉免登流程')
this.dingtalkLogin() this.dingtalkLogin()
this.checkDingTalkLogin() this.checkDingTalkLogin()
@ -67,13 +67,10 @@ export default {
dd.runtime.permission.requestAuthCode({ dd.runtime.permission.requestAuthCode({
corpId: 'ding267474e759bbca1c35c2f4657eb6378f', corpId: 'ding267474e759bbca1c35c2f4657eb6378f',
onSuccess (result) { onSuccess (result) {
dingCode = result dingCode = result
console.log(dingCode) console.log(dingCode)
}, },
onFail (err) { onFail (err) {
console.log(err) console.log(err)
dingCode = err dingCode = err
} }

View File

@ -35,18 +35,17 @@ export default {
value: '' value: ''
} }
}, },
mounted () {}, mounted () {
},
methods: { methods: {
batchOperate (command) { batchOperate (command) {
switch (command) { switch (command) {
case 'staff': case 'staff':
//
this.$router.push({name: 'devicestaffdepat', query: {type: 3}}) this.$router.push({name: 'devicestaffdepat', query: {type: 3}})
break; break
case "depat": case 'depat':
//
this.$router.push({name: 'devicestaffdepat', query: {type: 4}}) this.$router.push({name: 'devicestaffdepat', query: {type: 4}})
break; break
} }
}, },
goto (type) { goto (type) {
@ -61,36 +60,46 @@ export default {
margin-bottom: 20px; margin-bottom: 20px;
} }
.el-col { .el-col {
border-radius: 10px; border-radius: 10px;
} }
.bg-purple-dark { .bg-purple-dark {
background: #99a9bf; background: #99a9bf;
} }
.bg-purple { .bg-purple {
background: #d3dce6; background: #d3dce6;
} }
.bg-purple-light { .bg-purple-light {
background: #e5f2f1; background: #e5f2f1;
} }
.grid-content { .grid-content {
border-radius: 4px; border-radius: 4px;
min-height: 36px; min-height: 36px;
} }
.row-bg { .row-bg {
padding: 10px 0; padding: 10px 0;
background-color: #f9fafc; background-color: #f9fafc;
} }
.div_height { .div_height {
height: 60px; height: 60px;
} }
.div_width { .div_width {
width: 100%; width: 100%;
} }
.zero_size { .zero_size {
width: 0px; width: 0px;
height: 0px; height: 0px;
} }
.select_local { .select_local {
top: 600px; top: 600px;
} }