Commit 3e827bf5 authored by 刘殿昕's avatar 刘殿昕

数据分析权限优化,服务注册使用服务优化逻辑,流程设计优化校验

parent 8b79655c
...@@ -94,10 +94,8 @@ export default { ...@@ -94,10 +94,8 @@ export default {
this.navList = this.userNav; this.navList = this.userNav;
} else if (this.is_admin == 2) { } else if (this.is_admin == 2) {
this.navList = this.userNav1; this.navList = this.userNav1;
this.$router.push({ name: "orgServiceDataAnalysis" });
} else if (this.is_admin == 1) { } else if (this.is_admin == 1) {
this.navList = this.userNav2; this.navList = this.userNav2;
this.$router.push({ name: "superServiceDataAnalysis" });
} }
}, },
}, },
......
This diff is collapsed.
...@@ -127,7 +127,7 @@ export default { ...@@ -127,7 +127,7 @@ export default {
{ max: 16, message: "不能超过16个字符", trigger: "blur" }, { max: 16, message: "不能超过16个字符", trigger: "blur" },
], ],
workplace: [ workplace: [
{ required: true, message: "请选择工作区域", trigger: "blur" }, { required: true, message: "请选择工作区域", trigger: "change" },
], ],
desc: [ desc: [
{ required: true, message: "请输入流程描述", trigger: "blur" }, { required: true, message: "请输入流程描述", trigger: "blur" },
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</el-select> </el-select>
</el-input> </el-input>
<el-button <el-button
v-if="activeBtn == 0 || activeBtn == 4" v-if="activeBtn == 0 || activeBtn == 1 || activeBtn == 4"
@click="clickFwcs()" @click="clickFwcs()"
class="fwcs_btn_fwcs" class="fwcs_btn_fwcs"
>服务测试</el-button> >服务测试</el-button>
...@@ -135,7 +135,6 @@ ...@@ -135,7 +135,6 @@
v-model="skfwQqt" v-model="skfwQqt"
:label="item.id" :label="item.id"
>{{ item.name }}</el-radio> >{{ item.name }}</el-radio>
<el-button v-if="activeBtn == 1" @click="clickFwcs()" class="fwcs_btn_fwcs">服务测试</el-button>
</div> </div>
</div> </div>
<div v-if="activeBtn == 4 && zhyyVal != 34"> <div v-if="activeBtn == 4 && zhyyVal != 34">
...@@ -1022,7 +1021,6 @@ export default { ...@@ -1022,7 +1021,6 @@ export default {
self.jcxxtx = true; self.jcxxtx = true;
if (self.$store.state.znztParams) { if (self.$store.state.znztParams) {
let data = this.$store.state.znztParams; let data = this.$store.state.znztParams;
console.log(data);
self.form.name = data.name; self.form.name = data.name;
self.form.desc = data.descript; self.form.desc = data.descript;
self.form.area = Number(data.sectors); self.form.area = Number(data.sectors);
...@@ -1033,7 +1031,6 @@ export default { ...@@ -1033,7 +1031,6 @@ export default {
self.is_portal = true; self.is_portal = true;
} else if (self.$store.state.appBuilderParams) { } else if (self.$store.state.appBuilderParams) {
let data = this.$store.state.appBuilderParams; let data = this.$store.state.appBuilderParams;
console.log(data);
self.form.name = data.name; self.form.name = data.name;
self.form.desc = data.descript; self.form.desc = data.descript;
self.form.area = Number(data.sectors); self.form.area = Number(data.sectors);
......
...@@ -451,12 +451,12 @@ export default new Router({ ...@@ -451,12 +451,12 @@ export default new Router({
component: () => import("@/pages/data-analysis/service-control"), component: () => import("@/pages/data-analysis/service-control"),
}, },
{ {
path: "/data_analysis/super_service", // 数据分析中心服务-组织 path: "/data_analysis/super_service", // 数据分析中心服务-超管
name: "superServiceDataAnalysis", name: "superServiceDataAnalysis",
component: () => import("@/pages/data-analysis/super-service"), component: () => import("@/pages/data-analysis/super-service"),
}, },
{ {
path: "/data_analysis/super_application", // 数据分析中心应用-组织 path: "/data_analysis/super_application", // 数据分析中心应用-超管
name: "superApplicationDataAnalysis", name: "superApplicationDataAnalysis",
component: () => import("@/pages/data-analysis/super-application"), component: () => import("@/pages/data-analysis/super-application"),
}, },
......
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