admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-06 15:42:53 +08:00
parent 8a83f84459
commit 702e6fa5b5
12 changed files with 575 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/index/index.js
View File

@ -38,10 +38,10 @@ import 'quill/dist/quill.core.css'
import 'quill/dist/quill.snow.css'
import 'quill/dist/quill.bubble.css'
import VConsole from 'vconsole';
if (process.env.NODE_ENV == 'development'){
new VConsole();
}
// import VConsole from 'vconsole';
// if (process.env.NODE_ENV == 'development'){
// new VConsole();
// }
const hls = require('videojs-contrib-hls')
Vue.use(hls)
Vue.use(VueQuillEditor) // 注册富文本编辑器

26
src/store/index.js
View File

@ -48,24 +48,24 @@ export default new Vuex.Store({
PAGESIZRS: [10, 20, 30, 50],
// UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色
// FILEURL:' http://101.43.164.214:11111/image/',// 百色
UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
// UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
// FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
// WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
// UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
// FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL:
// window.location.protocol +
// "//" +
// window.location.host +
// "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
BASEURL: baseUrl
? baseUrl
: window.location.protocol + "//" + window.location.host + "/", //正式环境
UPLOADURL:
window.location.protocol +
"//" +
window.location.host +
"/upload/image", //正式环境
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl

194
src/views/infoCenter/allInfo/componentsModule/dataListData.vue
View File

@ -18,7 +18,7 @@
ref="searchForm"
:model="searchForm"
size="medium"
style="width: 100%;display: flex;align-items: center;"
style="width: 100%; display: flex; align-items: center"
>
<el-form-item label="标题内容" prop="title">
<el-input
@ -28,22 +28,14 @@
/>
</el-form-item>
<el-form-item label="应用" prop="app">
<!-- suffix-icon="el-icon-search" -->
<el-input
placeholder="请输入"
clearable
v-model="searchForm.app"
/>
<!-- suffix-icon="el-icon-search" -->
<el-input placeholder="请输入" clearable v-model="searchForm.app" />
</el-form-item>
<el-form-item label="标签" prop="tag">
<el-input
placeholder="请输入"
clearable
v-model="searchForm.tag"
/>
<el-input placeholder="请输入" clearable v-model="searchForm.tag" />
</el-form-item>
<!-- 时间 -->
<el-form-item label="接收时间" style="margin-right: auto;">
<el-form-item label="接收时间" style="margin-right: auto">
<el-date-picker
size="medium"
v-model="timeRange"
@ -56,24 +48,39 @@
</el-date-picker>
</el-form-item>
<!-- 条件查询按钮 -->
<el-form-item style="margin-right: 0px;">
<el-form-item style="margin-right: 0px">
<el-button type="primary" plain @click="searchList">查询</el-button>
</el-form-item>
</el-form>
</div>
<div class="info-operate">
<span>消息列表</span>
<el-button type="primary" size="medium" @click="markReadFn">标为已读</el-button>
<el-button type="danger" plain size="medium" @click="deleteInfoFn">删除</el-button>
<el-button type="primary" size="medium" @click="markReadFn"
>标为已读</el-button
>
<el-button type="danger" plain size="medium" @click="deleteInfoFn"
>删除</el-button
>
</div>
<div class="table_wrap whiteBlock">
<el-table class="tables" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
<el-table
class="tables"
v-loading="loading"
:data="tableData"
@selection-change="handleSelectionChange"
@row-click="rowClickFn"
>
<el-table-column type="selection" align="center" width="60" />
<el-table-column label="标题内容" align="center" prop="title">
<template slot-scope="scope">
<span :style="{color: scope.row.isRead == 1?'#BFBFBF':'#5181F7'}" style="cursor: pointer;" @click="infoDetailOpen(scope.row)">{{
scope.row.title
}}</span>
<span
:style="{
color: scope.row.isRead == 1 ? '#BFBFBF' : '#5181F7',
}"
style="cursor: pointer"
@click="infoDetailOpen(scope.row)"
>{{ scope.row.title }}</span
>
</template>
</el-table-column>
<el-table-column label="类别" align="center" prop="type">
@ -81,11 +88,7 @@
<span>{{ scope.row.type | typeText(searchBtnList) }}</span>
</template>
</el-table-column>
<el-table-column
label="应用"
align="center"
prop="app"
/>
<el-table-column label="应用" align="center" prop="app" />
<el-table-column label="标签" align="center" prop="tag" />
<el-table-column label="操作时间" align="center" prop="operateTime" />
</el-table>
@ -108,31 +111,42 @@
<span>返回</span>
</div>
<div class="info-content-detail">
<div class="detail-title">{{rowObj.title}}</div>
<div class="detail-title">{{ rowObj.title }}</div>
<div class="detail-sub-title">
<span>应用：{{rowObj.app}}</span>
<span>标签：{{rowObj.tag}}</span>
<span>接收时间：{{rowObj.operateTime}}</span>
<span>应用：{{ rowObj.app }}</span>
<span>标签：{{ rowObj.tag }}</span>
<span>接收时间：{{ rowObj.operateTime }}</span>
</div>
<div class="detail-content">{{rowObj.content}}</div>
<div class="detail-content">{{ rowObj.content }}</div>
</div>
</div>
</div>
</template>
<script>
import { getInfoListApi, markInfoReadApi, batchDeleteInfoApi } from "@/assets/js/api/loginSign.js";
import {
getInfoListApi,
markInfoReadApi,
batchDeleteInfoApi,
} from "@/assets/js/api/loginSign.js";
import { getNoticeListApi } from "@/assets/js/api/company/project";
export default {
data() {
return {
infoDetailShow: false,
checkIndex: 0,
// searchBtnList: [
// { name: "全部类别", value: "" },
// { name: "通知公告", value: 1 },
// { name: "审批流程", value: 3 },
// { name: "风险预警", value: 2 },
// { name: "任务待办", value: 4 },
// { name: "其他", value: 5 },
// ],
searchBtnList: [
{ name: "全部类别", value: "" },
{ name: "通知公告", value: 1 },
{ name: "审批流程", value: 3 },
{ name: "风险预警", value: 2 },
{ name: "任务待办", value: 4 },
{ name: "其他", value: 5 },
{ name: "质量", value: 11 },
{ name: "安全", value: 10 },
{ name: "AI", value: 8 }
],
devSn: "",
// 遮罩层
@ -151,7 +165,7 @@ export default {
timeRange: [],
tableData: [],
multipleSelection: [],
rowObj: {}
rowObj: {},
};
},
filters: {
@ -165,19 +179,30 @@ export default {
this.getList();
},
methods: {
// 表格行点击
rowClickFn(row,column,event){
console.log(row)
if(row.type == 11){ // 质量
this.$router.push("/project/quality/inspectionLedger");
} else if(row.type == 10){ // 安全
this.$router.push("/project/safeSame/inspectionLedger");
} else if(row.type == 8){ // AI
this.$router.push("/project/aiAnalysis/warningList");
}
},
// 删除
deleteInfoFn(){
deleteInfoFn() {
let selectedIds = [];
if(this.multipleSelection.length == 0){
if (this.multipleSelection.length == 0) {
this.$message({
type: "error",
message: "请勾选表格项",
});
return;
type: "error",
message: "请勾选表格项",
});
return;
} else {
this.multipleSelection.map(item => {
selectedIds.push(item.id)
})
this.multipleSelection.map((item) => {
selectedIds.push(item.id);
});
}
this.$confirm("此操作将删除信息, 是否继续?", "提示", {
confirmButtonText: "确定",
@ -185,9 +210,12 @@ export default {
type: "warning",
})
.then(() => {
batchDeleteInfoApi({ accountId: this.$store.state.userInfo.userId, ids: selectedIds.join(',') }).then((res) => {
batchDeleteInfoApi({
accountId: this.$store.state.userInfo.userId,
ids: selectedIds.join(","),
}).then((res) => {
if (res.success) {
this.getList()
this.getList();
this.$message({
type: "success",
message: "操作成功!",
@ -208,18 +236,18 @@ export default {
});
},
// 标为已读
markReadFn(){
markReadFn() {
let selectedIds = [];
if(this.multipleSelection.length == 0){
if (this.multipleSelection.length == 0) {
this.$message({
type: "error",
message: "请勾选表格项",
});
return;
type: "error",
message: "请勾选表格项",
});
return;
} else {
this.multipleSelection.map(item => {
selectedIds.push(item.id)
})
this.multipleSelection.map((item) => {
selectedIds.push(item.id);
});
}
this.$confirm("此操作将标记已读, 是否继续?", "提示", {
confirmButtonText: "确定",
@ -227,9 +255,12 @@ export default {
type: "warning",
})
.then(() => {
markInfoReadApi({ accountId: this.$store.state.userInfo.userId, ids: selectedIds.join(',') }).then((res) => {
markInfoReadApi({
accountId: this.$store.state.userInfo.userId,
ids: selectedIds.join(","),
}).then((res) => {
if (res.success) {
this.getList()
this.getList();
this.$message({
type: "success",
message: "操作成功!",
@ -251,7 +282,7 @@ export default {
},
handleSelectionChange(val) {
this.multipleSelection = val;
console.log(val,'测试测试')
console.log(val, "测试测试");
},
infoDetailOpen(item) {
this.rowObj = item;
@ -269,19 +300,38 @@ export default {
pageNo: this.pageInfo.pageNo,
pageSize: this.pageInfo.pageSize,
type: this.searchBtnList[this.checkIndex].value,
...this.searchForm
...this.searchForm,
};
if (this.timeRange && this.timeRange.length > 0) {
requestData.operateTime_begin = this.timeRange[0];
requestData.operateTime_end = this.timeRange[1];
}
if(this.timeRange && this.timeRange.length > 0){
requestData.operateTime_begin = this.timeRange[0]
requestData.operateTime_end = this.timeRange[1]
}
getInfoListApi(requestData).then((result) => {
if (result.success) {
this.tableData = result.result.records;
this.pageInfo.total = result.result.total;
getNoticeListApi(requestData).then((res) => {
if (res.success) {
this.tableData = res.result.records;
this.pageInfo.total = res.result.total;
}
});
},
// getList() {
// let requestData = {
// accountId: this.$store.state.userInfo.userId,
// pageNo: this.pageInfo.pageNo,
// pageSize: this.pageInfo.pageSize,
// type: this.searchBtnList[this.checkIndex].value,
// ...this.searchForm
// }
// if(this.timeRange && this.timeRange.length > 0){
// requestData.operateTime_begin = this.timeRange[0]
// requestData.operateTime_end = this.timeRange[1]
// }
// getInfoListApi(requestData).then((result) => {
// if (result.success) {
// this.tableData = result.result.records;
// this.pageInfo.total = result.result.total;
// }
// });
// },
SizeChange(val) {
this.pageInfo.pageSize = val;
this.getList();
@ -313,7 +363,7 @@ export default {
handleCurrentChange(val) {
this.pageNo2 = val;
this.getPageList();
}
},
},
};
</script>
@ -406,8 +456,8 @@ export default {
}
}
}
.table_wrap{
.pagerBox{
.table_wrap {
.pagerBox {
margin-top: 30px;
}
}

56
src/views/infoCenter/hadRead/componentsModule/dataListData.vue
View File

@ -120,18 +120,25 @@
</template>
<script>
import { getInfoListApi, batchDeleteInfoApi } from "@/assets/js/api/loginSign.js";
import { getNoticeListApi } from "@/assets/js/api/company/project";
export default {
data() {
return {
infoDetailShow: false,
checkIndex: 0,
// searchBtnList: [
// { name: "全部类别", value: "" },
// { name: "通知公告", value: 1 },
// { name: "审批流程", value: 3 },
// { name: "风险预警", value: 2 },
// { name: "任务待办", value: 4 },
// { name: "其他", value: 5 },
// ],
searchBtnList: [
{ name: "全部类别", value: "" },
{ name: "通知公告", value: 1 },
{ name: "审批流程", value: 3 },
{ name: "风险预警", value: 2 },
{ name: "任务待办", value: 4 },
{ name: "其他", value: 5 },
{ name: "质量", value: 11 },
{ name: "安全", value: 10 },
{ name: "AI", value: 8 }
],
devSn: "",
// 遮罩层
@ -227,19 +234,40 @@ export default {
pageSize: this.pageInfo.pageSize,
type: this.searchBtnList[this.checkIndex].value,
isRead: 1,
...this.searchForm
...this.searchForm,
};
if (this.timeRange && this.timeRange.length > 0) {
requestData.operateTime_begin = this.timeRange[0];
requestData.operateTime_end = this.timeRange[1];
}
if(this.timeRange && this.timeRange.length > 0){
requestData.operateTime_begin = this.timeRange[0]
requestData.operateTime_end = this.timeRange[1]
}
getInfoListApi(requestData).then((result) => {
if (result.success) {
this.tableData = result.result.records;
this.pageInfo.total = result.result.total;
getNoticeListApi(requestData).then((res) => {
if (res.success) {
this.tableData = res.result.records;
this.pageInfo.total = res.result.total;
}
});
},
//查询列表
// getList() {
// let requestData = {
// accountId: this.$store.state.userInfo.userId,
// pageNo: this.pageInfo.pageNo,
// pageSize: this.pageInfo.pageSize,
// type: this.searchBtnList[this.checkIndex].value,
// isRead: 1,
// ...this.searchForm
// }
// if(this.timeRange && this.timeRange.length > 0){
// requestData.operateTime_begin = this.timeRange[0]
// requestData.operateTime_end = this.timeRange[1]
// }
// getInfoListApi(requestData).then((result) => {
// if (result.success) {
// this.tableData = result.result.records;
// this.pageInfo.total = result.result.total;
// }
// });
// },
SizeChange(val) {
this.pageInfo.pageSize = val;
this.getList();

56
src/views/infoCenter/notRead/componentsModule/dataListData.vue
View File

@ -121,18 +121,25 @@
</template>
<script>
import { getInfoListApi, markInfoReadApi, batchDeleteInfoApi } from "@/assets/js/api/loginSign.js";
import { getNoticeListApi } from "@/assets/js/api/company/project";
export default {
data() {
return {
infoDetailShow: false,
checkIndex: 0,
// searchBtnList: [
// { name: "全部类别", value: "" },
// { name: "通知公告", value: 1 },
// { name: "审批流程", value: 3 },
// { name: "风险预警", value: 2 },
// { name: "任务待办", value: 4 },
// { name: "其他", value: 5 },
// ],
searchBtnList: [
{ name: "全部类别", value: "" },
{ name: "通知公告", value: 1 },
{ name: "审批流程", value: 3 },
{ name: "风险预警", value: 2 },
{ name: "任务待办", value: 4 },
{ name: "其他", value: 5 },
{ name: "质量", value: 11 },
{ name: "安全", value: 10 },
{ name: "AI", value: 8 }
],
devSn: "",
// 遮罩层
@ -270,19 +277,40 @@ export default {
pageSize: this.pageInfo.pageSize,
type: this.searchBtnList[this.checkIndex].value,
isRead: 0,
...this.searchForm
...this.searchForm,
};
if (this.timeRange && this.timeRange.length > 0) {
requestData.operateTime_begin = this.timeRange[0];
requestData.operateTime_end = this.timeRange[1];
}
if(this.timeRange && this.timeRange.length > 0){
requestData.operateTime_begin = this.timeRange[0]
requestData.operateTime_end = this.timeRange[1]
}
getInfoListApi(requestData).then((result) => {
if (result.success) {
this.tableData = result.result.records;
this.pageInfo.total = result.result.total;
getNoticeListApi(requestData).then((res) => {
if (res.success) {
this.tableData = res.result.records;
this.pageInfo.total = res.result.total;
}
});
},
//查询列表
// getList() {
// let requestData = {
// accountId: this.$store.state.userInfo.userId,
// pageNo: this.pageInfo.pageNo,
// pageSize: this.pageInfo.pageSize,
// type: this.searchBtnList[this.checkIndex].value,
// isRead: 0,
// ...this.searchForm
// }
// if(this.timeRange && this.timeRange.length > 0){
// requestData.operateTime_begin = this.timeRange[0]
// requestData.operateTime_end = this.timeRange[1]
// }
// getInfoListApi(requestData).then((result) => {
// if (result.success) {
// this.tableData = result.result.records;
// this.pageInfo.total = result.result.total;
// }
// });
// },
SizeChange(val) {
this.pageInfo.pageSize = val;
this.getList();

1
src/views/projectFront/carManage/carManage.vue
View File

@ -1137,6 +1137,7 @@ export default {
id: id,
});
console.log(res);
this.getList();
},
getBlackWhiteBoole() {
let clgl = {

2
src/views/projectFront/laborManage/personDetails.vue
View File

@ -1298,7 +1298,7 @@
<el-option
v-for="(item, index) in certificateTypeList"
:key="index"
:value="item.id"
:value="Number(item.id)"
:label="item.dictionaryName"
></el-option>
</el-select>

1
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -3852,6 +3852,7 @@ export default {
id: id,
});
console.log(res);
this.getTableData();
},
},
};

1
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -4561,6 +4561,7 @@ export default {
id: id,
});
console.log(res);
this.getTableData();
},
},
};

665
src/views/projectFront/laborManage/personRegisterDetails.vue
View File

File diff suppressed because it is too large Load Diff

3
src/views/projectFront/materialManage/materialEntryManage.vue
View File

@ -271,7 +271,8 @@ export default {
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
name: this.queryInfo.materialName,
enterpriseId: this.queryInfo.id
enterpriseId: this.queryInfo.id,
type: 1
};
if(this.queryInfo.timeRange && this.queryInfo.timeRange.length > 0){
data.entryTime_begin = this.queryInfo.timeRange[0];

3
src/views/projectFront/materialManage/materialExitManage.vue
View File

@ -271,7 +271,8 @@ export default {
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
name: this.queryInfo.materialName,
enterpriseId: this.queryInfo.id
enterpriseId: this.queryInfo.id,
type: 2
};
if(this.queryInfo.timeRange && this.queryInfo.timeRange.length > 0){
data.entryTime_begin = this.queryInfo.timeRange[0];