From 3206bc349f96cea28fcbf6b327ad4417a15c4246 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Thu, 13 Jun 2024 16:21:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login.vue | 4 +-
src/views/system/article/index.vue | 26 ++++++-
src/views/system/articleClassify/index.vue | 8 +-
src/views/system/dept/index.vue | 32 ++++++--
src/views/system/device/index.vue | 88 ++++++++++++++++------
src/views/system/fee/index.vue | 47 ++++++++----
6 files changed, 153 insertions(+), 52 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 568cd57..fe9b4b1 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -72,8 +72,8 @@ export default {
return {
codeUrl: "",
loginForm: {
- username: "admin",
- password: "admin123",
+ username: "",
+ password: "",
rememberMe: false,
code: "",
uuid: ""
diff --git a/src/views/system/article/index.vue b/src/views/system/article/index.vue
index 33c58f7..48b7da9 100644
--- a/src/views/system/article/index.vue
+++ b/src/views/system/article/index.vue
@@ -126,6 +126,18 @@
+
+
+
+
+
+
+
@@ -171,14 +183,18 @@
import { listArticle, getArticle, delArticle, addArticle, updateArticle,classifyTreeSelect } from "@/api/system/article";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listArea } from '@/api/system/area'
export default {
name: "Article",
components: { Treeselect },
data() {
return {
+ // userName: undefined,
// 遮罩层
loading: true,
+ // 运营区下拉框
+ areaOptions: [],
// 选中数组
ids: [],
// 非单个禁用
@@ -218,6 +234,8 @@ export default {
};
},
created() {
+ // console.log("当前用户信息：",this.$store.state.user.name)
+ // this.userName = this.$store.state.user.name;
this.getList();
this.getClassifyTree();
},
@@ -282,8 +300,12 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
- this.open = true;
- this.title = "添加文章";
+ listArea(this.queryParams).then(response => {
+ this.areaOptions = response.rows;
+ this.open = true;
+ this.title = "添加文章";
+ });
+
},
/** 修改按钮操作 */
handleUpdate(row) {
diff --git a/src/views/system/articleClassify/index.vue b/src/views/system/articleClassify/index.vue
index 99e7523..7b0b9b3 100644
--- a/src/views/system/articleClassify/index.vue
+++ b/src/views/system/articleClassify/index.vue
@@ -33,7 +33,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['system:dept:add']"
+ v-hasPermi="['system:articleClassify:add']"
>新增
@@ -75,14 +75,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:dept:edit']"
+ v-hasPermi="['system:articleClassify:edit']"
>修改
新增
删除
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 5831756..0a091ea 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -164,29 +164,48 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
支付相关
@@ -381,6 +400,7 @@ export default {
this.open = true;
this.title = "修改运营商";
this.form.isProfitSharing = this.form.isProfitSharing === 'true';
+ this.form.isUsePlatformApp = this.form.isUsePlatformApp === 'true';
listArea().then(response => {
this.areaOptions = response.rows;
});
diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index 69df225..e427fe2 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -97,8 +97,8 @@
-
-
+
+
@@ -116,7 +116,7 @@
width="180"
trigger="hover">
-
+
查看
@@ -126,10 +126,10 @@
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
修改
+ {{ scope.row.status === '0' ? '上架' : '下架' }}
+
+
+
+
+
-
+
+
+
+
+
+
+
+
@@ -226,7 +250,8 @@
- {{ form.mac }}
+ {{ form.mac }}
+ {{ form.sn }}
{{ form.statusStr }}
@@ -299,6 +324,7 @@ import { parseTime } from '../../../utils/ruoyi';
import LocationMap from '@/components/Map/location/LocationMap.vue';
import { listModel} from "@/api/system/model";
import QrCode from "@/components/QrCode/index.vue";
+import { listArea } from '@/api/system/area'
export default {
name: "Device",
@@ -339,6 +365,8 @@ export default {
open2: false,
// 设备型号下拉框
modelOptions: [],
+ // 运营区下拉框
+ areaOptions: [],
// 通过key重新渲染area-map组件
// key: 0,
// 查询参数
@@ -363,19 +391,15 @@ export default {
sn: [
{ required: true, message: "SN不能为空", trigger: "blur" }
],
+ mac: [
+ { required: true, message: "MAC不能为空", trigger: "blur" }
+ ],
+ areaId: [
+ { required: true, message: "运营区不能为空", trigger: "blur" }
+ ],
}
};
},
- computed: {
- // 二维码文本
- qrCodeText() {
- return (sn) => {
- let text = `https://dianche.chuantewulian.cn?sn=`+ sn;
- console.log("qrCodeText===============", text)
- return text;
- }
- },
- },
created() {
this.getList();
console.log("------"+this.activeIndex)
@@ -428,6 +452,13 @@ export default {
this.deviceList = response.rows;
this.total = response.total;
this.loading = false;
+ listModel(this.queryParams).then(response => {
+ this.modelOptions = response.rows;
+ listArea(this.queryParams).then(response => {
+ this.areaOptions = response.rows;
+
+ });
+ });
});
},
// 取消按钮
@@ -478,11 +509,8 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
- listModel(this.queryParams).then(response => {
- this.modelOptions = response.rows;
- this.open = true;
- this.title = "添加设备";
- });
+ this.open = true;
+ this.title = "添加设备";
},
/** 详情按钮 */
handleView(row) {
@@ -500,6 +528,22 @@ export default {
this.title = "修改设备";
});
},
+ handleListing(row) {
+ this.reset();
+ const deviceId = row.deviceId || this.ids
+ getDevice(deviceId).then(response => {
+ let form1 = response.data;
+ let text = form1.status === '0'? '上架': '下架';
+ form1.status = form1.status === '0'? '1': '0';
+ this.$modal.confirm('是否确认'+text+'设备MAC为"' + form1.mac + '"的设备吗？').then(function() {
+ return updateDevice(form1);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("操作成功");
+ }).catch(() => {
+ });
+ });
+ },
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/system/fee/index.vue b/src/views/system/fee/index.vue
index edbc28c..cb4194e 100644
--- a/src/views/system/fee/index.vue
+++ b/src/views/system/fee/index.vue
@@ -77,6 +77,16 @@
+
+
+
+
+
@@ -258,19 +268,19 @@
-
-
- 订单生成后
-
- 小时
-
-
- 自定义时刻
-
-
-
-
+
+
+ 订单生成后
+
+ 小时
+
+
+ 自定义时刻
+
+
+
+
@@ -301,7 +311,7 @@