Commit e3782ae4 authored by dupengyu's avatar dupengyu

修改限制

parent c0373a28
...@@ -379,10 +379,11 @@ ...@@ -379,10 +379,11 @@
<el-checkbox-group <el-checkbox-group
v-model="addFrom.executorParam.params" v-model="addFrom.executorParam.params"
:min="1" :min="1"
:max="100" :max="6"
> >
<el-checkbox <el-checkbox
v-for="city in itemOptions" v-for="city in itemOptions"
:disabled="city=='轮询标识'"
:label="city" :label="city"
:key="city" :key="city"
>{{ city }}</el-checkbox >{{ city }}</el-checkbox
...@@ -515,6 +516,7 @@ export default { ...@@ -515,6 +516,7 @@ export default {
}, },
visible: false, visible: false,
itemOptions: [ itemOptions: [
"轮询标识",
"测量周期", "测量周期",
"漏缆一般告警门限", "漏缆一般告警门限",
"漏缆重要告警门限", "漏缆重要告警门限",
...@@ -678,7 +680,7 @@ export default { ...@@ -678,7 +680,7 @@ export default {
executorFailRetryCount: "0", executorFailRetryCount: "0",
executorParam: { executorParam: {
equipId: "", equipId: "",
params: [], params: ['轮询标识'],
}, },
}, },
params: { params: {
......
...@@ -271,11 +271,11 @@ export default { ...@@ -271,11 +271,11 @@ export default {
this.paramsJson = JSON.parse(res.paramsJson); this.paramsJson = JSON.parse(res.paramsJson);
console.log("--------paramsJson------------"); console.log("--------paramsJson------------");
console.log(this.paramsJson); console.log(this.paramsJson);
this.openSetting = true;
}, },
async handleSetting(row) { async handleSetting(row) {
this.rowData = row; this.rowData = row;
this.handleSelectParam(row); this.handleSelectParam(row);
this.openSetting = true;
}, },
handleAutomatic() { handleAutomatic() {
this.open = true; this.open = true;
......
...@@ -24,5 +24,4 @@ export function formInitPwd(data = {}) { ...@@ -24,5 +24,4 @@ export function formInitPwd(data = {}) {
export const rules = { export const rules = {
userName: { required: true, message: '请输入用户名', trigger: 'blur' }, userName: { required: true, message: '请输入用户名', trigger: 'blur' },
deptId: { required: true, message: '请选择所在部门', trigger: 'blur' }
} }
...@@ -2,18 +2,8 @@ ...@@ -2,18 +2,8 @@
<div> <div>
<div class="title">修改基本信息</div> <div class="title">修改基本信息</div>
<el-form ref="form" :model="form" label-width="130px" :rules="rules"> <el-form ref="form" :model="form" label-width="130px" :rules="rules">
<el-form-item label="用户名:" prop="userName"> <el-form-item label="用户名:" prop="userName" >
<el-input v-model="form.userName" /> <el-input v-model="form.userName" disabled />
</el-form-item>
<el-form-item label="所在部门:" prop="deptId">
<el-select v-model="form.deptId" style="width:100%" placeholder="请选择">
<el-option
v-for="item in departList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="电话号码:"> <el-form-item label="电话号码:">
<el-input v-model="form.phone" /> <el-input v-model="form.phone" />
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="title">修改密码</div> <div class="title">修改密码</div>
<el-form ref="form" :model="form" label-width="100px" :rules="rules"> <el-form ref="form" :model="form" label-width="100px" :rules="rules">
<el-form-item label="用户名:" prop="userName"> <el-form-item label="用户名:" prop="userName">
<el-input v-model="form.userName" /> <el-input v-model="form.userName" disabled />
</el-form-item> </el-form-item>
<el-form-item label="原密码:" prop="originPwd"> <el-form-item label="原密码:" prop="originPwd">
<el-input type="password" v-model="form.originPwd" /> <el-input type="password" v-model="form.originPwd" />
......
...@@ -8,26 +8,11 @@ ...@@ -8,26 +8,11 @@
> >
<el-form ref="form" :model="form" label-width="100px" :rules="rules"> <el-form ref="form" :model="form" label-width="100px" :rules="rules">
<el-form-item label="用户名:" prop="userName"> <el-form-item label="用户名:" prop="userName">
<el-input v-model="form.userName" /> <el-input v-model="form.userName" :disabled="flag != 1" />
</el-form-item> </el-form-item>
<el-form-item label="真实姓名:" prop="realName"> <el-form-item label="真实姓名:" prop="realName">
<el-input v-model="form.realName" /> <el-input v-model="form.realName" />
</el-form-item> </el-form-item>
<el-form-item label="所在部门:" prop="deptId">
<el-select
v-model="form.deptId"
style="width: 100%"
placeholder="请选择"
>
<el-option
v-for="item in departList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="电话号码:"> <el-form-item label="电话号码:">
<el-input v-model="form.phone" /> <el-input v-model="form.phone" />
</el-form-item> </el-form-item>
...@@ -44,7 +29,7 @@ ...@@ -44,7 +29,7 @@
> >
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item v-if="flag==1">注:新用户初始密码为123456</el-form-item> <el-form-item v-if="flag == 1">注:新用户初始密码为123456</el-form-item>
</el-form> </el-form>
<span slot="footer"> <span slot="footer">
<el-button @click="cancel">取消</el-button> <el-button @click="cancel">取消</el-button>
...@@ -54,28 +39,28 @@ ...@@ -54,28 +39,28 @@
</template> </template>
<script> <script>
import { formInit, rules } from '../../const'; import { formInit, rules } from "../../const";
import { updateInfo, create } from '../../api'; import { updateInfo, create } from "../../api";
import { mapGetters } from 'vuex'; import { mapGetters } from "vuex";
export default { export default {
name: 'edit', name: "edit",
data() { data() {
return { return {
rules, rules,
form: formInit(), form: formInit(),
visible: false visible: false,
} };
}, },
props: { props: {
flag: { flag: {
type: Number, type: Number,
default: 1 default: 1,
}, },
curInfo: { curInfo: {
type: Object, type: Object,
default: () => { } default: () => {},
} },
}, },
watch: { watch: {
flag: { flag: {
...@@ -87,34 +72,34 @@ export default { ...@@ -87,34 +72,34 @@ export default {
}, },
}, },
computed: { computed: {
...mapGetters('depart', ['departList']), ...mapGetters("depart", ["departList"]),
editText() { editText() {
return `${this.flag === 1 ? '新增' : '编辑'}基本信息`; return `${this.flag === 1 ? "新增" : "编辑"}基本信息`;
} },
}, },
methods: { methods: {
cancel() { cancel() {
this.form = formInit(); this.form = formInit();
this.$emit('reset'); this.$emit("reset");
}, },
confrim() { confrim() {
let apiMap = { let apiMap = {
1: create, 1: create,
2: updateInfo, 2: updateInfo,
} };
let api = apiMap[this.flag]; let api = apiMap[this.flag];
this.$refs['form'].validate(valid => { this.$refs["form"].validate((valid) => {
let params = { let params = {
...this.form ...this.form,
} };
if (valid) { if (valid) {
api(params).then(() => { api(params).then(() => {
this.$message.success('操作成功'); this.$message.success("操作成功");
this.$emit('reset', true); this.$emit("reset", true);
}) });
}
})
} }
} });
} },
},
};
</script> </script>
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<el-form ref="form" :model="form" label-width="100px" :rules="rules"> <el-form ref="form" :model="form" label-width="100px" :rules="rules">
<el-form-item label="用户名:" prop="userName"> <el-form-item label="用户名:" prop="userName" >
<el-input v-model="form.userName" /> <el-input v-model="form.userName" disabled />
</el-form-item> </el-form-item>
<el-form-item label="原密码:" prop="originPwd"> <el-form-item label="原密码:" prop="originPwd">
<el-input type="password" v-model="form.originPwd" /> <el-input type="password" v-model="form.originPwd" />
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
/> />
<el-table-column prop="userName" label="用户名" align="center" /> <el-table-column prop="userName" label="用户名" align="center" />
<el-table-column prop="realName" label="真实姓名" align="center" /> <el-table-column prop="realName" label="真实姓名" align="center" />
<el-table-column prop="deptName" label="用户部门" align="center" />
<el-table-column prop="phone" label="电话号码" align="center" /> <el-table-column prop="phone" label="电话号码" align="center" />
<el-table-column prop="email" label="邮箱" align="center" /> <el-table-column prop="email" label="邮箱" align="center" />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
......
...@@ -24,5 +24,4 @@ export function formInitPwd(data = {}) { ...@@ -24,5 +24,4 @@ export function formInitPwd(data = {}) {
export const rules = { export const rules = {
userName: { required: true, message: '请输入用户名', trigger: 'blur' }, userName: { required: true, message: '请输入用户名', trigger: 'blur' },
deptId: { required: true, message: '请选择所在部门', trigger: 'blur' }
} }
...@@ -3,17 +3,7 @@ ...@@ -3,17 +3,7 @@
<div class="title">修改基本信息</div> <div class="title">修改基本信息</div>
<el-form ref="form" :model="form" label-width="130px" :rules="rules"> <el-form ref="form" :model="form" label-width="130px" :rules="rules">
<el-form-item label="用户名:" prop="userName"> <el-form-item label="用户名:" prop="userName">
<el-input v-model="form.userName" /> <el-input v-model="form.userName" disabled />
</el-form-item>
<el-form-item label="所在部门:" prop="deptId">
<el-select v-model="form.deptId" style="width:100%" placeholder="请选择">
<el-option
v-for="item in departList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="电话号码:"> <el-form-item label="电话号码:">
<el-input v-model="form.phone" /> <el-input v-model="form.phone" />
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="title">修改密码</div> <div class="title">修改密码</div>
<el-form ref="form" :model="form" label-width="100px" :rules="rules"> <el-form ref="form" :model="form" label-width="100px" :rules="rules">
<el-form-item label="用户名:" prop="userName"> <el-form-item label="用户名:" prop="userName">
<el-input v-model="form.userName" /> <el-input v-model="form.userName" disabled />
</el-form-item> </el-form-item>
<el-form-item label="原密码:" prop="originPwd"> <el-form-item label="原密码:" prop="originPwd">
<el-input type="password" v-model="form.originPwd" /> <el-input type="password" v-model="form.originPwd" />
......
...@@ -13,21 +13,6 @@ ...@@ -13,21 +13,6 @@
<el-form-item label="真实姓名:" prop="realName"> <el-form-item label="真实姓名:" prop="realName">
<el-input v-model="form.realName" /> <el-input v-model="form.realName" />
</el-form-item> </el-form-item>
<el-form-item label="所在部门:" prop="deptId">
<el-select
v-model="form.deptId"
style="width: 100%"
placeholder="请选择"
>
<el-option
v-for="item in departList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="电话号码:"> <el-form-item label="电话号码:">
<el-input v-model="form.phone" /> <el-input v-model="form.phone" />
</el-form-item> </el-form-item>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
> >
<el-form ref="form" :model="form" label-width="100px" :rules="rules"> <el-form ref="form" :model="form" label-width="100px" :rules="rules">
<el-form-item label="用户名:" prop="userName"> <el-form-item label="用户名:" prop="userName">
<el-input v-model="form.userName" /> <el-input v-model="form.userName" disabled />
</el-form-item> </el-form-item>
<el-form-item label="原密码:" prop="originPwd"> <el-form-item label="原密码:" prop="originPwd">
<el-input type="password" v-model="form.originPwd" /> <el-input type="password" v-model="form.originPwd" />
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
/> />
<el-table-column prop="userName" label="用户名" align="center" /> <el-table-column prop="userName" label="用户名" align="center" />
<el-table-column prop="realName" label="真实姓名" align="center" /> <el-table-column prop="realName" label="真实姓名" align="center" />
<el-table-column prop="deptName" label="用户部门" align="center" />
<el-table-column prop="phone" label="电话号码" align="center" /> <el-table-column prop="phone" label="电话号码" align="center" />
<el-table-column prop="email" label="邮箱" align="center" /> <el-table-column prop="email" label="邮箱" align="center" />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
......
...@@ -9,8 +9,8 @@ function resolve(dir) { ...@@ -9,8 +9,8 @@ function resolve(dir) {
const name = defaultSettings.title || '漏缆故障定位监测系统' // page title const name = defaultSettings.title || '漏缆故障定位监测系统' // page title
const port = process.env.port || process.env.npm_config_port || 8890 // dev port const port = process.env.port || process.env.npm_config_port || 8890 // dev port
// const href = 'http://101.126.159.207' // const href = 'http://101.126.159.207'
const href = 'http://127.0.0.1' // const href = 'http://127.0.0.1'
// const href = 'http://192.168.0.104' const href = 'http://192.168.0.115'
const rewriteDefaultConfig = { const rewriteDefaultConfig = {
changeOrigin: true, changeOrigin: true,
......
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