解决冲突

src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue

@@ -8,7 +8,8 @@
             </el-button>
           </template>
           <div class="flex just-center">
-            <el-button size="small" type="primary" v-for="it in D_GS_BK_SQLX" :key="it.dm" @click="handleApplication(it)">{{it.zdmc }}</el-button>
+            <el-button size="small" type="primary" v-for="it in D_GS_BK_SQLX" :key="it.dm"
+              @click="handleApplication(it)">{{ it.zdmc }}</el-button>
           </div>
         </el-popover>
         <el-popover placement="bottom" :visible="visiblefp" :width="400" trigger="click">
@@ -40,16 +41,9 @@
     </div>
     <!-- 表格 -->
     <div class="tabBox">
-      <MyTable
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
-        :tableData="pageData.tableData"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        :tableColumn="pageData.tableColumn"
+        @chooseData="chooseData" fixed="right">
-        :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount"
-        :tableConfiger="pageData.tableConfiger"
-        :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData"
-        fixed="right"
-      >
         <template #qtLb="{ row }">
           <DictTag :tag="false" :value="row.qtLb" :options="D_GS_ZDQT_LB" />
         </template>
@@ -58,7 +52,8 @@
         </template>
         <template #bqList="{ row }">
           <ul>
-            <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{ item.bqFz || 0  }} 分) </li>
+            <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{
+              item.bqFz || 0 }} 分) </li>
           </ul>
         </template>
         <template #zdryList="{ row }">
@@ -82,10 +77,12 @@
       }"></Pages>
     </div>
     <!-- 编辑 - 新增-->
-    <EditForm v-if="show" @updateDate="getList" ref="editFormDiloag" :dic="{D_BZ_XB,D_GS_ZDQT_LB,D_GS_ZDQT_FXDJ,D_GS_ZDR_CZZT}" />
+    <EditForm v-if="show" @updateDate="getList" ref="editFormDiloag"
+      :dic="{ D_BZ_XB, D_GS_ZDQT_LB, D_GS_ZDQT_FXDJ, D_GS_ZDR_CZZT }" />
     <!-- 选择用户 -->
     <ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds" /> <!-- 转线索 -->
-    <ZxsForm v-if="showzxs" ref="zxsDilof" @change="getList" :dic="{ D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX }"></ZxsForm>
+    <ZxsForm v-if="showzxs" ref="zxsDilof" @change="getList"
+      :dic="{ D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX }"></ZxsForm>
   </div>
 </template>
 
@@ -341,5 +338,4 @@ defineExpose({});
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
-
 </style>

src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/model/portrayal.vue

@@ -7,13 +7,10 @@
     <div style="display: flex;">
       <div style="width: 50%;"><PieChart :chartData="ywlbtj" title="业务类型"/></div>
       <div style="width: 50%;"><BarChart :chartData="gkjbtj" title="管控级别分布"/></div>
-
     </div>
     <div style="display: flex;">
       <div style="width: 50%;"><PieChart :chartData="qytj" title="区域分布"/></div>
       <div style="width: 50%;"><BarChart :chartData="zyfbtj" title="管控级别分布"/></div>
-
-
     </div>
     <div style="display: flex;">
       <div style="width: 50%;"><LineChart :chartData="nlfbtj" title="年龄分布"/></div>

src/views/backOfficeSystem/JudgmentHome/ResearchHome/index.vue

@@ -35,30 +35,27 @@
         <div ref="searchBox">
           <el-form :model="searchList" ref="searchFormRef" :inline="true">
             <el-form-item label="类型">
-               <el-cascader @change="changeCascader" :disabled="readonly_lx" v-model="searchList.lx" clearable :options="cascaderList" :props="{ checkStrictly: true }" placeholder="请选择类型"/>
+              <el-cascader ref="cascaRef" @change="changeCascader" :disabled="readonly_lx" v-model="searchList.lx" clearable
+                :options="cascaderList" :props="{ checkStrictly: true,multiple: true }" placeholder="请选择类型" />
             </el-form-item>
             <el-form-item label="人员">
-              <el-input @change="changeRy" v-model="searchList.ry" :disabled="readonly_ry" clearable placeholder="请输入姓名或身份证"></el-input>
+              <el-input @change="changeRy" v-model="searchList.ry" :disabled="readonly_ry" clearable
+                placeholder="请输入姓名或身份证"></el-input>
             </el-form-item>
             <el-form-item label="地点">
               <div class="flex align-center">
