hwj_system
/
scmy
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

key

Browse Source
master
jiminglei 1 year ago
parent bf3b4dbcab
commit dc474d6dc2
8 changed files with 251 additions and 1871 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      psdc-ui/.postcssrc.js
  2. 7
      psdc-ui/babel.config.js
  3. 27
      psdc-ui/src/api/emonitor/api.js
  4. 2
      psdc-ui/src/layout/components/Sidebar/Logo.vue
  5. 2
      psdc-ui/src/main.js
  6. 22
      psdc-ui/src/router/index.js
  7. 1635
      psdc-ui/src/views/bigview/index.vue
  8. 418
      psdc-ui/src/views/system/cl/index.vue

9
psdc-ui/.postcssrc.js
Unescape View File

@ -0,0 +1,9 @@
module.exports = {
"plugins": {
//添加如下代码
"postcss-px2rem-exclude": {
remUnit: 192,
exclude: /node_modules/
}
}
}

7
psdc-ui/babel.config.js
Unescape View File

@ -0,0 +1,7 @@
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
],
}

27
psdc-ui/src/api/emonitor/api.js
Unescape View File

@ -89,3 +89,30 @@ export function DevData(data) {
return request.post('system/device/index/daoruDevData',data)
}
//私钥管理
//分页查询
export function getKeyList(data) {
return request.post('system/private/key/byPage',data)
}
//生成私钥
export function addKey(data) {
return request.post('system/private/key/add',data)
}
//删除私钥
export function deleteKey(data) {
return request.post('system/private/key/del?'+data)
}
//修改私钥
export function setKey(data) {
return request.post('system/private/key/up',data)
}
//私钥列表
export function getKey() {
return request.get('system/key/selAll')
}
//修改私钥
export function resultKey(data) {
return request.post('system/key/getKey',data)
}

2
psdc-ui/src/layout/components/Sidebar/Logo.vue
Unescape View File

@ -25,7 +25,7 @@ defineProps({
}
})
const title = ref('电能替代分布式控制试验平台');
const title = ref('密钥管理');
const settingsStore = useSettingsStore();
const sideTheme = computed(() => settingsStore.sideTheme);
</script>

2
psdc-ui/src/main.js
Unescape View File

@ -6,7 +6,7 @@ import ElementPlus from 'element-plus'
import locale from 'element-plus/lib/locale/lang/zh-cn' // 中文语言
import '@/assets/styles/index.scss' // global css
import 'lib-flexible/flexible.js'
import App from './App'
import store from './store'
import router from './router'

22
psdc-ui/src/router/index.js
Unescape View File

