From 850dba9b2eef861e2bc550092f75e7dd6cd9621b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 19 四月 2024 17:57:40 +0800
Subject: [PATCH] 滚动条
---
vue.config.js | 4 +-
public/index.html | 4 +-
src/api/platform/check-template.js | 2
src/views/system/rule/index.vue | 76 +++++++------------------------------
4 files changed, 20 insertions(+), 66 deletions(-)
diff --git a/public/index.html b/public/index.html
index 8a1815d..4895092 100644
--- a/public/index.html
+++ b/public/index.html
@@ -18,7 +18,7 @@
height: 100%;
margin: 0px;
padding: 0px;
- overflow: hidden;
+ /*overflow: hidden;*/
}
@@ -215,4 +215,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/api/platform/check-template.js b/src/api/platform/check-template.js
index fd8dee2..95daedf 100644
--- a/src/api/platform/check-template.js
+++ b/src/api/platform/check-template.js
@@ -26,7 +26,7 @@
})
}
-// 澶嶅埗鑰冩牳瑙勫垯
+// 澶嶅埗鑰冩牳妯℃澘
export function copyCheckTemplate(data) {
return request({
url: '/check/template/copy',
diff --git a/src/views/system/rule/index.vue b/src/views/system/rule/index.vue
index fdc5ca9..756382a 100644
--- a/src/views/system/rule/index.vue
+++ b/src/views/system/rule/index.vue
@@ -10,9 +10,9 @@
<el-row type="flex" justify="start" v-for="(items, index) in groupData(videoData)">
<el-col :span="4" v-for="item in items" :key="item.id">
- <el-card :style="{ borderBottomColor: getStatusColor(item.auditStatus) }"style="width:150px;height: 150px;text-align: center;border-bottom-width: 3px;">
+ <el-card style="width:150px;height: 150px;text-align: center;border-bottom-width: 3px;">
<i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
- <div style="font-size:12px; text-align: center; height: 25px;">{{ item.name }} </div>
+ <div style="font-size:12px; text-align: center; height: 25px;">{{ item.ruleName }} </div>
<div class="bottom clearfix">
<el-button type="text" class="button" @click="handleUpdate(item)">淇敼</el-button>
</div>
@@ -31,9 +31,9 @@
<el-row type="flex" justify="start" v-for="(items, index) in groupData(carData)">
<el-col :span="4" v-for="item in items" :key="item.id">
- <el-card :style="{ borderBottomColor: getStatusColor(item.auditStatus) }"style="width:150px;height: 150px;text-align: center;border-bottom-width: 3px;">
+ <el-card style="width:150px;height: 150px;text-align: center;border-bottom-width: 3px;">
<i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
- <div style="font-size:12px; text-align: center; height: 25px;">{{ item.name }} </div>
+ <div style="font-size:12px; text-align: center; height: 25px;">{{ item.ruleName }} </div>
<div class="bottom clearfix">
<el-button type="text" class="button" @click="handleUpdate(item)">淇敼</el-button>
</div>
@@ -52,9 +52,9 @@
<el-row type="flex" justify="start" v-for="(items, index) in groupData(faceData)">
<el-col :span="4" v-for="item in items" :key="item.id">
- <el-card :style="{ borderBottomColor: getStatusColor(item.auditStatus) }"style="width:150px;height: 150px;text-align: center;border-bottom-width: 3px;">
+ <el-card style="width:150px;height: 150px;text-align: center;border-bottom-width: 3px;">
<i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
- <div style="font-size:12px; text-align: center; height: 25px;">{{ item.name }} </div>
+ <div style="font-size:12px; text-align: center; height: 25px;">{{ item.ruleName }} </div>
<div class="bottom clearfix">
<el-button type="text" class="button" @click="handleUpdate(item)">淇敼</el-button>
</div>
@@ -69,17 +69,7 @@
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="瑙勫垯鍚嶇О" prop="ruleName">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ヨ鍒欏悕绉�"/>
- </el-form-item>
- <el-form-item label="鑰冩牳绫诲瀷" prop="examineCategory">
- <el-select v-model="form.examineCategory" placeholder="鑰冩牳绫诲瀷">
- <el-option
- v-for="dict in dict.type.platform_examine_category"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
+ <el-input v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�"/>
</el-form-item>
<el-form-item label="瑙勫垯绫诲瀷" prop="ruleCategory">
<el-select v-model="form.ruleCategory" placeholder="瑙勫垯绫诲瀷">
@@ -87,7 +77,7 @@
v-for="dict in dict.type.platform_rule_category"
:key="dict.value"
:label="dict.label"
- :value="dict.value"
+ :value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
@@ -154,7 +144,6 @@
<script>
import { listCheckRule, getCheckRule, delCheckRule, addCheckRule, updateCheckRule } from "@/api/platform/check-rule";
-import { templateSelect} from "@/api/platform/check-template"
export default {
name: "CheckRule",
dicts: ['platform_audit_state','platform_rule_category'],
@@ -191,47 +180,9 @@
ruleCategory: null,
templateId: null,
},
- videoData: [
- { name: '骞冲彴鍦ㄧ嚎鐜�', icon: 'el-icon-connection', ruleDescription: '鐪佸巺瀵瑰競绾у叡浜拰鑱旂綉骞冲彴杩涜瀹炴椂鐩戞祴锛屽競绾у叡浜�/鑱旂綉骞冲彴姣忔湀绂荤嚎鎬绘椂闀垮湪30鍒嗛挓浠ュ唴鐨勫钩鍙板湪绾跨巼涓�100%锛屾瘡瓒呰繃30鍒嗛挓鎵�10涓櫨鍒嗙偣锛屾墸瀹屼负姝€��' +
- '姣忎釜鏈堝簳鏈�鍚�4涓伐浣滄棩涓洪鐣欑殑璋冭瘯鏃堕棿锛屽彲杩涜骞冲彴瀵规帴璋冭瘯鎴栬�呭崌绾ф敼閫狅紝骞冲彴瀵规帴璋冭瘯鎴栬�呭崌绾ф敼閫犻』鎻愬墠鍚戠渷鍘呮姤澶囥�傞櫎' +
- '姣忔湀搴�4涓伐浣滄棩锛屽叾浣欐椂闂存姤澶囨瘡娆℃墸10涓櫨鍒嗙偣锛屾瘡娆℃姤澶囦笉瓒呰繃24灏忔椂锛屾瘡鏈堜笉瓒呰繃3娆°�傦紙閲嶅ぇ鐗规畩鎯呭喌锛屽閲嶅ぇ鑷劧鐏惧绛夋姤鍘呴瀵兼壒绀猴級', examineCategory:0,ruleCategory:'0', auditStatus: 'approved'},
- { name: '涓�鏈轰竴妗ｅ悎鏍肩巼', icon: 'el-icon-folder', ruleDescription: '杩愮淮骞冲彴姣忔湀鍒濆鍚勫湴涓婁紶鑷宠仈缃戝钩鍙扮殑鈥滀竴鏈轰竴妗ｂ�濇暟鎹簱涓殑鎽勫儚鏈烘。妗堟暟鎹繘琛岃川閲忔牎楠岋紝瀵瑰繀濉」濉姤鍑嗙‘銆佽鑼冪殑妗ｆ鏁版嵁瑙嗕负鍚堟牸銆俓n' +
- '涓�鏈轰竴妗ｅ悎鏍肩巼=鍚堟牸鐨勬。妗堟暟鎹潯鏁�/妗ｆ鏁版嵁鎬绘潯鏁�', examineCategory:0,ruleCategory:'0', auditStatus: 'pending' },
- { name: '涓�鏈轰竴妗ｆ敞鍐岀巼', icon: 'el-icon-folder', ruleDescription: '杩愮淮骞冲彴姣忔湀瀵圭渷鍘呰鍥惧簱鐨勫墠绔憚鍍忔満鐐逛綅鏁伴噺鍜屼竴鏈轰竴妗ｇ殑鏁版嵁鍖归厤銆傦紙涓婃湀搴曟渶鍚庝竴澶╃‘璁や竴鏈轰竴妗ｈ溅杈嗐�佷汉鑴哥偣浣嶆暟锛�1鍙风敱瑙嗗浘搴撲晶杩涜鑰冩牳锛塡n' +
- '浜鸿劯鍗″彛璧勪骇娉ㄥ唽鐜�=璧勪骇搴撶櫥璁板湪鐢ㄧ殑浜鸿劯鍗″彛鏁伴噺/锛堟湭娉ㄥ唽鐨勫湪绾夸汉鑴稿崱鍙ｆ暟閲�+璧勪骇搴撶櫥璁板湪鐢ㄧ殑浜鸿劯鍗″彛鏁伴噺锛塡n' +
- '杞﹁締鍗″彛璧勪骇娉ㄥ唽鐜�=璧勪骇搴撶櫥璁板湪鐢ㄧ殑浜鸿劯鍗″彛鏁伴噺/锛堟湭娉ㄥ唽鐨勫湪绾夸汉鑴稿崱鍙ｆ暟閲�+璧勪骇搴撶櫥璁板湪鐢ㄧ殑浜鸿劯鍗″彛鏁伴噺锛�', examineCategory:0,ruleCategory:'0', auditStatus: 'rejected' },
- { name: '妗ｆ鑰冩牳姣�', icon: 'el-icon-folder', ruleDescription: '鎻忚堪淇℃伅', examineCategory:0,ruleCategory:'0',auditStatus: 'approved' },
- { name: '鐐逛綅鍦ㄧ嚎鐜�', icon: 'el-icon-search', ruleDescription: '鎻忚堪淇℃伅', examineCategory:0,ruleCategory:'0',auditStatus: 'approved'},
- { name: '褰曞儚鍙敤鐜�', icon: 'el-icon-turn-off', ruleDescription: '鎻忚堪淇℃伅',examineCategory:0,ruleCategory:'0',auditStatus: 'approved'},
- { name: '鏍囨敞姝ｇ‘鐜�', icon: 'el-icon-place', ruleDescription: '鎻忚堪淇℃伅', examineCategory:0,ruleCategory:'0',auditStatus: 'approved' },
- { name: '鏍℃椂姝ｇ‘鐜�', icon: 'el-icon-place', ruleDescription: '鎻忚堪淇℃伅', examineCategory:0,ruleCategory:'0',auditStatus: 'approved' },
- { name: '閲嶇偣鐐逛綅鍦ㄧ嚎鐜�', icon: 'el-icon-place', ruleDescription: '鎻忚堪淇℃伅', examineCategory:0,ruleCategory:'0',auditStatus: 'approved'},
- { name: '閲嶇偣鐐逛綅鏍℃椂姝ｇ‘鐜�', icon: 'el-icon-place', ruleDescription: '鎻忚堪淇℃伅', examineCategory:0,ruleCategory:'0',auditStatus: 'approved' },
- { name: '閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�', icon: 'el-icon-place', ruleDescription: '鎻忚堪淇℃伅', examineCategory:0,ruleCategory:'0',auditStatus: 'approved' },
- { name: '瑙嗛鍥惧儚璧勬簮瀹夊叏绠＄悊', icon: 'el-icon-place', ruleDescription: '鎻忚堪淇℃伅', examineCategory:0,ruleCategory:'0',auditStatus: 'approved' },
- ],
- carData: [
- { name: '瑙嗗浘搴撳鎺ョǔ瀹氭��', icon: 'el-icon-truck', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '鐐逛綅鍦ㄧ嚎鐜�', icon: 'el-icon-truck', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼', icon: 'el-icon-truck', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�', icon: 'el-icon-truck', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�', icon: 'el-icon-truck', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�', icon: 'el-icon-truck', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-truck', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�', icon: 'el-icon-truck', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '杞﹁締鍗″彛璁惧url鍙敤鎬�', icon: 'el-icon-truck', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�', icon: 'el-icon-truck', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- ],
- faceData: [
- { name: '瑙嗗浘搴撳鎺ョǔ瀹氭��', icon: 'el-icon-alarm-clock', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '鐐逛綅鍦ㄧ嚎鐜�', icon: 'el-icon-user', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '鐩綍涓�鑷寸巼', icon: 'el-icon-data-line', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�', icon: 'el-icon-timer', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '璁惧鎶撴媿鍥剧墖鍚堟牸鎬�', icon: 'el-icon-money', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-data-analysis', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�', icon: 'el-icon-data-analysis', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- { name: '浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�', icon: 'el-icon-data-analysis', ruleDescription: '鎻忚堪淇℃伅', auditStatus: 'approved' },
- ],
+ videoData: [],
+ carData: [],
+ faceData: [],
activeIndex: '0',
// 琛ㄥ崟鍙傛暟
form: {},
@@ -264,7 +215,9 @@
this.queryParams["end"] = this.daterangeCreateTime[1];
}
listCheckRule(this.queryParams).then(response => {
- this.checkRuleList = response.rows;
+ this.videoData = response.data.videoRules;
+ this.faceData = response.data.faceRules;
+ this.carData = response.data.carRules;
this.total = response.total;
this.loading = false;
});
@@ -387,4 +340,5 @@
.el-menu{
margin: 10px auto;
}
+
</style>
diff --git a/vue.config.js b/vue.config.js
index 022ec47..3cda444 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,8 +35,8 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `http://localhost:8080`,
- target: `http://192.168.3.87:8080`,
+ target: `http://localhost:8080`,
+ // target: `http://192.168.3.87:8080`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.8.0