-                <el-select v-model="searchList.dd" @change="changeBm" style="width: 180px;" :disabled="readonly_dd" placeholder="行政区划">
+                <el-select v-model="searchList.dd" @change="changeBm" style="width: 180px;" :disabled="readonly_dd"
+                  placeholder="行政区划">
                   <el-option label="区域" value="1"></el-option>
                   <el-option label="部门" value="2"></el-option>
                 </el-select>
-                <el-input @change="changeRy" :disabled="readonly_dd" v-model="searchList.xxdz" clearable placeholder="请输入详细地址"></el-input>
+                <el-input @change="changeRy" :disabled="readonly_dd" v-model="searchList.xxdz" clearable
+                  placeholder="请输入详细地址"></el-input>
               </div>
             </el-form-item>
             <el-form-item label="时间">
-              <el-date-picker
+              <el-date-picker v-model="searchList.datetimes" type="datetimerange" unlink-panels :range-separator="'至'"
-                v-model="searchList.datetimes"
+                start-placeholder="开始日期时间" end-placeholder="结束日期时间" value-format="YYYY-MM-DD HH:mm:ss" />
-                type="datetimerange"
-                unlink-panels
-                :range-separator="'至'"
-                start-placeholder="开始日期时间"
-                end-placeholder="结束日期时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
-              />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="onSearch">查询</el-button>
@@ -70,16 +67,9 @@
           <li class="list-item" ref="listBoxRef" v-for="(it, idx) in list" :key="idx">
             <div class="comm-title title-s">{{ it.title }}</div>
             <div class="list-table">
-              <MyTable
+              <MyTable :tableData="it.tableList" :tableColumn="it.tableColumn" :key="idx + '' + it.keyCount" :fixed="false"
-                :tableData="it.tableList"
+                :tableHeight="pageData.tableHeight" :tabelModel="it.title" :tableConfiger="pageData.tableConfiger"
-                :tableColumn="it.tableColumn"
+                :controlsWidth="pageData.controlsWidth">
-                :key="idx+''+it.keyCount"
-                :fixed="false"
-                :tableHeight="pageData.tableHeight"
-                :tabelModel="it.title"
-                :tableConfiger="pageData.tableConfiger"
-                :controlsWidth="pageData.controlsWidth"
-              >
                 <template #jqlbdm="{ row }">
                   <DictTag :tag="false" :value="row.jqlbdm" :options="JQLB" />
                 </template>
@@ -87,12 +77,8 @@
                   <el-link type="primary" size="small" @click="handleHs(row)">网上会商</el-link>
                 </template>
               </MyTable>
-              <Pages
+              <Pages @changeNo="changeNo($event, it.title)" @changeSize="changeSize($event, it.title)"
-                @changeNo="changeNo($event,it.title)"
+                :tableHeight="pageData.tableHeight" :pageConfiger="{ ...it.pageConfiger }"></Pages>
-                @changeSize="changeSize($event,it.title)"
-                :tableHeight="pageData.tableHeight"
-                :pageConfiger="{ ...it.pageConfiger }"
-              ></Pages> 
             </div>
           </li>
         </ul>
@@ -122,7 +108,7 @@ const { JQLB} = proxy.$dict("JQLB"); //获取字典数据
 const readonly_lx = ref(false)
 const readonly_ry = ref(false)
 const readonly_dd = ref(false)
-
+const cascaRef=ref()
 const showModel = ref(false);
 const detaileRef = ref();
 const searchBox = ref();
