From 968a6bff52dcceb6e9a18838839c48228cb29394 Mon Sep 17 00:00:00 2001 From: zhangyang Date: Tue, 22 Mar 2022 17:38:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 4 +- src/components/menu.vue | 43 +- src/components/service-info/app-info.vue | 75 +- src/components/service-info/service-info.vue | 146 +- .../service-list/commodity-card-old.vue | 19 +- src/pages/authority/user/organizationuser.vue | 121 +- src/pages/service_shop/services_shop.vue | 51 +- src/pages/service_shop/shop_list-new.vue | 56 +- src/pages/service_shop/shopping_cart.vue | 8 +- src/pages/workbench/fwzc_fwcs.vue | 696 +---- src/pages/workbench/fwzc_fwcs_old.vue | 2672 +++++++++++++++++ 11 files changed, 3165 insertions(+), 726 deletions(-) create mode 100644 src/pages/workbench/fwzc_fwcs_old.vue diff --git a/config/index.js b/config/index.js index 94bd12b..a06a3a3 100644 --- a/config/index.js +++ b/config/index.js @@ -12,7 +12,7 @@ module.exports = { proxyTable: { "/apaas": { //target: "https://apaas.cztest.local/apaas/", - target: "https://apaas3.wodcloud.com/apaas/", + target: "https://apaas-jzapi.test.wodcloud.com/apaas/", changeOrigin: true, secure: false,//https证书安全设置为false pathRewrite: { @@ -27,7 +27,7 @@ module.exports = { } }, "/vmap": { - target: "https://apaas3.wodcloud.com/vmap/", + target: "https://apaas-jzapi.test.wodcloud.com/vmap/", changeOrigin: true, pathRewrite: { "^/vmap": "" diff --git a/src/components/menu.vue b/src/components/menu.vue index 1297c21..4c4a351 100644 --- a/src/components/menu.vue +++ b/src/components/menu.vue @@ -128,7 +128,7 @@ @click="settlement" size="small" class="shop_settlement" - >去购物车申请 + >去申请结算
-
- {{ v.menu_name }} -
+
{ + this.$api.serviceShop.delShoppingCart(query).then((response) => { if (response.data.success == 1) { this.$store.commit("setCartState"); this.getList(); @@ -297,7 +298,7 @@ export default { } }, getList() { - this.$api.serviceShop.getShoppingCart().then(response => { + this.$api.serviceShop.getShoppingCart().then((response) => { if (response.data.success == "1") { this.menuCartNum = response.data.data.valid ? response.data.data.valid.length @@ -315,12 +316,12 @@ export default { console.log(this.now_menu); }, getNowMenu() { - this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => { + this.$api.general.getNowMenu({ teamName: "APAAS3" }).then((response) => { if (response.data.success == 1) { let arr = (response.data.data[0] && response.data.data[0].Child) || []; let shop_index = arr.findIndex( - item => item.visit_url == "/shop/shopping_cart" + (item) => item.visit_url == "/shop/shopping_cart" ); if (shop_index != -1) { arr.splice(shop_index, 1); @@ -328,7 +329,7 @@ export default { } else { this.show_shop_menu = false; } - let user_index = arr.findIndex(item => item.visit_url == "/user"); + let user_index = arr.findIndex((item) => item.visit_url == "/user"); if (user_index != -1) { this.user_arr = arr[user_index].Child; arr.splice(user_index, 1); @@ -338,8 +339,8 @@ export default { this.getMenuIndex(); } }); - } - } + }, + }, }; diff --git a/src/components/service-info/app-info.vue b/src/components/service-info/app-info.vue index dd87ad2..87d633f 100644 --- a/src/components/service-info/app-info.vue +++ b/src/components/service-info/app-info.vue @@ -7,11 +7,17 @@ >
- +
- +
@@ -23,54 +29,95 @@
- + 立即申请 - - 加入购物车 + + 加入申请单
部署来源： - + {{datas.online_state_name}} 业务领域： - + {{datas.ywly_name}} 应用类型： - + {{datas.type_name}} 提供组织： - + {{datas.organization_name}} 联系人： - + {{datas.username}} 联系方式： - + {{datas.phone}} 上线时间： - + {{helper.dateStringTransform(datas.create_date)}} @@ -121,7 +168,7 @@ export default { }, addToCart() { // console.log("addToCart"); - console.log(this.datas) + console.log(this.datas); this.$http .post("/apaas/serviceapp/v3/shopcart/add", { service_id: 0, // 0表示不是服务 @@ -147,7 +194,7 @@ export default { }) .catch((error) => { this.$message({ - message: `添加购物车失败`, + message: `添加申请单失败`, type: "warning", }); }); diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue index 8039964..8d46bd0 100644 --- a/src/components/service-info/service-info.vue +++ b/src/components/service-info/service-info.vue @@ -6,8 +6,15 @@ v-if="data" >
-
- +
+ - - 共享 - + + 共享 + 受限 - 敏感 + 敏感 - 加入购物车 + 加入申请单
@@ -58,21 +78,36 @@ 服务类型： - + {{baseInfo.fwlx}} 服务领域： - - + + {{baseInfo.fwly}} 提供组织： - - + + {{baseInfo.tgzz}} @@ -80,22 +115,37 @@ 联系人： - - + + {{baseInfo.lxr}} 联系方式： - - + + {{baseInfo.lxfs}} 发布时间： - - + + {{helper.dateStringTransform(baseInfo.fbsj)}} @@ -103,22 +153,31 @@ 最近更新时间： - - + + {{helper.dateStringTransform(baseInfo.zjgxsj)}} 服务描述： - + {{baseInfo.fwms}}
- - +
@@ -152,29 +211,32 @@ export default { duration: 1, // 时长 showTime: false, baseInfo: { - fwlx: '', - fwly: '', - tgzz: '', - lxr: '', - lxfs: '', - fbsj: '', - zjgxsj: '', - fwms: '' + fwlx: "", + fwly: "", + tgzz: "", + lxr: "", + lxfs: "", + fbsj: "", + zjgxsj: "", + fwms: "", }, }), computed: {}, watch: {}, methods: { getBaseInfo() { - let data = {...this.data} - this.baseInfo.fwlx = data.data_service_type && data.data_service_type.length > 0? data.data_service_type.join(' ') : '' - this.baseInfo.fwly = data.sectors_name - this.baseInfo.tgzz = data.organization_name - this.baseInfo.lxr = data.user_name - this.baseInfo.lxfs = data.phone - this.baseInfo.fbsj = data.create_time - this.baseInfo.zjgxsj = data.update_date - this.baseInfo.fwms = data.descript + let data = { ...this.data }; + this.baseInfo.fwlx = + data.data_service_type && data.data_service_type.length > 0 + ? data.data_service_type.join(" ") + : ""; + this.baseInfo.fwly = data.sectors_name; + this.baseInfo.tgzz = data.organization_name; + this.baseInfo.lxr = data.user_name; + this.baseInfo.lxfs = data.phone; + this.baseInfo.fbsj = data.create_time; + this.baseInfo.zjgxsj = data.update_date; + this.baseInfo.fwms = data.descript; }, dateTransform(datestr = "") { return helper.dateStringTransform(datestr); @@ -217,7 +279,7 @@ export default { }) .catch((error) => { this.$message({ - message: `添加购物车失败`, + message: `添加申请单失败`, type: "warning", }); }); @@ -236,7 +298,7 @@ export default { }, }, created() { - this.getBaseInfo() + this.getBaseInfo(); }, }; diff --git a/src/components/service-list/commodity-card-old.vue b/src/components/service-list/commodity-card-old.vue index 54e46cc..9620fa8 100644 --- a/src/components/service-list/commodity-card-old.vue +++ b/src/components/service-list/commodity-card-old.vue @@ -1,7 +1,10 @@ @@ -72,7 +83,7 @@ export default { }) .catch((error) => { this.$message({ - message: `添加购物车失败`, + message: `添加申请单失败`, type: "warning", }); }); diff --git a/src/pages/authority/user/organizationuser.vue b/src/pages/authority/user/organizationuser.vue index ec0ea34..8b02f87 100644 --- a/src/pages/authority/user/organizationuser.vue +++ b/src/pages/authority/user/organizationuser.vue @@ -15,7 +15,12 @@ }}

- +

用户账号：

 - +

登录密码：

-
+
修改密码
@@ -53,20 +65,27 @@ - +

业务系统名称：

 - +

域名：

 - +

IP白名单：

-
+
新增 + >新增
@@ -108,9 +126,15 @@

邮箱：

 - +

用户组织机构：

- +

是否禁用：

- +

描述：

- +

登记人：

- +

登记日期：

- + @@ -153,12 +189,17 @@ @click="resetForm('form')" class="left" v-if="$route.name == 'usersadd'" - >重置 - 保存 - 取消 + >重置 + 保存 + 取消
@@ -186,7 +227,8 @@ export default { }); }; var check_email = (rule, value, callback) => { - var email_ruler = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + var email_ruler = + /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; setTimeout(() => { if (value && !email_ruler.test(value)) { callback(new Error("请输入正确邮箱地址")); @@ -196,7 +238,8 @@ export default { }); }; var checkip = (rule, value, callback) => { - var reg = /(((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3});/g; + var reg = + /(((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3});/g; setTimeout(() => { if (!reg.test(value)) { callback(new Error("请使用;隔开ip地址")); @@ -273,7 +316,7 @@ export default { { required: true, message: "请输入账号", trigger: "blur" }, { max: 16, message: "长度请不大于16个字符", trigger: "blur" }, { min: 3, message: "长度请不小于3个字符", trigger: "blur" }, - { validator: user_name_pass, trigger: "blur" } + { validator: user_name_pass, trigger: "blur" }, ], password: [ { required: true, message: "请输入密码", trigger: "blur" }, @@ -460,7 +503,7 @@ export default { // this.$message.error("获取组织失败"); } }) - .catch(function(response) { + .catch(function (response) { // this.$message.error("获取组织失败"); }); }, @@ -479,14 +522,14 @@ export default { user_id: this.form.account, // 用户名 password: this.form.password, user_name: this.form.nickname, // 昵称 - system_name: this.form.type>=2?this.form.systemname:'', //系统名称 + system_name: this.form.type >= 2 ? this.form.systemname : "", //系统名称 phone: this.form.phone + "", // 电话号 email: this.form.email, // 邮箱 - department_id: this.form.type>=2?this.form.origin:'', // 组织id + department_id: this.form.type >= 2 ? this.form.origin : "", // 组织id is_admin: this.form.type, state: this.form.able, // 用户状态，1——启用，0 禁用 - domain_name: this.form.type>=3?this.form.domain:'', // - ip_whitelist: this.form.type>=3?this.form.ip:[], // + domain_name: this.form.type >= 3 ? this.form.domain : "", // + ip_whitelist: this.form.type >= 3 ? this.form.ip : [], // description: this.form.desc, //描述 link_man: this.form.contact, }; @@ -509,14 +552,19 @@ export default { var temp = { user_id: this.form.account, // 用户名 user_name: this.form.nickname, // 昵称 - system_name: this.form.type>=2?this.form.systemname:'', //系统名称 + system_name: this.form.type >= 2 ? this.form.systemname : "", //系统名称 phone: this.form.phone + "", // 电话号 email: this.form.email, // 邮箱 - department_id: this.form.type>=2?this.form.origin:'', // 组织id + department_id: this.form.type >= 2 ? this.form.origin : "", // 组织id is_admin: this.form.type, state: this.form.able, // 用户状态，1——启用，0 禁用 - domain_name: this.form.type>=3?this.form.domain:'', // - ip_whitelist: this.form.type>=3?this.form.ip && this.form.ip.length ? this.form.ip : []:[], // + domain_name: this.form.type >= 3 ? this.form.domain : "", // + ip_whitelist: + this.form.type >= 3 + ? this.form.ip && this.form.ip.length + ? this.form.ip + : [] + : [], // description: this.form.desc, //描述 link_man: this.form.contact, }; @@ -541,7 +589,7 @@ export default { }, onSubmit(formName) { console.log("submit!"); - this.$refs[formName].validate((valid) => { + this.$refs[formName].validate((valid, err) => { if (valid) { if (this.edit_flag == 0) { this.check_user().then((res) => { @@ -556,6 +604,7 @@ export default { this.set_user(); } } else { + console.log(err); console.log("error submit!!"); return false; } diff --git a/src/pages/service_shop/services_shop.vue b/src/pages/service_shop/services_shop.vue index 2ab4ec1..3a9b1fe 100644 --- a/src/pages/service_shop/services_shop.vue +++ b/src/pages/service_shop/services_shop.vue @@ -1,19 +1,32 @@