Merge remote-tracking branch 'origin/master'

src/components/datav/chart-bar.vue

@@ -5,6 +5,7 @@
   </div>
   <div>
     <div
+
         class="flex v-center bar-item wrap between"
         v-for="item in data"
         :size="size"

src/components/model-risk-tree.vue

@@ -75,7 +75,7 @@ function renderContent(
         h(
             "span",
             {
-                title: node.label,
+                title: node.label + '('+node.ruleDesc+')',
             },
             node.label
         )

src/views/datav/Lmgz.vue

@@ -199,7 +199,6 @@
                 <el-select v-model="selectedMetricLD" placeholder="请选择指标">
                   <el-option label="派出所" value="paichusuo"></el-option>
                   <el-option label="交警" value="jiaojing"></el-option>
-                  <el-option label="平均数" value="avgProblemNumber"></el-option>
                 </el-select>
               </div>
             </div>
@@ -236,7 +235,6 @@
                 <el-select v-model="selectedMetricMJ" placeholder="请选择指标">
                   <el-option label="派出所" value="paichusuo"></el-option>
                   <el-option label="交警" value="jiaojing"></el-option>
-                  <el-option label="平均数" value="avgProblemNumber"></el-option>
                 </el-select>
               </div>
             </div>
@@ -273,7 +271,6 @@
                 <el-select v-model="selectedMetricXFJ" placeholder="请选择指标">
                   <el-option label="派出所" value="paichusuo"></el-option>
                   <el-option label="交警" value="jiaojing"></el-option>
-                  <el-option label="平均数" value="avgProblemNumber"></el-option>
                 </el-select>
               </div>
             </div>
@@ -369,8 +366,8 @@ watch([time, selectedMetric, selectedMetricPCS, selectedMetricJJDD, selectedMetr
   getLeaderRiskData(selectedMetricLD.value);// 【领导 问题涉及人数】
   getPoliceANegativeData(selectedMetricMJ.value);// 【民警 问题数】
   getPoliceARiskData(selectedMetricMJ.value);// 【民警 问题发生率】
-  // getPoliceBNegativeData(selectedMetricXFJ.value);//【辅警/协警 问题数】
-  // getPoliceBRiskData(selectedMetricXFJ.value);//【辅警/协警 问题发生率】
+  getPoliceBNegativeData(selectedMetricXFJ.value);//【辅警/协警 问题数】
+  getPoliceBRiskData(selectedMetricXFJ.value);//【辅警/协警 问题发生率】
 });
 
 onMounted(() => {
@@ -388,8 +385,8 @@ onMounted(() => {
   getLeaderRiskData(selectedMetricLD.value);// 【领导 问题涉及人数】
   getPoliceANegativeData(selectedMetricMJ.value);// 【民警 问题数】
   getPoliceARiskData(selectedMetricMJ.value);// 【民警 问题发生率】
-  // getPoliceBNegativeData(selectedMetricXFJ.value);//【辅警/协警 问题数】
-  // getPoliceBRiskData(selectedMetricXFJ.value);//【辅警/协警 问题发生率】
+  getPoliceBNegativeData(selectedMetricXFJ.value);//【辅警/协警 问题数】
+  getPoliceBRiskData(selectedMetricXFJ.value);//【辅警/协警 问题发生率】
 });
 
 const getTotalData = () => {
@@ -496,8 +493,8 @@ const eachData = (data) => {
   let arr = [];
   data.forEach(item => {
     arr.push({
-      label: item.name,
-      value: 'score' in item ? Number(item.score) : Number(item.value)
+      label: item.label,
+      value: item['score'] != null ? Number(item.score) : Number(item.value)
     });
   });
   return arr;

src/views/sensitivePerception/DictContent.vue

@@ -43,7 +43,7 @@
       </div>
     </header>
     <div class="table-container">
-      <el-table :data="dictContents" row-key="id">
+      <el-table :data="dictContents" row-key="id" :default-expand-all="false">
         <el-table-column
             label="问题条目"
             prop="name"

src/views/sensitivePerception/RiskClue.vue

@@ -61,39 +61,43 @@
                         <el-table-column
                             label="发生时间"
                             prop="eventTime"
-                            width="180"
+                            width="160"
                         />
                         <el-table-column
                             label="姓名"
                             prop="name"
-                            width="150"
+                            width="120"
                         />
                         <el-table-column
                             label="身份证号码"
                             prop="idCode"
-                            width="180"
+                            width="170"
                             show-overflow-tooltip
                         />
                         <el-table-column
                             label="风险因素"
                             prop="riskReason"
+                            width="100"
                             show-overflow-tooltip
                         />
                         <el-table-column
                             label="风险内容"
-                            prop="thingDesc"
                             show-overflow-tooltip
-                        />
-                        <el-table-column label="操作" width="180">
+                        >
                           <template #default="{ row }">
+                            <span style="white-space: pre-wrap;">{{row.data}}</span>
+                          </template>
+                        </el-table-column>
+<!--                        <el-table-column label="操作" width="180">-->
+<!--                            <template #default="{ row }">-->
                                 <!-- <el-button
                                     type="primary"
                                     link
                                     @click="handleShowDetail(row)"
                                     >查看详情</el-button
                                 > -->
-                            </template>
-                        </el-table-column>
+<!--                            </template>-->
+<!--                        </el-table-column>-->
                     </el-table>
                 </div>
                 <div class="flex end mt-8">
@@ -146,6 +150,41 @@ function getList() {
     });
 }
 
+const filterJsonData = (row) => {
+  if(row.data == undefined) {
+    return ''
+  }
+  let j = JSON.parse(row.data)
+  let str = ''
+  if(j instanceof Array) {
+    j.forEach(item => {
+      str += JSON.stringify(item)+"\n";
+    })
+  }
+  if(j.sourceData != undefined) {
+    j = JSON.parse(row.sourceData)
+  }
+
+  for(let key in j) {
+    if(key == 'eventTime') {
+      continue
+    }
+    if(key == 'idCode') {
+      continue
+    }
+    if(key == 'departId') {
+      continue
+    }
+    if(key == 'personId') {
+      continue
+    }
+    if(key == 'name') {
+      continue
+    }
+    str += j[key]+'\n'
+  }
+}
+
 function reset() {
     query.value = {};
     getList();

src/views/sensitivePerception/RiskPersonnel.vue

@@ -167,23 +167,27 @@
                 <div>
                     <span class="text-primary">{{ item.riskName }}</span>
                 </div>
-                <el-table :data="item.clues">
+                <el-table :data="item.clues" max-height="300">
                     <el-table-column
                         label="发生时间"
                         prop="eventTime"
-                        width="180"
+                        width="160"
                     />
                     <el-table-column
                         label="风险因素"
                         prop="riskReason"
+                        width="160"
                         show-overflow-tooltip
                     />
                     <el-table-column
                         label="风险内容"
-                        prop="thingDesc"
                         show-overflow-tooltip
-                    />
-                    <el-table-column label="分值" prop="score" />
+                    >
+                      <template #default="{ row }">
+                        <span style="white-space: pre-wrap;">{{row.data}}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column width="80" label="分值" prop="score" />
                 </el-table>
             </div>
         </div>
@@ -227,6 +231,40 @@ async function handleShowDesc(row) {
     personal.value = data;
 }
 
+const filterJsonData = (row) => {
+  if(row.data == undefined) {
+    return ''
+  }
+  try {
+    let j = JSON.parse(row.data)
+    if(j.sourceData != undefined) {
+      j = JSON.parse(row.sourceData)
+    }
+    let str = ''
+    for(let key in j) {
+      if(key == 'eventTime') {
+        continue
+      }
+      if(key == 'idCode') {
+        continue
+      }
+      if(key == 'departId') {
+        continue
+      }
+      if(key == 'personId') {
+        continue
+      }
+      if(key == 'name') {
+        continue
+      }
+      str += j[key]+'\n'
+    }
+    return str
+  } catch (e) {
+    return row.data
+  }
+}
+
 function getGender(val) {
     if (val == 1) {
         return "男";

src/views/sensitivePerception/RiskScoreRule.vue

@@ -31,7 +31,7 @@
             </div>
         </header>
         <div class="table-container">
-            <el-table :data="scoreRules" row-key="id">
+            <el-table ref="tableRef" :default-expand-all="false" :data="scoreRules" :expand-row-keys="[]" :tree-props="{children: 'children',hasChildren: 'hasChildren'}" row-key="id">
                 <el-table-column
                     label="问题条目"
                     prop="riskName"
@@ -202,7 +202,11 @@ function getList() {
         treeOptions.value[0].children = data;
     });
 }
+
+onMounted(() => {
   getList();
+})
+
 
 const show = ref(false);
 const formData = ref({

vite.config.ts

@@ -79,7 +79,30 @@ export default ({ mode }) => {
     },
     build: {
       outDir: 'v2',
-      // target: "es2015"
+      sourcemap: false,
+      chunkSizeWarningLimit: 1500,
+      rollupOptions: {
+        output: {
+          entryFileNames: `assets/[name].${new Date().getTime()}.js`,
+          chunkFileNames: `assets/[name].${new Date().getTime()}.js`,
+          assetFileNames: `assets/[name].${new Date().getTime()}.[ext]`,
+          compact: true,
+          manualChunks: {
+            vue: ['vue', 'vue-router'],
+            echarts: ['echarts'],
+          },
+        },
+      },
+      terserOptions: {
+        compress: {
+          drop_console: true,
+          drop_debugger: true,
+        },
+        ie8: true,
+        output: {
+          comments: true,
+        },
+      },
     }
   })
 }