Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

src/utils/dict.js

@@ -15,7 +15,7 @@ export function isLocalDict(dictCode) {
     D_GS_SSYJ: true, // "岗哨系统四色预警"
     D_BZ_SF: true, // "是否"
     BD_BK_CLYJBQ: true, // "车辆预警标签"
-    D_YJXX_CZCSLX:true, //常控处置措施类型
+    D_YJXX_CZCSLX: true, //常控处置措施类型
   }
   return localDicObj[dictCode]
 }
@@ -32,12 +32,14 @@ export function getDict(...args) {
         getSysDictByCode({
           dictCode: d
         }).then(result => {
+          result = result || {}
+          result.itemList = Array.isArray(result.itemList) ? result.itemList : []
           result.itemList.forEach(p => {
             p.label = p.zdmc
             p.value = p.dm
             p.id = p.dm
             p.elTagType = p.dictType
-            if (p.itemList && p.itemList.length > 0) {
+            if (p?.itemList && p.itemList?.length > 0) {
               getChildren(p)
             }
             p.children = p.itemList

src/utils/tools.js

@@ -379,5 +379,5 @@ export const bqYs = (val) => {
  */
 export function holographicProfileJump(szhm) {
   if (!szhm) return
-  window.open(`https://tyyy.lz.dsj.xz/profile/people/person-manage?szhm=${szhm}&from=portal`)
+  window.open(`https://tyyy.lz.dsj.xz/profile/people/person-manage?sfzhm=${szhm}&from=portal`)
 }

src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/index.vue

@@ -17,7 +17,7 @@
       <Searchs :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"></Searchs>
     </div>
     <!-- 表格 -->
-    <div class="tabBox" :style="{height:(pageData.tableHeight + 40)+'px'}">
+    <div class="tabBox" :style="{ height: (pageData.tableHeight + 40) + 'px' }">
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
         <template #xwcs="{ row }">
@@ -54,7 +54,7 @@
       :tacitly="tacitly" />
   </Information>
   <!-- 详情 -->
-  <AddFrom ref="addModelRef" :dict="{D_GSXT_YJXX_CZZT, D_BZ_YJJB,D_GS_SSYJ}"></AddFrom>
+  <AddFrom ref="addModelRef" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_GS_SSYJ }"></AddFrom>
 </template>
 
 <script setup>
@@ -71,12 +71,12 @@ import Information from "@/views/home/model/information.vue";
 import SemdFqzl from '@/components/instructionHasBeen/sendFqzl.vue'
 import emitter from "@/utils/eventBus.js";
 import FkDialog from "@/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/fkDialog.vue";
-import { reactive, ref, onMounted, getCurrentInstance, computed, watch,nextTick  } from "vue";
+import { reactive, ref, onMounted, getCurrentInstance, computed, watch, nextTick } from "vue";
 import AddFrom from './components/addFrom.vue'
 import { holographicProfileJump } from "@/utils/tools.js"
 
 const { proxy } = getCurrentInstance();
-const { D_GS_SSYJ ,D_GSXT_YJXX_CZZT} = proxy.$dict("D_GS_SSYJ","D_GSXT_YJXX_CZZT"); //获取字典数据
+const { D_GS_SSYJ, D_GSXT_YJXX_CZZT } = proxy.$dict("D_GS_SSYJ", "D_GSXT_YJXX_CZZT"); //获取字典数据
 const searchBox = ref(); //搜索框
 const bqLbData = ref({
   bqXl: []
@@ -174,7 +174,7 @@ const getList = () => {
     pageData.total = res.total || 0;
     pageData.tableConfiger.loading = false;
     pageData.tableData = res.records.map(item => {
-      return { ...item, bqys: '01' }
+      return { ...item }
     }) || [];
   }).catch(() => {
     pageData.tableConfiger.loading = false;
@@ -197,13 +197,13 @@ const exportExcel = () => {
   XLSX.writeFile(workbook, "行为预警.xlsx");
 }
 const bqYs = (val) => {
-  if (val == '01') {
+  if (val == '01') { // 红
     return '#ff0202'
-  } else if (val == '02') {
+  } else if (val == '02') { // 橙
     return '#ff8c00'
-  } else if (val == '03') {
-    return '#ffff00'
-  } else if (val == '04') {
+  } else if (val == '03') { // 黄
+    return '#c2c203' // 原亮黄色：ffff00
+  } else if (val == '04') { // 蓝
     return '#0000ff'
   }
 }
@@ -282,7 +282,7 @@ const tabHeightFn = () => {
   } else {
     pageData.tableHeight = window.innerHeight - 250;
   }
-  window.onresize = function () {
+  window.onresize = function() {
     tabHeightFn();
   };
 };
@@ -292,4 +292,12 @@ const tabHeightFn = () => {
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
+
+/** 方便查看对应的颜色， */
+.test-top-color {
+  color: #ff0202;
+  background-color: #ff8c00;
+  border-color: #c2c203;
+  outline-color: #0000ff;
+}
 </style>

打包.bat

@@ -0,0 +1,12 @@
+@echo off
+echo <20><>ʼ<EFBFBD><CABC>֥<EFBFBD>ڸ<EFBFBD>pc<70><63><EFBFBD><EFBFBD>(sgxt_pc)...
+
+call npm run build
+echo <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɣ<EFBFBD><C9A3><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9>...
+if exist gsxt.zip del gsxt.zip
+powershell Compress-Archive -Path gsxt -DestinationPath gsxt.zip
+echo ѹ<><D1B9><EFBFBD><EFBFBD><EFBFBD>ɣ<EFBFBD>
+explorer .
+msg * "<EFBFBD><EFBFBD>֥<EFBFBD>ڸ<EFBFBD>pc<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɣ<EFBFBD>"
+start http://localhost:9528?project=sgxt_pc
+powershell -Command "Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.MessageBox]::Show('<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɣ<EFBFBD>', '<27>ɹ<EFBFBD>', [System.Windows.Forms.MessageBoxButtons]::OK, [System.Windows.Forms.MessageBoxIcon]::Exclamation)"