@ -57,17 +57,17 @@ export const constantRoutes = [
component: () => import('@/views/error/401'),
hidden: true
},
{
path: '',
children: [
{
path: 'bigview',
component: () => import('@/views/bigview/index'),
name: 'bigview',
meta: { title: '首页', icon: 'dashboard', affix: true }
},
]
},
// {
// path: '',
// children: [
// {
// path: 'bigview',
// component: () => import('@/views/bigview/index'),
// name: 'bigview',
// meta: { title: '密钥生成', icon: 'dashboard', }
// },
// ]
// },
{
path: '/user',
component: Layout,

1635
psdc-ui/src/views/bigview/index.vue
View File

File diff suppressed because it is too large Load Diff

418
psdc-ui/src/views/system/cl/index.vue
Unescape View File

@ -3,11 +3,9 @@
<el-row :gutter="20">
<el-col :span="24" :xs="24">
<el-form :model="queryParams" ref="queryRef" :inline="true" label-width="88px">
<el-form-item label="策略名称:" prop="name">
<el-select v-model="data.sceneCode" placeholder="请选择" style="width: 240px" @change="changeSl">
<el-option label='所有' :value='0' />
<el-option :label='item.label' :value='item.sceneCode' :key="item.sceneCode" v-for="item in queryParams"/>
</el-select>
<el-form-item label="授权单位:" prop="name">
<el-input v-model="data.sceneCode" placeholder="请输入" style="width: 240px" >
</el-input>
</el-form-item>
<el-form-item>
@ -17,20 +15,20 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button>
<el-button type="primary" icon="Plus" @click="handleAdd">生成</el-button>
</el-col>
</el-row>
<div class="dev_control_table">
<el-table :data="data.timingList" height="500px">
<el-table-column label="序号" align="center" width="50" type="index"/>
<el-table-column label="策略名称" align="center" prop="strategyName" width="300"/>
<el-table-column label="策略描述" align="center" prop="strategyInfo"/>
<el-table-column label="私钥" align="center" prop="keyValue" width="300"/>
<el-table-column label="授权单位" align="center" prop="keyUnit" width="300"/>
<el-table-column label="创建时间" align="center" prop="createTime"/>
<!-- <el-table-column label="温度" align="center" prop="sceneValue"/>-->
<el-table-column label="更新时间" align="center" prop="updateTime"/>
<el-table-column label="操作" align="center" prop="handle">
<template v-slot="scope">
<el-button type="primary" size="small" icon="Edit" v-hasPermi="['system:cl:edit']" @click="handleXg(scope.row)">修改</el-button>
<el-button type="danger" size="small" :icon="Delete" @click="handleDel(scope.row.strategyCode)">删除</el-button>
<el-button type="danger" size="small" :icon="Delete" @click="handleDel(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -56,72 +54,10 @@
<el-form :model="timingForm" ref="userRef" label-width="88px">
<el-row>
<el-col :span="24">
<el-form-item label="策略名称:" prop="sceneName" >
<el-input v-model="addForm.strategyName" placeholder="请输入策略名称" />
<el-form-item label="授权单位:" prop="sceneName" >
<el-input v-model="addForm.strategyName" placeholder="请输入授权单位" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="策略描述:" prop="sceneRemark" >
<el-input v-model="addForm.strategyInfo" placeholder="请输入策略描述" />
</el-form-item>
</el-col>
<el-collapse v-model="activeNames" accordion>
<el-collapse-item v-for="item in data.items" :key="item.id" :title="item.title" :name="item.id">
<span style="width: 50px; margin-left: 20px;margin-bottom: 50px ">步骤名称：</span>
<el-input v-model="item.sceneName" placeholder="请输入步骤名称" style="width: 950px;margin-bottom: 10px "/>
<span style="width: 50px; margin-left: 20px ">步骤描述：</span>
<el-input v-model="item.sceneRemark" placeholder="请输入步骤描述" style="width: 950px"/>
<span style="width: 120px;display: inline-block ;margin: 20px">是否有限制条件</span>
<el-radio-group v-model="item.isJudge">
<el-radio :label="1">是</el-radio>
<el-radio :label="2">否</el-radio>
</el-radio-group>
<el-collapse v-model="item.isJudge" style="width: 1000px">
<el-collapse-item title="限制条件" :name="1">
<span>限制设备：</span>
<el-select v-model="item.judgeDevice" placeholder="请选择" style="width: 240px">
<el-option :label='item.deviceName' :value='item.deviceId' :key="item.deviceId" v-for="item in data.allsblb"/>
</el-select>
<span style="width: 4.7rem;display: inline-block ;margin: 20px">限制属性：</span>
<el-radio-group v-model="item.judgeElement">
<el-radio label="thermometer_value">温度</el-radio>
<el-radio label="thermometer_value_in">进水温度</el-radio>
<el-radio label="thermometer_value_out">出水温度</el-radio>
</el-radio-group>
<span style="width: 4.7rem;display: inline-block ;margin-left: 50px">限制值：</span>
<el-input type="number" v-model="item.judgeData" placeholder="请输入" style="width: 80px ; height: 25px" />
</el-collapse-item>
</el-collapse>
<!-- <el-checkbox :indeterminate="item.isIndeterminate" v-model="item.checkAll" @change="handleCheckAllChange">全选</el-checkbox>-->
<el-checkbox-group :max="1" v-model="item.checkedSblb" @change="handleCheckedCitiesChange" style="white-space: normal;display: inline-block">
<el-checkbox v-for="it in item.sblb" :label="it.deviceId" :key="it.deviceId" style="margin-bottom: 10px;width: 560px;">
<span style="width: 160px;display: inline-block">{{it.deviceName}}</span>
<span v-for="control in it.controlKey" style="margin-left: 20px">
<span style="width: 80px;display: inline-block">{{control.label}}</span>
<template v-if="control.label === '控制启停'">
<el-radio-group v-model="control.value">
<el-radio label="1">开启</el-radio>
<el-radio label="0">关闭</el-radio>
</el-radio-group>
</template>
<template v-else>
<el-input type="number" v-model="control.value" style="width: 120px ;margin: 10px;height: 25px"/>
</template>
</span>
</el-checkbox>
</el-checkbox-group>
<el-button type="danger" @click="removeStep(item.id)">删除</el-button>
</el-collapse-item>
</el-collapse>
<el-button type="primary" @click="addStep">添加步骤+</el-button>
</el-row>
</el-form>
<template #footer>
@ -136,70 +72,10 @@
<el-form :model="timingForm1" ref="userRef" label-width="88px">
<el-row>
<el-col :span="24">
<el-form-item label="策略名称:" prop="sceneName">
<el-input v-model="addForm1.strategyName" placeholder="请输入策略名称" maxlength="11" />
<el-form-item label="授权单位:" prop="sceneName">
<el-input v-model="addForm1.strategyName" placeholder="请输入授权单位" maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="策略描述:" prop="sceneRemark" >
<el-input v-model="addForm1.strategyInfo" placeholder="请输入策略描述" />
</el-form-item>
</el-col>
<el-collapse v-model="activeNames1" accordion>
<el-collapse-item v-for="item in data.items1" :key="item.id" :title="item.title" :name="item.id">
<span style="width: 50px; margin-left: 20px;margin-bottom: 50px ">步骤名称：</span>
<el-input v-model="item.sceneName" placeholder="请输入步骤名称" style="width: 950px;margin-bottom: 10px "/>
<span style="width: 50px; margin-left: 20px ">步骤描述：</span>
<el-input v-model="item.sceneRemark" placeholder="请输入步骤描述" style="width: 950px"/>
<span style="width: 120px;display: inline-block ;margin: 20px">是否有限制条件</span>
<el-radio-group v-model="item.isJudge">
<el-radio :label="1">是</el-radio>
<el-radio :label="2">否</el-radio>
</el-radio-group>
<el-collapse v-model="item.isJudge" style="width: 1000px">
<el-collapse-item title="限制条件" :name="1">
<span>限制设备：</span>
<el-select v-model="item.judgeDevice" placeholder="请选择" style="width: 240px">
<el-option :label='item.deviceName' :value='item.deviceId' :key="item.deviceId" v-for="item in data.allsblb"/>
</el-select>
<span style="width: 4.7rem;display: inline-block ;margin: 20px">限制属性：</span>
<el-radio-group v-model="item.judgeElement">
<el-radio label="thermometer_value">温度</el-radio>
<el-radio label="thermometer_value_in">进水温度</el-radio>
<el-radio label="thermometer_value_out">出水温度</el-radio>
</el-radio-group>
<span style="width: 4.7rem;display: inline-block ;margin-left: 50px">限制值：</span>
<el-input type="number" v-model="item.judgeData" placeholder="请输入" style="width: 80px ; height: 25px" />
</el-collapse-item>
</el-collapse>
<!-- <el-checkbox :indeterminate="item.isIndeterminate" v-model="item.checkAll" @change="handleCheckAllChange">全选</el-checkbox>-->
<el-checkbox-group :max="1" v-model="item.checkedSblb" @change="handleCheckedCitiesChange" style="white-space: normal;display: inline-block">
<el-checkbox v-for="it in item.sblb" :label="it.deviceId" :key="it.deviceId" style="margin-bottom: 10px;width: 560px;">
<span style="width: 160px;display: inline-block">{{it.deviceName}}</span>
<span v-for="control in it.controlKey" style="margin-left: 20px">
<span style="width: 80px;display: inline-block">{{control.label}}</span>
<template v-if="control.label === '控制启停'">
<el-radio-group v-model="control.value">
<el-radio label="1">开启</el-radio>
<el-radio label="0">关闭</el-radio>
</el-radio-group>
</template>
<template v-else>
<el-input type="number" v-model="control.value" style="width: 120px ;margin: 10px;height: 25px"/>
</template>
</span>
</el-checkbox>
</el-checkbox-group>
<el-button type="danger" @click="removeStep1(item.id)">删除</el-button>
</el-collapse-item>
</el-collapse>
<el-button type="primary" @click="addStep1">添加步骤+</el-button>
</el-row>
</el-form>
<template #footer>
@ -216,50 +92,9 @@
import {ElMessage,ElMessageBox} from 'element-plus'
import {Delete} from '@element-plus/icons-vue'
import {ref,reactive,watch,onMounted} from "vue";
import {getXl,getTb,postNew,getSb1,postXg,postDel,getSb} from '../../../api/emonitor/api'
import {getKeyList, addKey, deleteKey,setKey} from '../../../api/emonitor/api'
onMounted(()=>{
getSb().then((res)=>{
console.log('111',res)
var arr = []
for(var i in res.data){
arr=arr.concat(res.data[i].children)
}
console.log('Allsblb',arr)
data.allsblb=arr
})
getSb1().then((res)=>{
console.log('222',res)
var arr = []
for(var i in res.data){
arr=arr.concat(res.data[i].children)
}
console.log('sblb',arr)
data.sblb=arr
var brr = []
for(let a in arr){
brr.push(arr[a].deviceId)
}
data.AllName=brr
console.log(brr)
})
getXl().then((res)=>{
console.log(res)
data.queryParams=res.data
})
getTb({
"sceneCode": data.sceneCode,
"pageNum": currentPage.value,
"pageSize": pageSize.value
}).then((res)=>{
console.log(res)
data.timingList=res.rows
data.total=res.total
})
// postNew().then((res)=>{
// console.log(res)
// })
KeyList()
})
/** 筛选处理 */
const data = reactive({
@ -292,52 +127,24 @@ const data = reactive({
total:'',
timingList:[],
queryParams: '',
sceneCode:0,
sceneCode:null,
dateRange:[],
postData:[],
});
// const wat = watch(()=> data.sblb,(val) =>{
// console.log(val)
// })
//改变
function changeSl(){
console.log(data.sceneCode)
}
//搜索按钮
function handleQuery(){
getTb({
"sceneCode": data.sceneCode,
"pageNum": currentPage.value,
"pageSize": pageSize.value
}).then((res)=>{
console.log(res)
data.timingList=res.rows
data.total=res.total
})
KeyList()
}
//重置按钮
function resetQuery(){
data.sceneCode=0
data.sceneCode=null
currentPage.value=1
pageSize.value=10
getTb({
"sceneCode": data.sceneCode,
"pageNum": currentPage.value,
"pageSize": pageSize.value
}).then((res)=>{
console.log(res)
data.timingList=res.rows
data.total=res.total
})
}
function handleCheckAllChange(val) {
data.checkedSblb = val ? data.AllName : [];
data.isIndeterminate = false;
console.log(data.checkedSblb)
KeyList()
}
function handleCheckedCitiesChange(value) {
@ -345,16 +152,15 @@ function handleCheckedCitiesChange(value) {
data.checkAll = checkedCount === data.sblb.length;
data.isIndeterminate = checkedCount > 0 && checkedCount < data.sblb.length;
}
function handleCheckAllChange1(val) {
data.checkedSblb1 = val ? data.AllName : [];
data.isIndeterminate1 = false;
console.log(data.checkedSblb1)
}
function handleCheckedCitiesChange1(value) {
let checkedCount = value.length;
data.checkAll1 = checkedCount === data.sblb.length;
data.isIndeterminate1 = checkedCount > 0 && checkedCount < data.sblb.length;
//分页查询私钥
function KeyList(){
getKeyList({
"keyUnit": data.sceneCode,
"pageCurrent": 1,
"pageSize": 10
}).then((res)=>{
data.timingList=res.data
})
}
/** 数据表格处理 */
@ -393,31 +199,21 @@ const handleCurrentChange = (val) => {
}
/** 新增策略处理 */
/** 新增私钥处理 */
const open = ref(false);
const title = ref();
const open1 = ref(false);
const title1= ref();
const activeName = ref('1')
const addForm = reactive({
strategyInfo:'',
strategyName:'',
scenesList:[]
})
const addForm1 = reactive({
strategyCode:'',
strategyInfo:'',
strategyName:'',
scenesList:[]
id:''
})
const timingForm = reactive({
sceneName:'',
sceneRemark:'',
deviceVos:[],
isJudge:null,
judgeDevice:null,
judgeElement:null,
judgeData:null
})
const timingForm1 = reactive({
sceneName:'',
@ -434,75 +230,21 @@ const timingForm1 = reactive({
// outtemp:''
})
// const watchTime = watch(()=> timingForm.executeTime, (val) => {
// // console.log(val.toLocaleString())
// let date = new Date(val)
// let hours = date.getHours()
// let minutes = date.getMinutes()
// let seconds = date.getSeconds()
// console.log(`${hours}:${minutes}:${seconds}`)
// })
function handleAdd() {
getSb1().then((res)=>{
console.log('222',res)
var arr = []
for(var i in res.data){
arr=arr.concat(res.data[i].children)
}
console.log('sblb',arr)
data.sblb=arr
addForm.strategyName=''
addForm.strategyInfo=''
data.items=[{ id: 1, title: '第1步', content: `步骤1的内容`,
sblb:data.sblb,
isIndeterminate:false,
checkedSblb: [],
checkAll:false,
sceneName:'',
sceneRemark:'',
deviceVos:[],
isJudge:null,
judgeDevice:null,
judgeElement:null,
judgeData:null }]
open.value = true;
title.value = "新增策略";
})
title.value = "生成私钥";
};
function submitForm() {
for(let i in data.items){
let tempCheckedSblb = [];
data.items[i].checkedSblb.forEach(item => {
let tempItem = {
deviceId: item,
tempList:[]
};
// 根据 item 从 data.sblb 中找到对应的设备信息
let deviceInfo = data.items[i].sblb.find(sblbItem => sblbItem.deviceId === item);
if (deviceInfo) {
console.log('11111',deviceInfo)
tempItem.tempList = deviceInfo.controlKey
}
tempCheckedSblb.push(tempItem);
data.items[i].deviceVos=tempCheckedSblb
});
}
console.log('??????????',data.items)
addForm.scenesList=data.items
console.log(addForm)
postNew(addForm).then((res)=>{
addKey({
"keyUnit": addForm.strategyName
}).then((res)=>{
console.log(res)
ElMessage({type:"success",message:'新增成功！'})
handleQuery()
getXl().then((res)=>{
console.log(res)
data.queryParams=res.data
})
ElMessage({type:"success",message:'生成成功！'})
KeyList()
open.value = false;
})
};
@ -510,98 +252,38 @@ function cancel() {
open.value = false;
};
function handleXg(dat) {
addForm1.strategyName=dat.keyUnit
addForm1.id=dat.id
open1.value = true;
title1.value = "修改策略";
console.log('101111',dat)
addForm1.strategyCode=dat.strategyCode
addForm1.strategyName=dat.strategyName
addForm1.strategyInfo=dat.strategyInfo
data.items1=dat.scenesList
console.log(data.items1)
// var arr = []
// for(let i in dat.deviceVos){
// arr.push(dat.deviceVos[i].deviceId)
// }
// data.checkedSblb1=arr
// for (let i = 0;i < data.sblb.length ;i++ ){
// var deviceId = data.sblb[i].deviceId
// for (let j = 0;j < dat.deviceVos.length ;j++ ) {
// if ( deviceId === dat.deviceVos[j].deviceId){
// console.log(dat.deviceVos[j].tempValue)
// data.sblb[i].controlKey = dat.deviceVos[j].tempValue;
// }
// }
// }
// timingForm1.sceneName=dat.sceneName
// timingForm1.sceneRemark=dat.sceneRemark
// timingForm1.sceneCode = dat.sceneCode
// timingForm1.isJudge=dat.isJudge
// timingForm1.judgeDevice=dat.judgeDevice
// timingForm1.judgeElement=dat.judgeElement
// timingForm1.judgeData=dat.judgeData
title1.value = "修改私钥";
};
function submitForm1() {
for(let i in data.items1){
let tempCheckedSblb = [];
data.items1[i].checkedSblb.forEach(item => {
let tempItem = {
deviceId: item,
tempList:[]
};
// 根据 item 从 data.sblb 中找到对应的设备信息
let deviceInfo = data.items1[i].sblb.find(sblbItem => sblbItem.deviceId === item);
if (deviceInfo) {
tempItem.tempList = deviceInfo.controlKey
}
tempCheckedSblb.push(tempItem);
data.items1[i].deviceVos=tempCheckedSblb
});
}
console.log('??????????',data.items1)
addForm1.scenesList=data.items1
console.log(addForm1)
postXg(addForm1).then((res)=>{
setKey({
"id": addForm1.id,
"keyUnit": addForm1.strategyName
}).then((res)=>{
console.log(res)
ElMessage({type:"success",message:'修改成功！'})
getXl().then((res)=>{
console.log(res)
data.queryParams=res.data
})
handleQuery()
KeyList()
open1.value = false;
// data.sblb.map(item => {
// item.controlKey.map(temp => {
// temp.value = '';
// });
// });
})
};
function cancel1() {
open1.value = false;
// handleQuery()
// data.sblb.map(item => {
// item.controlKey.map(temp => {
// temp.value = '';
// });
// })
};
function handleDel(strategyCode) {
ElMessageBox.confirm("是否确认删除此策略？", "提示",{
ElMessageBox.confirm("是否确认删除此私钥？", "提示",{
confirmButtonText: "确认",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
console.log(strategyCode)
postDel({
"strategyCode":strategyCode
}).then((res) => {
deleteKey(
strategyCode
).then((res) => {
console.log(res)
ElMessage({type:"success",message:'删除成功！'})
getXl().then((res)=>{
console.log(res)
data.queryParams=res.data
})
handleQuery()
KeyList()
});
})
}

Write Preview
Loading…
Cancel
Save