diff --git a/src/utils/tools.js b/src/utils/tools.js
index 5c2dc6c..3c5b460 100644
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -266,8 +266,6 @@ function _setTime(date) {
//权限判断
export function isAuth() {
const SYSROLE = getItem("SYSROLE")
- console.log("SYSROLE", SYSROLE);
-
- if (SYSROLE[0].roleCode == 'JS_0006') return false
+ if(SYSROLE && SYSROLE[0].roleCode == 'JS_0006')return false
return true
}
diff --git a/src/views/backOfficeSystem/peopleManag/forewarning/components/editAddForm.vue b/src/views/backOfficeSystem/peopleManag/forewarning/components/editAddForm.vue
index 1c3ecc1..9a42185 100644
--- a/src/views/backOfficeSystem/peopleManag/forewarning/components/editAddForm.vue
+++ b/src/views/backOfficeSystem/peopleManag/forewarning/components/editAddForm.vue
@@ -83,13 +83,17 @@ watch(() => props.dict, (newVal, oldVal) => {
if (newVal) {
formData.value = [
{ label: "预警类型", prop: "yjLx", type: "select", options: props.dict.D_BZ_YJLX, width: '45%' },
+ { label: "所属检查站", prop: "jczmc", type: "input", width: '45%' },
{ label: "感知源名称", prop: "yjGzymc", type: "input", width: '45%' },
+ { label: "感知源编号", prop: "yjGzyid", type: "input", width: '45%' },
+ { label: "感知源方向", prop: "gzyfx", type: "select", options: props.dict.D_BZ_GZYFX, width: '45%' },
{ label: "请选中开始时间", prop: "yjSj", type: "datetime", width: '45%' },
{ label: "预警对象", prop: "yjRyxm", type: "slot", width: '45%' },
- { label: "预警标签", prop: "yjbqmc", type: "input", width: '45%' },
+ { label: "预警标签", prop: "yjbqmc", type: "input", width: '45%' },
{ label: "所属部门", prop: "ssbm", type: "input", width: '45%' },
{ label: "预警地址", prop: "yjDz", type: "input", width: '45%' },
{ label: "预警级别", prop: "yjJb", type: "select", options: props.dict.D_BZ_YJJB, width: '45%' },
+ { label: "预警标签", prop: "yjbq", type: "input", width: '45%' },
{ label: "预警内容", prop: "yjNr", type: "textarea", width: '100%' },
{ label: "预警图片", prop: "yjTp", type: "slot", width: '100%' }
]
diff --git a/src/views/backOfficeSystem/peopleManag/forewarning/index.vue b/src/views/backOfficeSystem/peopleManag/forewarning/index.vue
index 96ae959..c3108db 100644
--- a/src/views/backOfficeSystem/peopleManag/forewarning/index.vue
+++ b/src/views/backOfficeSystem/peopleManag/forewarning/index.vue
@@ -20,6 +20,9 @@
+
+
+
@@ -33,7 +36,7 @@
-
+
@@ -47,21 +50,35 @@ import { jczgetPageList, selectJczFullList } from "@/api/mosty-jcz.js";
import { reactive, ref, onMounted, getCurrentInstance, watch } from "vue";
const { proxy } = getCurrentInstance();
const urlImg = "/mosty-api/mosty-base/minio/image/download/";
-const { D_BZ_YJLX, D_BZ_YJJB } = proxy.$dict("D_BZ_YJLX", "D_BZ_YJJB");
+const { D_BZ_YJLX, D_BZ_YJJB, D_BZ_GZYFX } = proxy.$dict("D_BZ_YJLX", "D_BZ_YJJB", "D_BZ_GZYFX");
const jczList = ref()
const searchConfiger = ref([
+ {
+ label: "感知源编号",
+ prop: "yjGzyid",
+ placeholder: "感知源编号",
+ showType: "input",
+ },
+ {
+ label: "所属检查站",
+ prop: "jczid",
+ placeholder: "所属检查站",
+ showType: "select",
+ options: {}
+ },
{
label: "预警类型",
prop: "yjLx",
placeholder: "预警类型",
showType: "select",
options: D_BZ_YJLX
- }, {
- label: "所属检查站",
- prop: "jczid",
- placeholder: "所属检查站",
+ },
+ {
+ label: "感知源方向",
+ prop: "gzyfx",
+ placeholder: "感知源方向",
showType: "select",
- options: {}
+ options: D_BZ_GZYFX
},
{
label: "发生时间",
@@ -88,19 +105,21 @@ const pageData = reactive({
controlsWidth: 250, //操作栏宽度
tableColumn: [
{ label: "预警图片", prop: "yjTp", showSolt: true },
+ { label: "所属检查站", prop: "jczmc" },
{ label: "感知源名称", prop: "yjGzymc" },
+ { label: "感知源编号", prop: "yjGzyid" },
{ label: "预警时间", prop: "yjSj" },
{ label: "预警人员", prop: "yjRyxm" },
+ { label: "预警标签", prop: "yjbq" },
{ label: "预警车牌号", prop: "yjClcph" },
- { label: "预警类型", prop: "yjLx", showSolt: true }
+ { label: "预警类型", prop: "yjLx", showSolt: true },
+ { label: "方向", prop: "gzyfx", showSolt: true },
]
});
onMounted(() => {
tabHeightFn();
-getselectJczFullList()
-
+ getselectJczFullList()
});
-
//查询条件
const queryCondition = ref({});
// 获取数据
@@ -121,8 +140,6 @@ const getjczgetXfllList = () => {
const getselectJczFullList = () => {
selectJczFullList().then((res) => {
- console.log(res);
-
jczList.value = res.map(item => ({
label: item.jczmc,
value: item.id
diff --git a/src/views/home/components/Checkpoint.vue b/src/views/home/components/Checkpoint.vue
index f6b0a9f..d2b03ae 100644
--- a/src/views/home/components/Checkpoint.vue
+++ b/src/views/home/components/Checkpoint.vue
@@ -19,11 +19,12 @@ const lxType = ref();
const pointListShow = ref(false);
const dataList = ref([])
const openDialog = (val) => {
- if (val == '1') {
- lxType.value = 'jcz';
- } else {
- lxType.value = 'kk';
- }
+ // if (val == '1') {
+
+ // } else {
+ // lxType.value = 'kk';
+ // }
+ lxType.value = val;
pointListShow.value = true;
};
onMounted(() => {
@@ -72,8 +73,9 @@ const getTotal = () => {
align-items: center;
height: 100%;
flex-wrap: wrap;
-width: 90%;
-margin: auto;
+ width: 90%;
+ margin: auto;
+
.item {
cursor: pointer;
display: flex;
diff --git a/src/views/home/components/pointList.vue b/src/views/home/components/pointList.vue
index 5fd8e8a..2e14a8a 100644
--- a/src/views/home/components/pointList.vue
+++ b/src/views/home/components/pointList.vue
@@ -62,36 +62,17 @@ const pageData = reactive({
controlsWidth: 180, //操作栏宽度
tableColumn: [
{ label: "所属部门", prop: "ssbm", showOverflowTooltip: true },
- { label: "检查站名称", prop: "jczmc", showOverflowTooltip: true },
- { label: "环林检查站类型", prop: "sbbh", showOverflowTooltip: true },
- { label: "执勤类型", prop: "csmc", showOverflowTooltip: true },
- { label: "检查站地址", prop: "dzmc", showOverflowTooltip: true }
+ { label: "卡口名称", prop: "jczmc", showOverflowTooltip: true },
+ { label: "环林卡口类型", prop: "jczlx", showSolt: true },
+ { label: "执勤类型", prop: "zqlx", showSolt: true },
+ { label: "卡口地址", prop: "xxdz", showOverflowTooltip: true }
]
});
watch(
() => props.lxType,
(val) => {
- if (val == "jcz") {
- title.value = "检查站";
- zqlx.value = '1'
- pageData.tableColumn = [
- { label: "所属部门", prop: "ssbm", showOverflowTooltip: true },
- { label: "检查站名称", prop: "jczmc", showOverflowTooltip: true },
- { label: "环林检查站类型", prop: "jczlx", showSolt: true },
- { label: "执勤类型", prop: "zqlx", showSolt: true },
- { label: "检查站地址", prop: "xxdz", showOverflowTooltip: true }
- ];
- } else {
- title.value = "卡口信息";
- zqlx.value = '2'
- pageData.tableColumn = [
- { label: "所属部门", prop: "ssbm", showOverflowTooltip: true },
- { label: "卡口名称", prop: "jczmc", showOverflowTooltip: true },
- { label: "环林卡口类型", prop: "jczlx", showSolt: true },
- { label: "执勤类型", prop: "zqlx", showSolt: true },
- { label: "卡口地址", prop: "xxdz", showOverflowTooltip: true }
- ];
- }
+ title.value = "卡口信息";
+ zqlx.value = val;
getList();
}
);
diff --git a/vue.config.js b/vue.config.js
index 8edcf6f..40fffc7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,12 +3,12 @@ const path = require("path");
function resolve(dir) {
return path.join(__dirname, dir);
}
-// const serverHost = "http://183.222.39.242:38006"//波哥
+const serverHost = "http://192.168.3.59:8006"//波哥
// const serverHost = "http://47.108.232.77:9537";
// const serverHost = "http://j96926b5.natappfree.cc"
// const serverHost = "http://192.168.1.98:8006"
// const serverHost = "http://n5e6d39a.natappfree.cc"//周
-const serverHost = "http://183.222.39.242:38006"//线上
+// const serverHost = "http://183.222.39.242:38006"//线上
module.exports = {
publicPath: "./",
outputDir: "jcz",