@@ -150,11 +136,13 @@ const obj = reactive({
 const searchList = ref({})
 let cascaderList = ref([
   { value: '01', label: '网络舆情', leaf: true },
-  { value: '02', label: '警情',children:[
+  {
+    value: '02', label: '警情', children: [
       { value: '021', label: '治安警情', leaf: true },
       { value: '022', label: '刑事警情', leaf: true },
       { value: '023', label: '交通警情', leaf: true },
-  ] },
+    ]
+  },
   { value: '03', label: '案件', leaf: true },
   { value: '04', label: '风险隐患', leaf: true },
 ])
@@ -240,7 +228,16 @@ const pageData = reactive({
   },
   controlsWidth: 120, //操作栏宽度
 });
-
+watch(() => JQLB.value, (val) => {
+  if (val) {
+    cascaderList.value[1].children = val.map((el) => {
+      return { value: el.dm, label: el.zdmc, leaf: true }
+    })
+  }
+},
+  {
+    deep: true, immediate: true
+  })
 onMounted(() => {
   // getCount(); //获取统计数据
   tabHeightFn()
@@ -324,11 +321,16 @@ const handleHs = (val) =>{
 }
 
 const handleYP = () => {
+  let arr=cascaRef.value.getCheckedNodes()
+  searchForm.value.jqlbdms=arr.map((el)=>{
+    return el.value
+  })
   let params = {
     hskssj: searchForm.value.kssj,
     hsjssj: searchForm.value.jssj,
+    jqlbdms:searchForm.value.jqlbdms
   }
-  qcckPost(params,'/mosty-gsxt/wshs/getDcypbg').then(res=>{
+  qcckPost(params, '/mosty-gsxt/lzJcjPjdb/getJqDcypbg').then(res => {
     let data = res || {};
     let html = `<p class="html_bt">${data.bt}</p>`
     html += `<p>${data.head}</p>`
@@ -342,6 +344,9 @@ const handleYP = () =>{
 
 // 选择类型
 const changeCascader = (val) => {
+  console.log(val,'val');
+  console.log(cascaRef.value.getCheckedNodes(),'++++++++');
+  
   readonly_lx.value = false;
   readonly_ry.value = val ? true : false
   readonly_dd.value = val ? true : false
@@ -403,12 +408,14 @@ const tabHeightFn = () => {
   padding-top: 15px;
   box-sizing: border-box;
   color: #000;
+
   .leftbox {
     width: 500px;
     height: 100%;
     margin-right: 10px;
     background: #fff;
   }
+
   .rightbox {
     flex: 1 0 0;
     background: #fff;
@@ -431,27 +438,35 @@ const tabHeightFn = () => {
   height: 60px;
   font-size: 24px;
   position: relative;
+
   .sircle {
     display: inline-block;
   }
+
   .sircleL1 {
     @include common(8px, 0.5);
   }
+
   .sircleL2 {
     @include common(12px, 0.75);
   }
+
   .sircleL3 {
     @include common(16px);
   }
+
   .sircleR1 {
     @include common(16px);
   }
+
   .sircleR2 {
     @include common(12px, 0.75);
   }
+
   .sircleR3 {
     @include common(8px, 0.5);
   }
+
   .btn {
     position: absolute;
     top: 50%;
@@ -466,9 +481,11 @@ const tabHeightFn = () => {
   overflow-y: auto;
   padding: 10px 20px;
   box-sizing: border-box;
+
   .comm-title {
     position: relative;
     font-size: 20px;
+
     &::before {
       content: '';
       position: absolute;
@@ -496,6 +513,7 @@ const tabHeightFn = () => {
   display: flex;
   flex-wrap: wrap;
   overflow: hidden;
+
   .list-item {
     width: 49.5%;
     height: calc(100% / 2 - 5px);
@@ -505,18 +523,22 @@ const tabHeightFn = () => {
     padding: 4px 4px;
     box-sizing: border-box;
     margin-bottom: 5px;
+
     .title-s {
       font-size: 16px;
     }
+
     .list-table {
       margin-top: 5px;
       overflow: hidden;
     }
   }
+
   .list-item:nth-child(2n+1) {
     margin-right: 1%;
   }
 }
+
 ::v-deep .searchBox {
   margin-bottom: 0 !important;
   padding: 2px !important;
@@ -525,6 +547,7 @@ const tabHeightFn = () => {
 ::v-deep .el-table .table_blue_row {
   background: #fff !important;
 }
+
 ::v-deep .el-table th.el-table__cell {
   font-size: 13px;
   background: #EFF5F7;
@@ -549,6 +572,7 @@ const tabHeightFn = () => {
 ::v-deep .el-link {
   margin: 3px;
 }
+
 .html_bt>>>p {
   color: red;
 }
@@ -556,6 +580,4 @@ const tabHeightFn = () => {
 ::v-deep .el-date-editor .el-range-separator {
   color: #333;
 }
-
 </style>
-

vue.config.js

@@ -3,10 +3,15 @@ const path = require("path");
 function resolve(dir) {
   return path.join(__dirname, dir);
 }
+<<<<<<< HEAD
 const serverHost = "http://192.168.1.32:8006"//波哥
+=======
+
+// const serverHost = "http://47.108.232.77:9537"//波哥
+>>>>>>> d62fe13f0fc132011350e58f5ca2d061210f35b5
 // const serverHost = "http://192.168.0.231:8006"//线上
 // const serverHost = "http://192.168.1.117:8006"//周
-// const serverHost = "http://192.168.1.98:8006"//毛毛
+const serverHost = "http://192.168.1.98:8006"//毛毛
 
 module.exports = {
   // configureWebpack: {