Browse Source

更新

wangqin
hui 7 months ago
parent
commit
2c7ebcff94
  1. 13
      ruoyi-ui/src/assets/styles/JiHeExpressway.scss
  2. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
  3. 7
      ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue
  4. 55
      ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
  5. 4
      ruoyi-ui/vue.config.js

13
ruoyi-ui/src/assets/styles/JiHeExpressway.scss

@ -3,7 +3,7 @@
.fl-around{display: flex; justify-content: space-between;}
.fl-1{ flex: 1;}
.theme-jihe {
$lightBlue: #3de8ff;
$lightBlue: #a7eef8;
$textColor: #f4f4f4;
$inputHeight: 26px;
color: $textColor;
@ -266,6 +266,17 @@
}
}
.el-button{
border-radius: 100px;
}
.el-button--info{
background-color: #0E708B; border: none;
}
.el-button--primary{
background: #00B3CC;
}
.el-card{
background-color:#064258;
border: 1px solid #006a99;

4
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue

@ -39,8 +39,8 @@
</div>
</template>
<template #button>
<el-switch v-model="item.status" active-color="#0BD" inactive-color="#999" active-value="1"
inactive-value="0" @change="(value) => handleSwitcherChange(value, item) ">
<el-switch v-model="item.status" active-color="#0BD" inactive-color="#999" active-value="0"
inactive-value="1" @change="(value) => handleSwitcherChange(value, item) ">
</el-switch>
<Button @click.native="() => goStrategy(item)">
查看

7
ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue

@ -1,5 +1,5 @@
<template>
<Dialog v-model="modelVisible" :title="propData ? '修改' : '新增'" width="1400px">
<Dialog v-model="modelVisible" :title="propData.id ? '修改' : '新增'" width="1400px">
<div class="AddNEditDialog">
<!-- <Form :value="propData" class="form" ref="basicInfoForm" :formList="formList" column="1" labelWidth="80px" /> -->
<el-form ref="basicInfoForm" :model="editData" label-width="80px" :rules="groupBasicRules">
@ -13,10 +13,11 @@
<el-switch v-model="editData.status" active-value="1" inactive-value="0"></el-switch>
</el-form-item> -->
<div style="display: flex; justify-content: flex-end;">
<el-button @click="(modelVisible = false), (submitting = false)">
<el-button @click="(modelVisible = false), (submitting = false)" type="info" size="lg">
取消
</el-button>
<el-button type="primary" @click="onSaveTaskGroup('basicInfoForm')" :loading="submitting"> 提交 </el-button>
<el-button type="primary" @click="onSaveTaskGroup('basicInfoForm')" :loading="submitting" size="lg"> 提交
</el-button>
</div>
</el-form>
<template v-if="editData.id">

55
ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue

@ -15,41 +15,35 @@
新增
</ButtonGradient> -->
<InputSearch
ref="searchComp"
style="width: 480px"
:formList="searchFormList"
:formConfigOptions="{ dFormData: { eventState: '0' } }"
@handleSearch="handleSearch"
/>
<InputSearch ref="searchComp" style="width: 480px" :formList="searchFormList"
:formConfigOptions="{ dFormData: { eventState: '0' } }" @handleSearch="handleSearch" />
</div>
<!-- 内容 -->
<div class="body">
<Table :data="tableData" height="100%">
<el-table-column label="序号" type="index" :index="indexMethod" width="60"/>
<ElTableColumn label="发布时间" prop="releaseTime" width="180"/>
<ElTableColumn label="设备ID" prop="deviceId" width="120"/>
<ElTableColumn label="设备名称" prop="deviceName" />
<ElTableColumn label="桩号" prop="stakeMark" width="100" />
<el-table-column
prop="direction"
label="方向"
width="110"
:formatter="formatterDirection" />
<ElTableColumn label="内容" prop="releaseContent" width="500" header-align="center">
<el-table-column label="序号" type="index" :index="indexMethod" width="60" />
<ElTableColumn label="发布时间" prop="operTime" width="180" />
<ElTableColumn label="设备ID" prop="dcDeviceId" width="120" />
<ElTableColumn label="设备名称" prop="dcDeviceName" />
<!-- <ElTableColumn label="桩号" prop="stakeMark" width="100" /> -->
<!-- <el-table-column prop="direction" label="方向" width="110" :formatter="formatterDirection" /> -->
<ElTableColumn label="内容" prop="operParam" width="500" header-align="center">
<template slot-scope="scope">
<el-carousel direction="horizontal" :autoplay="false" indicator-position="inside" height="80px" arrow="never" class="board_shower">
<el-carousel-item v-for="item,index in JSON.parse(scope.row.releaseContent)" :key="index">
<BoardRecordPreview :tpl="item" style="height: 100%;"/>
{{ scope.row.operParam }}
<!-- {{ scope.row.operParam && scope.row.operParam.functions && scope.row.operParam.functions[1] && scope.row.operParam.functions[1].params }} -->
<!-- <el-carousel direction="horizontal" :autoplay="false" indicator-position="inside" height="80px"
arrow="never" class="board_shower">
<el-carousel-item v-for="item,index in JSON.parse(scope.row.operParam).paremeters" :key="index">
<BoardRecordPreview :tpl="item" style="height: 100%;" />
</el-carousel-item>
</el-carousel>
</el-carousel> -->
</template>
</ElTableColumn>
<ElTableColumn label="状态" prop="releaseStatus" width="80" :formatter="formatterStatus"/>
<ElTableColumn label="用户名" prop="releaseUserName" width="120" />
<ElTableColumn label="用户ID" prop="releaseUserId" width="120" />
<ElTableColumn label="用户IP" prop="releaseIp" width="200" />
<ElTableColumn label="状态" prop="status" width="80" :formatter="formatterStatus" />
<ElTableColumn label="用户名" prop="operName" width="120" />
<!-- <ElTableColumn label="用户ID" prop="operName" width="120" /> -->
<ElTableColumn label="用户IP" prop="operIp" width="200" />
<!--
<ElTableColumn label="操作" width="210">
<template slot-scope="scope">
@ -63,9 +57,9 @@
<!-- 分页 -->
<div class="footer">
<Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'" :page-sizes="[10, 20, 30, 40, 50]"
:page-size="searchData.pageSize" :current-page.sync="searchData.pageNum" layout="total, sizes, prev, pager, next"
:total="total">
<Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'"
:page-sizes="[10, 20, 30, 40, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
layout="total, sizes, prev, pager, next" :total="total">
</Pagination>
</div>
</div>
@ -102,6 +96,7 @@ export default {
searchData: {
pageSize: 20,
pageNum: 1,
dcDeviceType: "2"
},
phrasesData: [],
process: []
@ -157,7 +152,7 @@ export default {
},
initData() {
request({
url: `/business/boardReleaseLog/list`,
url: `/business/dcOperLog/list`,
method: "get",
params: this.searchData,
}).then((result) => {

4
ruoyi-ui/vue.config.js

@ -52,9 +52,9 @@ module.exports = {
// target: `http://10.0.81.204:8087`, //现场后台 刘文阁
// target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
// target: `http://10.168.78.135:8087`, //王钦
// target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
// target: `http://10.168.68.42:8087`, //王思祥
target: `http://10.168.72.174:8087`, //赵祥龙
// target: `http://10.168.72.174:8087`, //赵祥龙
// target: `http://10.168.65.156:8097`, //孟
// target: `http://10.168.56.165:8087`, //王家宝
// target: `http://10.168.77.128:8087`, //王兴琳

Loading…
Cancel
Save