123

src/utils/tools.js

@@ -266,8 +266,6 @@ function _setTime(date) {
 //权限判断
 export function isAuth() {
   const SYSROLE = getItem("SYSROLE")
-  console.log("SYSROLE", SYSROLE);
+  if(SYSROLE && SYSROLE[0].roleCode == 'JS_0006')return false
-
-  if (SYSROLE[0].roleCode == 'JS_0006') return false
   return true
 }

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%' }
     ]

src/views/backOfficeSystem/peopleManag/forewarning/index.vue

@@ -20,6 +20,9 @@
         <template #yjLx="{ row }">
           <dict-tag :options="D_BZ_YJLX" :value="row.yjLx" :tag="false" />
         </template>
+        <template #gzyfx="{ row }">
+          <dict-tag :options="D_BZ_GZYFX" :value="row.gzyfx" :tag="false" />
+        </template>
 
         <!-- 操作 -->
         <template #controls="{ row }">
@@ -33,7 +36,7 @@
     </div>
     <!-- 编辑详情 -->
     <!-- 编辑详情 -->
-    <EditAddForm ref="detailDiloag" :dict="{ D_BZ_YJLX, D_BZ_YJJB }" />
+    <EditAddForm ref="detailDiloag" :dict="{ D_BZ_YJLX, D_BZ_YJJB, D_BZ_GZYFX }" />
   </div>
 </template>
 
@@ -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",
+    label: "感知源方向",
-    placeholder: "所属检查站",
+    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

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') {
+  // if (val == '1') {
-    lxType.value = 'jcz';
+
-  } else {
+  // } else {
-    lxType.value = 'kk';
+  //   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%;
+  width: 90%;
-margin: auto;
+  margin: auto;
+
   .item {
     cursor: pointer;
     display: flex;

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: "jczmc", showOverflowTooltip: true },
-    { label: "环林检查站类型", prop: "sbbh", showOverflowTooltip: true },
+    { label: "环林卡口类型", prop: "jczlx", showSolt: true },
-    { label: "执勤类型", prop: "csmc", showOverflowTooltip: true },
+    { label: "执勤类型", prop: "zqlx", showSolt: true },
-    { label: "检查站地址", prop: "dzmc", showOverflowTooltip: true }
+    { label: "卡口地址", prop: "xxdz", showOverflowTooltip: true }
   ]
 });
 watch(
   () => props.lxType,
   (val) => {
-    if (val == "jcz") {
+    title.value = "卡口信息";
-      title.value = "检查站";
+    zqlx.value = val;
-      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 }
-      ];
-    }
     getList();
   }
 );

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",