Skip to content

T
test_platform_web
Commit 8a95f725 authored by Wallen姚文辉's avatar Wallen姚文辉
Browse files
Options

Merge branch 'mailmade' into 'master' 

Mailmade

See merge request !4
parents 20fadfd2 65027d31
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
dist/index.html
View file @ 8a95f725
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="/dist/plugins/css/pluginsCss.css"/><link rel="stylesheet" href="/dist/plugins/plugins.css"/><link rel="stylesheet" href="/dist/css/luckysheet.css"/><link rel="stylesheet" href="/dist/assets/iconfont/iconfont.css"/><script src="/dist/plugins/js/plugin.js"></script><script src="/dist/luckysheet.umd.js"></script><title>yinhe_test</title><script defer="defer" src="/js/chunk-vendors.9926850b.js"></script><script defer="defer" src="/js/app.698ebd0f.js"></script><link href="/css/chunk-vendors.187ae3e6.css" rel="stylesheet"><link href="/css/app.df7fa4e2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but yinhe_test doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html> <!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="/dist/plugins/css/pluginsCss.css"/><link rel="stylesheet" href="/dist/plugins/plugins.css"/><link rel="stylesheet" href="/dist/css/luckysheet.css"/><link rel="stylesheet" href="/dist/assets/iconfont/iconfont.css"/><script src="/dist/plugins/js/plugin.js"></script><script src="/dist/luckysheet.umd.js"></script><title>yinhe_test</title><script defer="defer" src="/js/chunk-vendors.9926850b.js"></script><script defer="defer" src="/js/app.03952fed.js"></script><link href="/css/chunk-vendors.187ae3e6.css" rel="stylesheet"><link href="/css/app.df7fa4e2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but yinhe_test doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file \ No newline at end of file
dist/js/app.03952fed.js 0 → 100644
View file @ 8a95f725
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/app.03952fed.js.map 0 → 100644
View file @ 8a95f725
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/app.698ebd0f.js deleted 100644 → 0
View file @ 20fadfd2
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/app.698ebd0f.js.map deleted 100644 → 0
View file @ 20fadfd2
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/systemview/UserInfo.vue
View file @ 8a95f725
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<Input v-model="userinfo.secondpassword" placeholder="请再次输入密码" type="password" password <Input v-model="userinfo.secondpassword" placeholder="请再次输入密码" type="password" password
style="max-width: 600px;"></Input> style="max-width: 600px;"></Input>
</FormItem> </FormItem>
<FormItem v-if="elements.indexOf('4-3') != -1" name="组织更改" label="组织"> <FormItem prop="organization_id" v-if="elements.indexOf('4-3') != -1" name="组织更改" label="组织">
<Select filterable v-model="userinfo.organization_id" style="max-width: 300px;"> <Select filterable v-model="userinfo.organization_id" style="max-width: 300px;">
<Option v-for="item in organization" :value="item.id">{{ item.path }}</Option> <Option v-for="item in organization" :value="item.id">{{ item.path }}</Option>
</Select> </Select>
...@@ -113,6 +113,7 @@ export default { ...@@ -113,6 +113,7 @@ export default {
secondpassword: [ secondpassword: [
{ validator: validatePassCheck, trigger: 'blur', required: this.$route.query.id ? false : true } { validator: validatePassCheck, trigger: 'blur', required: this.$route.query.id ? false : true }
], ],
organization_id: [{ required: true, message: '组织不能为空', trigger: 'blur' }],
role_id: [ role_id: [
{ required: true, message: '请选择角色', trigger: 'change', type: 'number' } { required: true, message: '请选择角色', trigger: 'change', type: 'number' }
], ],
......
src/views/tool/UploadCae.vue
View file @ 8a95f725
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
item.name }}</Option> item.name }}</Option>
</Select> </Select>
<Select filterable v-model="views" style="width:200px" placeholder="面板"> <Select filterable v-model="views" style="width:200px" placeholder="面板">
<Option v-for="item in views" :value="item.id" :key="item.id">{{ <Option v-model="view" v-for="item in views" :value="item.id" :key="item.id">{{
item.name }}</Option> item.name }}</Option>
</Select> </Select>
<Button type="primary" @click="upload()" style="margin-left: 10px;">上传</Button> <Button type="primary" @click="upload()" style="margin-left: 10px;">上传</Button>
......
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