Merge branch 'gab_bz' of http://47.92.108.28/changchao/founder_vue into gab_bz

package-lock.json

@@ -1762,6 +1762,37 @@
         "webpack-merge": "^4.2.2"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz",
+          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz",
+          "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
         "debug": {
           "version": "4.2.0",
           "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz",
@@ -1771,11 +1802,35 @@
             "ms": "2.1.2"
           }
         },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
           "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
           "dev": true
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.3.0",
+          "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.0.tgz?cache=0&sync_timestamp=1624996813170&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.3.0.tgz",
+          "integrity": "sha1-LxleS6D7DiY1ltaDDfF9Gjbok2w=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -11911,63 +11966,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.3.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.0.tgz",
-      "integrity": "sha512-UDgni/tUVSdwHuQo+vuBmEgamWx88SuSlEb5fgdvHrlJSPB9qMBRF6W7bfPWSqDns425Gt1wxAUif+f+h/rWjg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "3.4.6",
       "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",

src/api/cbyp.js

+import { get, post , postJson} from "@/utils/http.js";
+
+export const toQueryXszxx = params =>
+  post("/api/cbxsz/toQueryXszxx", params);
+
+export const queryTreeDataByType = params =>
+  get("/api/queryTreeDataByType", params);
+
+   

src/api/dictionaryCode.js

@@ -21,7 +21,7 @@ export const EsShrQuery = params =>
   postJson("/api2/EsShrQuery", params);
 
   export const queryDictItem = params =>
-  post("http://47.92.225.109:5177/dic/queryDictItem", params);
+  post("http://192.168.0.112:5177/dic/queryDictItem", params);
 
   export const getDictitemByCode = params =>
   post("http://47.92.225.109:5177/dic/getDictitemByCode", params);

src/api/home.js

@@ -10,8 +10,7 @@ export const test = params =>
 export const test1 = params =>
   get("http://39.99.159.210:8051/getXyrSaxxDg", params);
 
-export const login = params =>
-  post("https://uniapp.b2b2c.niuteam.cn/api/login/login", params);
 
-export const code = params =>
-  post("https://uniapp.b2b2c.niuteam.cn/api/captcha/captcha", params);
+export const login = params =>
+  post("/api/blade-auth/token", params);
+  

src/api/zdgl.js

+import { get, post, postJson, postform } from "@/utils/http.js";
+
+export const dictitemEdit = params =>
+    post("/api/dic/dictitemEdit", params);
+
+export const UpdateRedisRest = params =>
+    post("/api/UpdateRedisRest", params);
+
+export const xalbJoinGWDQ = params =>
+    post("/api/dic/xalbJoinGWDQ", params);
+    
\ No newline at end of file

src/components/bshQuery.vue

@@ -254,7 +254,7 @@
         >
           <el-table-column type="expand">
             <template slot-scope="props">
-                <span>{{props.row}}</span>
+              <span>{{ props.row }}</span>
               <!-- <el-table
                 id="ajzbQuery"
                 v-loading="tableLoading"
@@ -431,6 +431,7 @@ import LazySelectTreeDialog from "@c/lazy_treeCode_components.vue";
 import Http from "@/utils/http.js";
 import axios from "axios";
 import { esAsjQuery } from "@/api/queryAj.js";
+import { toQueryXszxx } from "@/api/cbyp.js";
 
 export default {
   name: "ptCxForm",
@@ -478,9 +479,9 @@ export default {
     };
   },
   methods: {
-      rowClick(row, column, event){
-          console.log(row, column, event);
-      },
+    rowClick(row, column, event) {
+      console.log(row, column, event);
+    },
     goDetail(scope) {
       this.$router.pushToTab({
         path: "ajbzDetail",
@@ -655,8 +656,13 @@ export default {
               : "";
         }
       }
+      var form = new FormData();
+      for(let key in json){
+        form.append(key,json[key])
+      }
+      console.log(json)
       if (flag) {
-        esAsjQuery(json)
+        toQueryXszxx(form)
           .then((response) => {
             if (response.status === 200) {
               self.tableData = response.data;

src/components/lazy_treeCode_components.vue

@@ -68,7 +68,6 @@
 
 <script>
 import Http from "@/utils/http.js";
-import url from "@/api/base";
 export default {
   name: "treeCode_components",
   props: {
@@ -135,7 +134,8 @@ export default {
             id: self.curFormData[self.curItem.id],
             grade: "prev"
           }
-          self.doQueryRequest(parm, "/queryCodeByType").then(codeResult => {
+          debugger
+          self.doQueryRequest(parm, "/api/queryTreeDataByType").then(codeResult => {
             var thisCodeOptions = [];
             if (codeResult.data.success) {
               var codRes = codeResult.data.data.data;
@@ -180,7 +180,7 @@ export default {
           id: self.curFormData[self.curItem.id],
           grade: "prev"
         }
-        self.doQueryRequest(parm, "/queryCodeByType").then(codeResult => {
+        self.doQueryRequest(parm, "/api/queryTreeDataByType").then(codeResult => {
           var thisCodeOptions = [];
           if (codeResult.data.success) {
             var codRes = codeResult.data.data.data;
@@ -340,7 +340,7 @@ export default {
           id: realFormLableAlign[realValueKey],
           grade: "prev"
         }
-        self.doQueryRequest(parm, "/queryCodeByType").then(codeResult => {
+        self.doQueryRequest(parm, "/api/queryTreeDataByType").then(codeResult => {
           if (codeResult.data.success) {
             var codRes = codeResult.data.data.data;
             var codeArry = [];
@@ -410,7 +410,7 @@ export default {
         parm.id = currentNode.data.id;
         parm.grade = "next"
       }
-      self.doQueryRequest(parm, "/queryCodeByType").then(codeResult => {
+      self.doQueryRequest(parm, "/api/queryTreeDataByType").then(codeResult => {
         if (codeResult.data.success) {
           //判断是否有下级
           codeResult.data.data.rows.forEach(realCodeItem => {
@@ -428,7 +428,7 @@ export default {
     doQueryRequest (form, relurl) {/*post方法*/
       var currentUrl = relurl ? relurl : this.cxUrl;
       return Http({
-        url: url.BaseURL + currentUrl,
+        url: currentUrl,
         data: form,
         params: form,
         method: "get",

src/components/ptCxForm_components.vue

@@ -593,10 +593,11 @@ export default {
     self.propQueryField.forEach((val) => {
       if (val.type == "code" || val.type == "codeTreeDialog") {
         if (val.codeOptions.length == 0) {
+          debugger
           axios
             .get(`JsonData/${val.codeTree}.json`)
             .then((res) => {
-              self.$set(val, "codeOptions", res.data.data.rows);
+              self.$set(val, "codeOptions", res.data.rows);
             })
             .catch((err) => {
               console.log(err);

src/utils/http.js

 import axios from "axios";
 // import { getToken } from "./auth.js";
-import { Message,MessageBox } from "element-ui";
+import { Message, MessageBox } from "element-ui";
 import qs from "qs";
 
 axios.defaults.timeout = 0;
 axios.defaults.headers = {
-  "X-Requested-With": "XMLHttpRequest"
+  "X-Requested-With": "XMLHttpRequest",
+  "authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0"
 };
 axios.defaults.responseType = "json";
 // axios.defaults.withCredentials = true;
 
 var instance = axios.create({
-  headers: { "content-type": "multipart/form-data" }
+  headers: { "content-type": "multipart/form-data" },
+  "authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0"
 });
 
 var json = axios.create({
-  headers: { "content-type": "application/json" }
+  headers: { "content-type": "application/json" },
+  "authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0"
 });
 
 // request 请求拦截器
 axios.interceptors.request.use(
   config => {
     config.headers["Content-Type"] = "application/x-www-form-urlencoded";
+    let token = sessionStorage.getItem("token")
+    debugger
+    if (config.url.indexOf("/api/blade-auth/token") === -1) {
+      config.headers["blade-auth"] = token;
+    }
     return config;
   },
   error => {

src/utils/params.js

@@ -624,15 +624,15 @@ let jccxAjxxDefaultFormField = {
       value: '',
       col: '3'
     },
-    {
-      name: '次类案类别',
-      id: 'xalbdmbcms',
-      type: 'code',
-      codeOptions: [],
-      codeTree: 'CODE_XALBDMBCMS',
-      value: '',
-      col: '3'
-    },
+    // {
+    //   name: '次类案类别',
+    //   id: 'xalbdmbcms',
+    //   type: 'code',
+    //   codeOptions: [],
+    //   codeTree: 'CODE_XALBDMBCMS',
+    //   value: '',
+    //   col: '3'
+    // },
     {
       name: '标注状态',
       id: 'bzzt',
@@ -1972,15 +1972,15 @@ let jccxAjxxFormField = {
       value: '',
       col: '3'
     },
-    {
-      name: '次类案类别',
-      id: 'xalbdmbcms',
-      type: 'code',
-      codeOptions: [],
-      codeTree: 'CODE_XALBDMBCMS',
-      value: '',
-      col: '3'
-    }
+    // {
+    //   name: '次类案类别',
+    //   id: 'xalbdmbcms',
+    //   type: 'code',
+    //   codeOptions: [],
+    //   codeTree: 'CODE_XALBDMBCMS',
+    //   value: '',
+    //   col: '3'
+    // }
   ]
 }
 let jccxXyrxxDefaultFormField = {
@@ -3835,10 +3835,10 @@ let AllAjformThead = [
     label: '类案类别',
     prop: 'ajxzlbMc'
   },
-  {
-    label: '次类案类别',
-    prop: 'xalbdmbcmsMc'
-  },
+  // {
+  //   label: '次类案类别',
+  //   prop: 'xalbdmbcmsMc'
+  // },
   {
     label: '案事件发生地经度',
     prop: 'asjfsddDqjd'

src/views/bztj.vue

@@ -115,6 +115,21 @@
                 align="center"
                 :width="columnTitle1.width"
               >
+                <template
+                  slot-scope="scope"
+                  
+                >
+                  <p v-if="columnTitle1.prop.indexOf('-') != -1">
+                    {{
+                      `${scope.row[stringToArr(columnTitle1.prop)[0]]}/${
+                        scope.row[stringToArr(columnTitle1.prop)[1]]
+                      }`
+                    }}
+                  </p>
+                  <p v-else>
+                    {{ scope.row[columnTitle1.prop] }}
+                  </p>
+                </template>
               </el-table-column>
             </el-table-column>
           </el-table>
@@ -137,9 +152,11 @@
 </template>
 
 <script>
+
+
 export default {
-  name: 'bztj',
-  data () {
+  name: "bztj",
+  data() {
     return {
       tableLoading: false, // 表格loading
       currentPage1: 1, //表格页码
@@ -148,515 +165,569 @@ export default {
       tableDataLength: 30,
       // 查询条件
       formData: {
-        lasjRqsjKssj: '',
-        lasjRqsjJssj: '',
-        asjfssjKssj: '',
-        asjfssjJssj: ''
+        lasjRqsjKssj: "",
+        lasjRqsjJssj: "",
+        asjfssjKssj: "",
+        asjfssjJssj: "",
       },
       // 输入框
       BztjCxtj: [
         {
-          name: '立案时间',
-          id: 'lasjRqsjKssj',
-          id2: 'lasjRqsjJssj',
-          type: 'zdyDate',
-          value: '',
-          col: '3'
-        },
-        {
-          name: '发案事件',
-          id: 'asjfssjKssj',
-          id2: 'asjfssjJssj',
-          type: 'zdyDate',
-          value: '',
-          col: '3'
-        }
+          name: "发案时间",
+          id: "asjfssjKssj",
+          id2: "asjfssjJssj",
+          type: "zdyDate",
+          value: "",
+          col: "3",
+        },
       ],
       // 表格表头
       bztjFormThead: [
         {
-          label: '立案单位',
-          prop: 'dwmc',
-          width: '280'
+          label: "立案单位",
+          prop: "dwmc",
+          width: "280",
         },
         {
-          label: '盗窃',
+          label: "盗窃",
           children: [
             {
-              label: '未标注',
-              prop: 'dqwbz',
-              width: '150'
+              label: "未标注/已标注",
+              prop: "dqwbz-dqbz",
+              width: "150",
             },
             {
-              label: '标注',
-              prop: 'dqbz',
-              width: '150'
-            }
-          ]
+              label: "已破/未破",
+              prop: "dqyp-dqwp",
+              width: "150",
+            },
+          ],
         },
         {
           /*table默认得表头*/
-          label: '诈骗案',
+          label: "诈骗案",
           children: [
             {
-              label: '未标注',
-              prop: 'zpawbz',
-              width: '150'
+              label: "未标注/已标注",
+              prop: "dqwbz-dqbz",
+              width: "150",
             },
             {
-              label: '标注',
-              prop: 'zpabz',
-              width: '150'
-            }
-          ]
+              label: "已破/未破",
+              prop: "dqyp-dqwp",
+              width: "150",
+            },
+          ],
         },
         {
-          label: '抢劫案',
+          label: "抢劫案",
           children: [
             {
-              label: '未标注',
-              prop: 'qjawbz',
-              width: '108'
+              label: "未标注/已标注",
+              prop: "dqwbz-dqbz",
+              width: "150",
             },
             {
-              label: '标注',
-              prop: 'qjabz',
-              width: '110'
-            }
-          ]
+              label: "已破/未破",
+              prop: "dqyp-dqwp",
+              width: "150",
+            },
+          ],
         },
         {
-          label: '抢夺案',
+          label: "抢夺案",
           children: [
             {
-              label: '未标注',
-              prop: 'qdawbz',
-              width: '150'
+              label: "未标注/已标注",
+              prop: "dqwbz-dqbz",
+              width: "150",
             },
             {
-              label: '标注',
-              prop: 'adabz',
-              width: '150'
-            }
-          ]
+              label: "已破/未破",
+              prop: "dqyp-dqwp",
+              width: "150",
+            },
+          ],
         },
         {
-          label: '招摇撞骗案',
+          label: "招摇撞骗案",
           children: [
             {
-              label: '未标注',
-              prop: 'ayzpawbz',
-              width: '150'
+              label: "未标注/已标注",
+              prop: "dqwbz-dqbz",
+              width: "150",
             },
             {
-              label: '标注',
-              prop: 'ayzpabz',
-              width: '150'
-            }
-          ]
-        }
+              label: "已破/未破",
+              prop: "dqyp-dqwp",
+              width: "150",
+            },
+          ],
+        },
       ],
       // 表格数据
       bztjDataList: [
         {
-          dwmc: '北京市公安局',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '2',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '天津市公安局',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '1',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '河北省公安厅',
-          dqwbz: '0',
-          dqbz: '5',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '内蒙古自治区公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '3',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '辽宁省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '8'
-        },
-        {
-          dwmc: '吉林省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '4',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '黑龙江省公安厅',
-          dqwbz: '0',
-          dqbz: '5',
-          zpawbz: '0',
-          zpabz: '2',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '上海市公安厅',
-          dqwbz: '0',
-          dqbz: '4',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '6',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '江苏省公安厅',
-          dqwbz: '0',
-          dqbz: '5',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '7'
-        },
-        {
-          dwmc: '浙江省公安厅',
-          dqwbz: '0',
-          dqbz: '5',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '安徽省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '6'
-        },
-        {
-          dwmc: '福建省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '3',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '江西省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '山东省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '河南省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '湖北省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '广东省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '广西壮族自治区公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '海南省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '重庆市公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '四川省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '贵州省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '云南省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '西藏自治区公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '陕西省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '甘肃省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '青海省公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '宁夏回族自治区公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        },
-        {
-          dwmc: '新疆维尔吾自治区公安厅',
-          dqwbz: '0',
-          dqbz: '1',
-          zpawbz: '0',
-          zpabz: '3',
-          qjawbz: '0',
-          qjabz: '4',
-          qdawbz: '0',
-          adabz: '2',
-          ayzpawbz: '0',
-          ayzpabz: '1'
-        }
-      ]
-    }
+          dwmc: "北京市公安局",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "2",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "2",
+          dqwp: "1",
+        },
+        {
+          dwmc: "天津市公安局",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "1",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "2",
+          dqwp: "1",
+        },
+        {
+          dwmc: "河北省公安厅",
+          dqwbz: "0",
+          dqbz: "5",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "2",
+          dqwp: "1",
+        },
+        {
+          dwmc: "内蒙古自治区公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "3",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "2",
+          dqwp: "1",
+        },
+        {
+          dwmc: "辽宁省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "8",
+          dqyp: "4",
+          dqwp: "3",
+        },
+        {
+          dwmc: "吉林省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "4",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "2",
+          dqwp: "0",
+        },
+        {
+          dwmc: "黑龙江省公安厅",
+          dqwbz: "0",
+          dqbz: "5",
+          zpawbz: "0",
+          zpabz: "2",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "1",
+          dqwp: "1",
+        },
+        {
+          dwmc: "上海市公安厅",
+          dqwbz: "0",
+          dqbz: "4",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "6",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "1",
+          dqwp: "0",
+        },
+        {
+          dwmc: "江苏省公安厅",
+          dqwbz: "0",
+          dqbz: "5",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "7",
+          dqyp: "0",
+          dqwp: "5",
+        },
+        {
+          dwmc: "浙江省公安厅",
+          dqwbz: "0",
+          dqbz: "5",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "3",
+          dqwp: "4",
+        },
+        {
+          dwmc: "安徽省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "6",
+          dqyp: "4",
+          dqwp: "5",
+        },
+        {
+          dwmc: "福建省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "3",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "2",
+          dqwp: "4",
+        },
+        {
+          dwmc: "江西省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "2",
+          dqwp: "1",
+        },
+        {
+          dwmc: "山东省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "3",
+          dqwp: "2",
+        },
+        {
+          dwmc: "河南省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "5",
+          dqwp: "1",
+        },
+        {
+          dwmc: "湖北省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "2",
+          dqwp: "3",
+        },
+        {
+          dwmc: "广东省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "1",
+          dqwp: "1",
+        },
+        {
+          dwmc: "广西壮族自治区公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "0",
+          dqwp: "0",
+        },
+        {
+          dwmc: "海南省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "3",
+          dqwp: "3",
+        },
+        {
+          dwmc: "重庆市公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "3",
+          dqwp: "0",
+        },
+        {
+          dwmc: "四川省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "0",
+          dqwp: "0",
+        },
+        {
+          dwmc: "贵州省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "1",
+          dqwp: "2",
+        },
+        {
+          dwmc: "云南省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "2",
+          dqwp: "1",
+        },
+        {
+          dwmc: "西藏自治区公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "3",
+          dqwp: "0",
+        },
+        {
+          dwmc: "陕西省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "2",
+          dqwp: "2",
+        },
+        {
+          dwmc: "甘肃省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "1",
+          dqwp: "3",
+        },
+        {
+          dwmc: "青海省公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "3",
+          dqwp: "2",
+        },
+        {
+          dwmc: "宁夏回族自治区公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "0",
+          dqwp: "0",
+        },
+        {
+          dwmc: "新疆维尔吾自治区公安厅",
+          dqwbz: "0",
+          dqbz: "1",
+          zpawbz: "0",
+          zpabz: "3",
+          qjawbz: "0",
+          qjabz: "4",
+          qdawbz: "0",
+          adabz: "2",
+          ayzpawbz: "0",
+          ayzpabz: "1",
+          dqyp: "4",
+          dqwp: "1",
+        },
+      ],
+    };
   },
   methods: {
     // 清空按钮
-    clearData () {
-      this.formData = {}
+    clearData() {
+      this.formData = {};
+    },
+    //字符串转数组
+    stringToArr(str) {
+      return str.split("-");
     },
     // 分页
-    handleSizeChange () {},
-    handleCurrentChange () {},
+    handleSizeChange() {},
+    handleCurrentChange() {},
     // 导出功能
-    export2Excel () {},
-    tableRowClassName ({ rowIndex }) {
+    export2Excel() {},
+    tableRowClassName({ rowIndex }) {
       if (rowIndex % 2 == 0) {
-        return ''
+        return "";
       } else {
-        return 'success-row'
+        return "success-row";
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -670,11 +741,11 @@ export default {
   color: #909399;
   font-weight: 500;
 }
-@import '@/assets/styles/rightContent.scss';
+@import "@/assets/styles/rightContent.scss";
 </style>
 
 <style>
-@import url('../assets/styles/iconfont.css');
+@import url("../assets/styles/iconfont.css");
 
 .el-dialog__body {
   padding: 10px 15px !important;

src/views/cbyp/bshcb.vue

@@ -13,6 +13,7 @@
 
 <script>
 import rightContent from '@c/bshQuery.vue'
+import { toQueryXszxx } from "@/api/cbyp.js";
 export default {
   name: 'bshcb',
   components: {
@@ -243,7 +244,22 @@ export default {
           width: '220'
         }
       ],
-      cxUrl: '/tbstAsj/stasj/queryAllMaAsjxx'
+      cxUrl: '/tbstAsj/stasj/queryAllMaAsjxx',
+    }
+  },
+    created(){
+    this.gettoQueryXszxx()
+  },
+  methods: {
+    gettoQueryXszxx(){
+      toQueryXszxx({
+        sEcho:1,
+        draw:1,
+        start:1,
+        length:10,
+        typeFlag:'bshcb',
+        cbxsly:'qs'
+      })
     }
   }
 }

src/views/index/home.vue

+<!--
+ * @Author: your name
+ * @Date: 2021-07-12 17:42:38
+ * @LastEditTime: 2021-07-12 21:46:32
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \founder_vue\src\views\index\home.vue
+-->
 <template>
   <div id="home">
+    <div class="header-message">
+      <div class="header-admin">
+        <span class="img-span"></span>
+        <span>欢迎您：</span>
+        <span>河北省公安厅</span>
+        <span>系统管理员：</span>
+      </div>
+      <div class="header-nav">
+        <span class="big-tv-nav">
+          <img src="../../assets/img/bigTvNav.png" width="15px" height="13.4px">
+        </span>
+        <span @click="goBigTV">数据大屏</span>
+      </div>
+    </div>
     <div class="title">
       <img src="../../assets/img/title.png" />
     </div>
     <div class="nav">
       <div class="navList" v-for="item in navList" :key="item.id">
-          <img :src="item.url" @click="goDetail(item.id)">
+        <img :src="item.url" @click="goDetail(item.id)" />
       </div>
     </div>
   </div>
@@ -15,42 +37,98 @@
 export default {
   data() {
     return {
-        navList:[
-            {
-                id:'zdgl',
-                url: require('../../assets/img/zd.png')
-            },
-             {
-                id:'/queryAj',
-                url: require('../../assets/img/ajbz.png')
-            },
-             {
-                id:'bztj',
-                url: require('../../assets/img/bztj.png')
-            },
-             {
-                id:'gwrq',
-                url: require('../../assets/img/gwrq.png')
-            },
-             {
-                id:'stfx',
-                url: require('../../assets/img/stfx.png')
-            },
-             {
-                id:'/bshcb',
-                url: require('../../assets/img/cbyp.png')
-            }
-        ]
+      navList: [
+        {
+          id: "/queryAj",
+          url: require("../../assets/img/nav1.png"), //案件标注
+        },
+        {
+          id: "/dwcx",
+          url: require("../../assets/img/nav2.png"), //标注统计
+        },
+        {
+          id: "/bshcb",
+          url: require("../../assets/img/nav3.png"), //串并研判
+        },
+        {
+          id: "/kshData",
+          url: require("../../assets/img/nav4.png"), //态势分析
+        },
+
+        {
+          id: "/bztj",
+          url: require("../../assets/img/nav5.png"), //高危人群
+        },
+        {
+          id: "/zdgl",
+          url: require("../../assets/img/nav6.png"), //字典管理
+        },
+      ],
     };
   },
   methods: {
-      goDetail(id){
-          this.$router.push(id)
-      }
+    goDetail(id) {
+      this.$router.push(id);
+    },
+    /**
+     * @description: 去打屏幕 
+     * @param {*}
+     * @return {*}
+     */    
+    goBigTV(){
+      this.$router.push({
+        path:'/kshData'
+      })
+    }
   },
 };
 </script>
 
 <style scoped lang="scss">
 @import "@/assets/styles/home.scss";
+#home{
+  width: 100%;
+  .header-message {
+    color: #FFFFFF;
+    font-size: 14px;
+    height: 50px;
+    display: flex;
+    .header-admin {
+      display: inline-block;
+      width: 400px;
+      height: 100%;
+      border-radius: 32px;
+      margin-top: 16px;
+      .img-span {
+        display: inline-block;
+        width: 32px;
+        height: 32px;
+        background-color: #FFFFFF;
+        border-radius: 32px;
+        margin-left: 24px;
+      }
+      span {
+        vertical-align: middle;
+        margin-left: 16px;
+      }
+    }
+    .header-nav {
+      float: right;
+      flex: 1;
+      text-align: right;
+      margin-right: 40px;
+      margin-top: 20px;
+      font-size: 14px;
+      vertical-align: middle;
+      color: #FFFFFF;
+      cursor: pointer;
+      .big-tv-nav {
+        margin-right: 7px;
+      }
+    }
+  }
+  .title {
+    margin-top: 45px;
+  }
+}
 </style>
\ No newline at end of file

src/views/index/kshData.vue

 <!--
  * @Author: your name
  * @Date: 2021-07-11 15:04:34
- * @LastEditTime: 2021-07-11 21:44:02
+ * @LastEditTime: 2021-07-13 10:00:23
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\index\kshData.vue
@@ -28,7 +28,7 @@
       <div class="timer">
         <span> {{ date }}</span>
         <span class="vertical"> | </span>
-        <p>
+        <p style="cursor: pointer" @click="goHome">
           <img src="~@/assets/img/homeLogo.png" alt="" />
           <span>首页</span>
         </p>
@@ -36,45 +36,103 @@
     </div>
     <div class="content">
       <div v-if="activeText == '类案态势分析'" class="cont">
-        <div></div>
-        <el-form ref="form1" :model="form1" label-width="80px" class="form">
-          <el-form-item>
-            <img src="~@/assets/img/time.png" class="el-icon-s-order" alt="" />
-            <el-date-picker
-              v-model="form1.time"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+        <div class="leftAside">
+          <el-form ref="form1" :model="form1" label-width="80px" class="form">
+            <el-form-item>
+              <img
+                src="~@/assets/img/time.png"
+                class="el-icon-s-order"
+                alt=""
+              />
+              <el-date-picker
+                v-model="form1.time"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item prop="name">
+                  <el-input v-model="form1.id"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item prop="name">
+                  <el-input
+                    v-model="form1.type"
+                    placeholder="案件主类别"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item prop="name">
+              <el-select
+                v-model="form1.name"
+                class="w200"
+                placeholder="案件分类"
+              ></el-select>
+            </el-form-item>
+            <el-form-item prop="name">
+              <el-select
+                v-model="form1.aa"
+                class="w200"
+                placeholder="行政区划"
+              ></el-select>
+            </el-form-item>
+            <el-form-item prop="name">
+              <el-button type="primary" class="search">查询</el-button>
+              <el-button class="reset">重置</el-button>
+            </el-form-item>
+          </el-form>
+          <div id="bothTheData" ref="bothTheData">
+            <div
+              class="ajtj_list"
+              v-for="(item, index) in ajtjList"
+              :key="index"
             >
-            </el-date-picker>
-          </el-form-item>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item prop="name">
-                <el-input v-model="form1.id"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="name">
-                <el-input v-model="form1.type"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item prop="name">
-            <el-input v-model="form1.name"></el-input>
-          </el-form-item>
-          <el-form-item prop="name">
-            <el-input v-model="form1.aa" class="w200"></el-input>
-          </el-form-item>
-          <el-form-item prop="name">
-            <el-button type="primary" class="search">查询</el-button>
-            <el-button class="reset">重置</el-button>
-          </el-form-item>
-        </el-form>
+              <p class="lTitle">
+                {{ item.title }}
+              </p>
+              <p
+                class="numBar"
+                :style="{
+                  width: item.value
+                    ? (item.value / arrNumAdd(ajtjList, 'value')) * 344 + 'px'
+                    : '0px',
+                  backgroundColor: item.color,
+                }"
+              ></p>
+              <span class="num">{{ item.value == null ? 0 : item.value }}</span>
+            </div>
+          </div>
+          <div id="suchCaseTop10" ref="suchCaseTop10"></div>
+        </div>
+        <div class="map" id="map" ref="map"></div>
         <div class="aside">
-          <div class="aside_solveacase"></div>
-          <div class="aside_highRisk"></div>
+          <div class="aside_solveacase">
+            <div class="btnBox">
+              <span
+                :class="{ activeBtn: activeBtn == 'Top12' }"
+                @click="updateBtn('Top12')"
+                >Top12</span
+              >
+              <span
+                :class="{ activeBtn: activeBtn == '12-24' }"
+                @click="updateBtn('12-24')"
+                >12-24</span
+              >
+              <span
+                :class="{ activeBtn: activeBtn == '24-36' }"
+                @click="updateBtn('24-36')"
+                >24-36</span
+              >
+            </div>
+            <div class="w100h100" ref="aside_solveacase"></div>
+          </div>
+          <div class="aside_highRisk" ref="aside_highRisk"></div>
         </div>
       </div>
       <div v-else>
@@ -91,7 +149,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-input v-model="form1.aa" class="w200"></el-input>
+            <el-select v-model="form1.aa" class="w200"></el-select>
           </el-form-item>
           <el-form-item prop="name">
             <el-button type="primary" class="search">查询</el-button>
@@ -109,11 +167,13 @@
   </div>
 </template>
 <script>
+import "echarts/map/js/china.js";
 export default {
   data() {
     return {
       date: this.$moment(new Date()).format("YYYY-MM-DD"),
       activeText: "类案态势分析",
+      activeBtn: "Top12",
       form1: {
         time: "",
         name: "",
@@ -126,49 +186,46 @@ export default {
       },
       data2: [
         {
-          name: "Adidas",
-          value: 22424,
+          name: "无业",
+          value: 18274,
         },
         {
-          name: "Nike",
-          value: 10131,
+          name: "务工",
+          value: 39285,
         },
         {
-          name: "Pumas",
-          value: 15252,
+          name: "务农",
+          value: 24215,
         },
         {
-          name: "Convers",
-          value: 20232,
+          name: "其他",
+          value: 15125,
         },
       ],
       data3: [
         {
-          name: "first",
-          value: 1121,
-        },
-        {
-          name: "second",
-          value: 2424,
+          name: "大学及以上",
+          value: 22516,
         },
         {
-          name: "third",
-          value: 313,
+          name: "高中",
+          value: 35150,
         },
         {
-          name: "fourth",
-          value: 4131,
+          name: "初中",
+          value: 25116,
         },
         {
-          name: "fifth",
-          value: 52323,
+          name: "小学及以下",
+          value: 11415,
         },
         {
-          name: "sixth",
-          value: 62223,
+          name: "其他",
+          value: 16128,
         },
       ],
-      data4: [1400, 2380, 4360, 5340, 6320, 3300, 4280, 5260, 1240, 2320],
+      data4: [1400, 2380, 4360, 5340, 3320, 3300, 4280, 5260, 1240, 2320],
+      data5: [1300, 1380, 4320, 5540, 2320, 4300, 1280, 3260, 2240, 3320],
       colorList: [
         "#39B3FF",
         "#47E0E0",
@@ -182,35 +239,139 @@ export default {
       ],
       ydata: [
         "盗窃汽车",
-        "盗窃汽车",
-        "盗窃汽车",
-        "盗窃汽车",
-        "盗窃汽车",
-        "盗窃汽车",
-        "盗窃汽车",
-        "盗窃汽车",
-        "盗窃汽车",
-        "盗窃汽车",
+        "盗窃摩托车",
+        "盗窃其他机动车",
+        "盗窃自行车",
+        "盗窃电动自行车",
+        "盗窃电动自行车电瓶",
+        "盗窃其他非机动车",
+        "随窃",
+        "盗窃车辆燃油",
+        "盗窃车辆配件",
+      ],
+      areaYData: [
+        "广州",
+        "上海",
+        "北京",
+        "云南",
+        "山东",
+        "河北",
+        "四川",
+        "湖北",
+        "陕西",
+        "内蒙",
+      ],
+      highRiskData: [80, 80, 97, 53, 95, 26, 72, 55],
+      highRiskX: [
+        "广州",
+        "云南",
+        "江西",
+        "河北",
+        "江苏",
+        "陕西",
+        "河南",
+        "安徽",
+      ],
+      points: [
+        {
+          value: [117.4219, 39.4189],
+        },
+        {
+          value: [103.5901, 36.3043],
+        },
+        {
+          value: [112.3352, 37.9413],
+        },
+        {
+          value: [113.62, 34.75],
+        },
+        {
+          value: [109.48, 36.6],
+        },
+        {
+          value: [107.13, 34.37],
+        },
+        {
+          value: [113.23, 23.16],
+        },
+        {
+          value: [117.4219, 39.4189],
+        },
+        {
+          value: [108.37, 22.82],
+        },
+        {
+          value: [109.1162, 34.2004],
+        },
+        {
+          value: [103.5901, 36.3043],
+        },
+        {
+          value: [106.3586, 38.1775],
+        },
+        {
+          value: [103.9526, 30.7617],
+        },
+      ],
+      ajtjList: [
+        {
+          id: "maFaCount",
+          title: "发案数据",
+          value: 242367,
+          color: "#FF7336",
+          type: "up",
+          num: null,
+        },
+        {
+          id: "maPaCount",
+          title: "破案数据",
+          value: 215578,
+          color: "#43E1FF",
+          type: "up",
+          num: null,
+        },
       ],
     };
   },
   watch: {
-    activeText(val) {
-      if (val == "前科人员态势分析") {
-        this.$nextTick(() => {
-          //折线图
-          this.setLineDiagram();
-          //玫瑰图
-          this.setRoseDiagram(this.data2);
-          //饼图
-          this.setPieDiagram(this.data3);
-          //柱状图
-          this.setBarDiagram(this.ydata, this.data4, this.colorList);
-        });
-      }
+    activeText: {
+      handler(val) {
+        if (val == "前科人员态势分析") {
+          this.$nextTick(() => {
+            //折线图
+            this.setLineDiagram();
+            //玫瑰图
+            this.setRoseDiagram(this.data2);
+            //饼图
+            this.setPieDiagram(this.data3);
+            //柱状图
+            this.setBarDiagram(this.ydata, this.data4, this.colorList);
+          });
+        } else {
+          this.$nextTick(() => {
+            //高危Top10
+            this.aside_highRisk(this.highRiskX, this.highRiskData);
+            //发破案态势统计
+            this.setAside_solveacase(
+              this.areaYData,
+              this.data4,
+              this.data5,
+              this.colorList
+            );
+            //地图
+            this.setMap();
+            //类案top10
+            this.setSuchCaseTop10(this.ydata, this.data4, this.colorList);
+          });
+        }
+      },
+      immediate: true,
     },
   },
   methods: {
+    updateBtn(name) {
+      this.activeBtn = name;
+    },
     setLineDiagram() {
       // 基于准备好的dom，初始化echarts实例
       let myChart = this.$echarts.init(this.$refs.lineDiagram);
@@ -254,6 +415,17 @@ export default {
             },
           },
         },
+        legend: {
+          right: 85,
+          top: 26,
+          textStyle: {
+            color: "#fff",
+          },
+          itemWidth: 12,
+          itemHeight: 10,
+          itemWidth: 14,
+          itemGap: 17,
+        },
         grid: {
           top: "24%",
           left: "10%",
@@ -327,11 +499,11 @@ export default {
               },
             },
             itemStyle: {
-              color: "#000",
-              borderColor: "#28DBF1",
-              borderWidth: 2,
+              color: "#28DBF1",
+              // borderColor: "#000",
+              // borderWidth: 3,
             },
-            data: [4, 7, 5, 4], //data.values
+            data: [42626, 91880, 80880, 84200], //data.values
           },
           {
             name: "女性",
@@ -352,11 +524,11 @@ export default {
               },
             },
             itemStyle: {
-              color: "#000",
-              borderColor: "#EAC42E",
-              borderWidth: 2,
+              color: "#EAC42E",
+              // borderColor: "#EAC42E",
+              // borderWidth: 2,
             },
-            data: [3, 5, 4, 2], //data.values
+            data: [29140, 49140, 59278, 54233], //data.values
           },
         ],
       });
@@ -573,7 +745,7 @@ export default {
           show: false,
         },
         grid: {
-          left: "6%",
+          left: "5%",
           right: "10%",
           bottom: "3%",
           containLabel: true,
@@ -614,6 +786,7 @@ export default {
             type: "bar",
             barWidth: 6, // 柱子宽度
             itemStyle: {
+              barBorderRadius: [0, 10, 10, 0],
               color: (params) => {
                 return colorList[params.dataIndex];
               },
@@ -631,17 +804,478 @@ export default {
         ],
       });
     },
+    setAside_solveacase(y, data1, data2, colorList) {
+      let myChart = this.$echarts.init(this.$refs.aside_solveacase);
+      myChart.setOption({
+        title: {
+          text: "发破案态势统计",
+          textStyle: {
+            color: "#fff",
+            fontWeight: 600,
+            fontSize: 20,
+          },
+          left: "3%",
+          top: "5%",
+        },
+        legend: {
+          right: 35,
+          top: 26,
+          textStyle: {
+            color: "#fff",
+          },
+          itemWidth: 12,
+          itemHeight: 10,
+          itemWidth: 14,
+          itemGap: 17,
+        },
+        tooltip: {
+          data: ["发案数", "破案数"],
+          trigger: "axis",
+          show: true,
+          axisPointer: {
+            // 坐标轴指示器，坐标轴触发有效
+            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+          },
+        },
+        grid: {
+          left: "6%",
+          right: "29%",
+          bottom: "3%",
+          top: "20%",
+          containLabel: true,
+        },
+        xAxis: [
+          {
+            splitLine: {
+              show: false,
+            },
+            type: "value",
+            show: false,
+          },
+        ],
+        yAxis: [
+          {
+            splitLine: {
+              show: false,
+            },
+            axisLine: {
+              //y轴
+              show: false,
+            },
+            type: "category",
+            axisTick: {
+              show: false,
+            },
+            inverse: true,
+            data: y,
+            axisLabel: {
+              color: "#A7D6F4",
+              fontSize: 14,
+            },
+          },
+        ],
+        series: [
+          {
+            name: "发案数",
+            type: "bar",
+            barWidth: 6, // 柱子宽度
+            barGap: "130%",
+            itemStyle: {
+              barBorderRadius: [0, 10, 10, 0],
+              color: new this.$echarts.graphic.LinearGradient(0, 0, 1, 0, [
+                {
+                  offset: 0,
+                  color: "#FDCC00",
+                },
+                {
+                  offset: 1,
+                  color: "#EC7817",
+                },
+              ]),
+            },
+            label: {
+              show: true,
+              position: "right", // 位置
+              color: "#FDCC00",
+              fontSize: 12,
+            }, // 柱子上方的数值
+            data: data1,
+          },
+          {
+            name: "破案数",
+            type: "bar",
+            barWidth: 6, // 柱子宽度
+            label: {
+              show: true,
+              position: "right", // 位置
+              color: "#2AD8FF",
+              fontSize: 12,
+            }, // 柱子上方的数值
+            itemStyle: {
+              barBorderRadius: [0, 10, 10, 0],
+              color: new this.$echarts.graphic.LinearGradient(0, 0, 1, 0, [
+                {
+                  offset: 0,
+                  color: "#2AD8FF",
+                },
+                {
+                  offset: 1,
+                  color: "#1A96FF",
+                },
+              ]),
+            },
+            data: data2,
+          },
+        ],
+      });
+    },
+    aside_highRisk(x, data) {
+      let myChart = this.$echarts.init(this.$refs.aside_highRisk);
+      myChart.setOption({
+        title: {
+          text: "地域性高危人群top10",
+          textStyle: {
+            color: "#fff",
+            fontWeight: 600,
+            fontSize: 18,
+          },
+          left: "3%",
+          top: "5%",
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // 坐标轴指示器，坐标轴触发有效
+            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+          },
+        },
+        grid: {
+          top: "30%",
+          left: "15%",
+          right: "10%",
+          bottom: "15%",
+          // containLabel: true
+        },
+        xAxis: [
+          {
+            type: "category",
+            axisLine: {
+              show: false,
+              color: "#A582EA",
+            },
+            axisLabel: {
+              color: "#B0BAD3",
+              width: 100,
+            },
+            splitLine: {
+              show: false,
+            },
+            boundaryGap: true,
+            data: x,
+          },
+        ],
+        yAxis: [
+          {
+            type: "value",
+            min: 0,
+            splitNumber: 4,
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: "#00BFF3",
+                opacity: 0.23,
+              },
+            },
+            axisLine: {
+              show: false,
+            },
+            axisLabel: {
+              show: true,
+              margin: 20,
+              textStyle: {
+                color: "#939FB3",
+              },
+            },
+            axisTick: {
+              show: false,
+            },
+          },
+        ],
+        legend: {
+          right: 35,
+          top: 12,
+          textStyle: {
+            color: "#fff",
+          },
+          itemWidth: 12,
+          itemHeight: 10,
+          // itemGap: 35
+        },
+        series: [
+          {
+            name: "人员数",
+            type: "bar",
+            data: data,
+            barWidth: "15px",
+            itemStyle: {
+              normal: {
+                color: "#247FDC",
+              },
+            },
+          },
+        ],
+      });
+    },
+    setSuchCaseTop10(y, data, colorList) {
+      let myChart = this.$echarts.init(this.$refs.suchCaseTop10);
+      myChart.setOption({
+        title: {
+          text: "类案TOP10",
+          textStyle: {
+            color: "#fff",
+            fontWeight: 600,
+            fontSize: 20,
+          },
+          left: "-1%",
+          top: "8%",
+        },
+        tooltip: {
+          trigger: "axis",
+          show: false,
+          axisPointer: {
+            // 坐标轴指示器，坐标轴触发有效
+            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+          },
+        },
+        legend: {
+          show: false,
+        },
+        grid: {
+          left: "0%",
+          right: "10%",
+          bottom: "3%",
+          containLabel: true,
+        },
+        xAxis: [
+          {
+            splitLine: {
+              show: false,
+            },
+            type: "value",
+            show: false,
+          },
+        ],
+        yAxis: [
+          {
+            splitLine: {
+              show: false,
+            },
+            axisLine: {
+              //y轴
+              show: false,
+            },
+            type: "category",
+            axisTick: {
+              show: false,
+            },
+            inverse: true,
+            data: y,
+            axisLabel: {
+              color: "#A7D6F4",
+              fontSize: 14,
+            },
+          },
+        ],
+        series: [
+          {
+            name: "标准化",
+            type: "bar",
+            barWidth: 6, // 柱子宽度
+            itemStyle: {
+              barBorderRadius: [0, 10, 10, 0],
+              color: (params) => {
+                return colorList[params.dataIndex];
+              },
+            },
+            data: data,
+          },
+        ],
+      });
+    },
+    setMap() {
+      let myChart = this.$echarts.init(this.$refs.map);
+      myChart.setOption({
+        geo: {
+          map: "china",
+          aspectScale: 0.75, //长宽比
+          zoom: 1.1,
+          scaleLimit: {
+            min: 1,
+            max: 3,
+          },
+          roam: false,
+          itemStyle: {
+            areaColor: "#0153AA",
+            borderColor: "#51E5F2",
+            borderWidth: 3, //设置外层边框
+            shadowBlur: 5,
+            shadowOffsetY: 8,
+            shadowOffsetX: 0,
+            shadowColor: "#51E5F2",
+          },
+          emphasis: {
+            areaColor: "#0d0059",
+            borderColor: "#51E5F2",
+            borderWidth: 3, //设置外层边框
+            shadowBlur: 5,
+            shadowOffsetY: 8,
+            shadowOffsetX: 0,
+            shadowColor: "#51E5F2",
+          },
+          regions: [
+            {
+              name: "南海诸岛",
+              itemStyle: {
+                // areaColor: "rgba(0, 10, 52, 1)",
+                // borderColor: "rgba(0, 10, 52, 1)",
+                normal: {
+                  opacity: 0,
+                  label: {
+                    show: false,
+                    // color: "#000",
+                  },
+                },
+              },
+            },
+          ],
+        },
+        series: [
+          {
+            type: "map",
+            roam: false,
+            label: {
+              normal: {
+                show: true,
+                textStyle: {
+                  color: "#fff",
+                },
+              },
+              emphasis: {
+                textStyle: {
+                  color: "#fff",
+                },
+              },
+            },
+            itemStyle: {
+              normal: {
+                areaColor: "#237FDB",
+                borderColor: "#3FBFF6",
+                borderWidth: 1.8,
+              },
+              emphasis: {
+                areaColor: "rgba(147, 235, 248, 0)",
+              },
+            },
+            zoom: 1.1,
+            //     roam: false,
+            map: "china", //使用
+            // data: this.difficultData //热力图数据   不同区域 不同的底色
+          },
+          {
+            type: "effectScatter",
+            coordinateSystem: "geo",
+            showEffectOn: "render",
+            zlevel: 1,
+            hoverAnimation: true,
+            itemStyle: {
+              normal: {
+                color: {
+                  type: "radial",
+                  x: 0.5,
+                  y: 0.5,
+                  r: 2.5,
+                  colorStops: [
+                    {
+                      offset: 0,
+                      color: "#FEEB3D", // 0% 处的颜色
+                    },
+                    {
+                      offset: 0.5,
+                      color: "red", // 0% 处的颜色
+                    },
+                    {
+                      offset: 1,
+                      color: "#237FDB", // 100% 处的颜色
+                    },
+                  ],
+                  global: false, // 缺省为 false
+                },
+              },
+            },
+            symbolSize: 16,
+            data: this.points,
+          },
+        ],
+      });
+    },
+    arrNumAdd(arr, key) {
+      let totalPrice;
+      totalPrice = arr.reduce((prev, next) => {
+        return prev + next[key];
+      }, 0);
+      return totalPrice;
+    },
+    goHome(){
+      this.$router.push('/home')
+    }
   },
 };
 </script>
 
 <style scoped lang="scss">
+@mixin scrollBarStyle() {
+  &::-webkit-scrollbar {
+    width: 7px;
+    height: 7px;
+  }
+  &::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px #fff;
+    background: rgba(3, 69, 108, 0.5);
+  }
+}
 @mixin titleStyle() {
   font-size: 16px;
   font-family: Microsoft YaHei;
   font-weight: 400;
   color: #f5f5f5;
 }
+.w100h100 {
+  height: 100%;
+  width: 100%;
+}
+.btnBox {
+  position: absolute;
+  top: 70px;
+  left: 30px;
+  width: 280px;
+  height: 20px;
+  display: flex;
+  justify-content: space-between;
+  > span {
+    cursor: pointer;
+    z-index: 88;
+    width: 80px;
+    height: 20px;
+    color: rgba($color: #e6ecf1, $alpha: 0.5);
+    text-align: center;
+    background: rgba($color: #2480db, $alpha: 0.2);
+  }
+  > .activeBtn {
+    background: rgba($color: #2480db, $alpha: 1);
+    color: #fff;
+  }
+}
 .daping_box {
   height: 100vh;
   background-image: url("~@/assets/img/bg13.png");
@@ -672,6 +1306,7 @@ export default {
     }
     .selectBtn {
       @include titleStyle();
+      cursor: pointer;
       border: 1px solid #2766f5;
       position: absolute;
       left: 50%;
@@ -706,11 +1341,15 @@ export default {
     }
   }
   .content /deep/ {
+    .el-input__inner,
+    .el-range-input {
+      color: #fff;
+    }
     height: calc(100% - 90px);
     width: 100%;
     .w200 {
       width: 235px;
-      > .el-input__inner {
+      .el-input__inner {
         width: 235px !important;
       }
     }
@@ -731,17 +1370,51 @@ export default {
       border-radius: 2px;
     }
     .cont {
+      display: flex;
+      .leftAside {
+        height: 98%;
+        width: 390px;
+        > #bothTheData {
+          height: 31%;
+          width: 100%;
+          overflow: auto;
+          @include scrollBarStyle();
+          .lTitle {
+            font-size: 16px;
+            color: #efefef;
+            font-weight: 400;
+            font-family: Microsoft YaHei;
+          }
+          .numBar {
+            margin-top: 5px;
+            height: 6px;
+            border-radius: 0 3px 3px 0;
+            width: 90%;
+          }
+          .num {
+            color: #ffffff;
+            font-weight: 400;
+            font-size: 28px;
+          }
+        }
+        > #suchCaseTop10 {
+          height: 35%;
+          width: 100%;
+        }
+      }
+      .map {
+        height: 98%;
+        width: calc(100% - 840px) !important;
+      }
       .aside {
-        height: 95%;
+        height: 98%;
         display: flex;
         flex-flow: column;
         justify-content: space-between;
-        position: absolute;
-        right: 60px;
-        top: 0;
         z-index: 4;
         width: 450px;
         .aside_solveacase {
+          position: relative;
           width: 100%;
           height: 70%;
           background-color: rgba(0, 0, 0, 0.2);
@@ -754,6 +1427,7 @@ export default {
       }
     }
     .el-form-item__content {
+      // height: 40px;
       margin-top: 20px;
       margin-left: 70px !important;
       position: relative;
@@ -798,6 +1472,7 @@ export default {
     }
     .form {
       width: 310px;
+      height: 33%;
       .el-form-item {
         margin-bottom: 0;
       }

src/views/index/login.vue

@@ -65,6 +65,7 @@
 
 <script>
 import { mapGetters } from "vuex";
+import { login } from "@/api/home.js";
 export default {
   data() {
     return {
@@ -83,8 +84,22 @@ export default {
   },
   methods: {
     handleSubmit() {
-      debugger
-      this.$router.push('/home')
+      login({
+        account:this.ruleForm2.account,
+        password:this.ruleForm2.password
+      }).then(res=>{
+        if(res.code == 200){
+          sessionStorage.setItem('token', 'bearer ' + res.data.accessToken);
+          sessionStorage.setItem("userInfo",JSON.stringify(res.data.data))
+        }else{
+          this.$confirm("账号或密码错误！", {
+            confirmButtonText: "确定",
+            showCancelButton: false,
+            type: "warning",
+          });
+        }
+      })
+      // this.$router.push('/home')
     } 
   },
   computed: {

src/views/zdgl.vue

 <template>
   <el-container class="main">
     <el-container>
-      <el-aside class="left"
-                width="304px">
+      <el-aside class="left" width="304px">
         <div class="title">字典管理</div>
         <div class="tree">
-          <el-tree :data="setTree"
-                   :props="defaultProps"
-                   @node-click="handleNodeClick"></el-tree>
+          <el-tree
+            :data="setTree"
+            :props="defaultProps"
+            @node-click="handleNodeClick"
+          ></el-tree>
         </div>
       </el-aside>
       <el-main>
-
         <div class="mainHeader">
           <div class="mainTitle"><span>盗抢骗案下级分类</span></div>
         </div>
 
         <div class="btn">
-          <el-button type="primary"
-                     plain
-                     size="mini">添加</el-button>
-          <el-button type="primary"
-                     plain
-                     size="mini">编辑</el-button>
-          <el-button type="primary"
-                     plain
-                     size="mini">删除</el-button>
-          <el-button type="primary"
-                     plain
-                     size="mini"
-                     style="margin-left:16px">关联高危地区</el-button>
+          <el-button
+            type="primary"
+            @click="zdSubmit('insert')"
+            plain
+            size="mini"
+            >添加</el-button
+          >
+          <el-button
+            type="primary"
+            @click="zdSubmit('update')"
+            plain
+            size="mini"
+            >编辑</el-button
+          >
+          <el-button
+            type="primary"
+            @click="zdSubmit('delete')"
+            plain
+            size="mini"
+            >删除</el-button
+          >
+          <el-button
+            type="primary"
+            plain
+            size="mini"
+            style="margin-left: 16px"
+            @click="gwdqSubmit"
+            >关联高危地区</el-button
+          >
         </div>
         <div>
-          <el-table ref="multipleTable"
-                    :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 98%"
-                    max-height="750px"
-                    @selection-change="handleSelectionChange">
-            <el-table-column type="selection"
-                             width="55">
-            </el-table-column>
-            <el-table-column label="字典名称"
-                             width="250">
+          <el-table
+            ref="multipleTable"
+            :data="tableData"
+            tooltip-effect="dark"
+            style="width: 98%"
+            max-height="750px"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column type="selection" width="55"> </el-table-column>
+            <el-table-column label="字典名称" width="250">
               <template slot-scope="scope">{{ scope.row.name }}</template>
             </el-table-column>
-            <el-table-column prop="code"
-                             label="字典代码"
-                             width="120">
+            <el-table-column prop="code" label="字典代码" width="120">
             </el-table-column>
-            <el-table-column prop="description"
-                             label="字典描述"
-                             show-overflow-tooltip>
+            <el-table-column
+              prop="description"
+              label="字典描述"
+              show-overflow-tooltip
+            >
             </el-table-column>
           </el-table>
         </div>
-
       </el-main>
+      <el-dialog
+        :title="dialogName"
+        :visible.sync="zdDialogVisible"
+        width="650px"
+        center
+      >
+        <el-form
+          label-width="100px"
+          :model="formLabelAlign"
+          style="margin-top: 20px"
+        >
+          <el-form-item label="字典名称" style="width: 500px">
+            <el-input v-model="formLabelAlign.name"></el-input>
+          </el-form-item>
+          <el-form-item label="组" style="width: 500px">
+            <el-input disabled v-model="formLabelAlign.group"></el-input>
+          </el-form-item>
+          <el-form-item label="上级字典" style="width: 500px">
+            <el-input disabled v-model="formLabelAlign.parentCode"></el-input>
+          </el-form-item>
+          <el-form-item label="字典描述" style="width: 500px">
+            <el-input type="textarea" v-model="formLabelAlign.ms"></el-input>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="zdDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="zdSumit()">确 定</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog
+        title="关联高危地区"
+        :visible.sync="gwdqDialogVisible"
+        width="650px"
+        center
+      >
+        <el-form
+          label-width="100px"
+          :model="formLabelAlign2"
+          style="margin-top: 20px"
+        >
+          <el-form-item label="字典名称" style="width: 500px">
+            <el-select
+              v-model="formLabelAlign2.xzqh"
+              clearable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in optionxz"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="行政区划代码" style="width: 500px">
+            <el-input v-model="formLabelAlign2.xzqhdm"></el-input>
+          </el-form-item>
+          <el-form-item label="重点乡村镇" style="width: 500px">
+            <el-input v-model="formLabelAlign2.xc"></el-input>
+          </el-form-item>
+          <el-form-item label="重点族别" style="width: 500px">
+            <el-select
+              v-model="formLabelAlign2.zb"
+              clearable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in optionzb"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="手段描述" style="width: 500px">
+            <el-input type="textarea" v-model="formLabelAlign2.ms"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-table :data="gwdqData" border stripe>
+          <el-table-column type="index" width="50" label="序号">
+          </el-table-column>
+          <el-table-column
+            v-for="(columnTitle, columnIndex) in gwdqList"
+            :key="columnTitle.label"
+            :label="columnTitle.label"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <div
+                v-if="
+                  columnIndex == gwdqList.length - 1 && columnTitle.prop == 'cz'
+                "
+                style="
+                  color: #1a81e1;
+                  cursor: pointer;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                "
+              >
+                <span @click="xxDetail(scope, xsitem.isClick)">{{
+                  scope.row[columnTitle.prop]
+                }}</span>
+
+                <span
+                  style="margin-left: 20px"
+                  v-if="scope.row.sfzsshan == '0'"
+                  @click="zlshDetail(scope)"
+                  >指令审核</span
+                >
+              </div>
+              <div v-else>
+                {{ scope.row[columnTitle.prop] }}
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="gwdqDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="gwdqSumits()">确 定</el-button>
+        </span>
+      </el-dialog>
     </el-container>
   </el-container>
 </template>
 
 <script>
 import { queryDictItem } from "@/api/dictionaryCode.js";
+import { dictitemEdit, UpdateRedisRest, xalbJoinGWDQ } from "@/api/zdgl.js";
 export default {
   name: "zdgl",
-  data () {
+  data() {
     return {
+      gwdqData:[],
+      gwdqList: [
+        {
+          /*table默认得表头*/
+          label: "移交单位",
+          prop: "tbdwdm",
+        },
+        {
+          /*table默认得表头*/
+          label: "移交单位名称",
+          prop: "tbdwmc",
+        },
+        {
+          /*table默认得表头*/
+          label: "移交人",
+          prop: "tbrxm",
+        },
+        {
+          /*table默认得表头*/
+          label: "移交时间",
+          prop: "tbsj",
+        },
+      ],
+      optionxz: [],
+      optionzb: [],
+      jccxAjxxFormField: {
+        title: "案件信息",
+        id: "1",
+        data: [
+          {
+            name: "案事件编号",
+            id: "asjbh",
+            type: "text",
+            value: "",
+            placeholder: "请输入",
+            col: "3",
+          },
+          {
+            name: "受理单位",
+            id: "sldwGajgjgdm",
+            type: "codeTreeDialog", //字典弹框
+            props: [], //字典弹框需要的字段
+            codeOptions: [],
+            codeTree: "CODE_UNIT",
+            value: "",
+            col: "3",
+          },
+        ],
+      },
+      gwdqDialogVisible: false,
       setTree: [],
       defaultProps: {
-        children: 'children',
-        label: 'label'
+        children: "children",
+        label: "label",
       },
       pid: "",
       groupid: "",
       treeData: [],
       organList: [],
       tableData: [],
+      zdDialogVisible: false,
+      formLabelAlign: {
+        xzqh: "",
+        group: "",
+        parentCode: "",
+        zb: "",
+        ms: "",
+      },
+      formLabelAlign2: {
+        xzqhdm: "",
+        xc: "",
+        ms: "",
+        xzqh: "",
+        zb: "",
+      },
+      submitType: "",
+      seleteObj: {},
+      dialogName: "",
+      allSelect: [],
     };
   },
-  created () {
-    this.getQuery()
+  created() {
+    this.getQuery();
   },
   methods: {
-    handleSelectionChange (data) {
-      console.log(data);
+    getRedis() {
+      UpdateRedisRest({
+        type: "CODE_GABAJZLB",
+      }).then();
+      UpdateRedisRest({
+        type: "CODE_GABAJXZLB",
+      }).then();
     },
-    getQuery () {
-      queryDictItem(
-        {
-          pid: "",
-          groupid: "CODE_GABAJZLB"
+    zdSubmit(type) {
+      var self = this;
+      this.submitType = type;
+      if (this.submitType == "update") {
+        this.dialogName == "编辑字典";
+      } else if (this.submitType == "delete") {
+        this.dialogName == "删除字典";
+      } else {
+        this.dialogName == "新增字典";
+        this.zdDialogVisible = true;
+      }
+      if (this.submitType == "update" || this.submitType == "delete") {
+        if (this.allSelect.length != 1) {
+          this.$confirm("一次只能对一条数据进行操作", {
+            confirmButtonText: "确定",
+            showCancelButton: false,
+            type: "warning",
+          });
+        } else {
+          self.formLabelAlign.group = self.seleteObj.groupname;
+          self.formLabelAlign.name = self.seleteObj.name;
+          self.formLabelAlign.parentCode = self.seleteObj.pname;
+          self.formLabelAlign.ms = self.seleteObj.description;
+          this.zdDialogVisible = true;
+        }
+      }
+    },
+    gwdqSubmit() {
+      if (
+        this.allSelect.length == 1 &&
+        this.allSelect.every((item) => item.pid.length != 2)
+      ) {
+        this.gwdqDialogVisible = true;
+      } else {
+        this.$confirm("请选择一条次案类别进行关联", {
+          confirmButtonText: "确定",
+          showCancelButton: false,
+          type: "warning",
+        });
+      }
+      queryDictItem({
+        pid: "",
+        groupid: "CODE_XZQH",
+      }).then((res) => {
+        res.items.forEach((item, index) => {
+          this.optionxz.push({
+            value: item.code,
+            label: item.name,
+          });
+        });
+      });
+      queryDictItem({
+        pid: "",
+        groupid: "CODE_MZ",
+      }).then((res) => {
+        res.items.forEach((item, index) => {
+          this.optionzb.push({
+            value: item.code,
+            label: item.name,
+          });
+        });
+      });
+    },
+    gwdqSumits() {
+      var self = this;
+      debugger
+      console.log(this.allSelect[0].id);
+      xalbJoinGWDQ({
+        operatetype: "insert",
+        xzqhcode: this.formLabelAlign2.xzqhdm,
+        xzqh: this.formLabelAlign2.xzqh,
+        description: this.formLabelAlign2.ms,
+        xzc: this.formLabelAlign2.xc,
+        mz: this.formLabelAlign2.zb,
+        xalbdmbcms: this.allSelect[0].code,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.gwdqDialogVisible = false;
+        }
+      });
+    },
+    zdSumit() {
+      var self = this;
+      dictitemEdit({
+        operateType: this.submitType,
+        name: this.formLabelAlign.name,
+        code: this.submitType != "insert" ? self.seleteObj.code : "",
+        description: this.formLabelAlign.ms,
+        pid: this.tableData[0].pid,
+        groupid:
+          this.tableData[0].pid.length == 2
+            ? "CODE_GABAJZLB"
+            : "CODE_GABAJXZLB",
+      }).then((res) => {
+        if (res.code == 200) {
+          self.getRedis();
+          self.getQuerys();
+          self.zdDialogVisible = false;
         }
-      ).then(res => {
+      });
+    },
+    handleSelectionChange(data) {
+      this.allSelect = data;
+      this.seleteObj = data[0];
+    },
+    getQuerys() {
+      queryDictItem({
+        pid: this.seleteObj.pid,
+        groupid:
+          this.seleteObj.pid.length == 2 ? "CODE_GABAJZLB" : "CODE_GABAJXZLB",
+      }).then((res) => {
         res.items.forEach((item, index) => {
           this.setTree.push({
             id: index,
@@ -100,78 +418,119 @@ export default {
             pid: item.pid,
             groupid: item.groupid,
             label: item.name,
-            children: []
-          })
-          this.tableData.push({
-            name: item.name,
+            children: [],
+          });
+          this.tableData = [];
+          res.items.forEach((item, index) => {
+            this.tableData.push({
+              name: item.name,
+              code: item.code,
+              description: item.description,
+            });
+          });
+        });
+        console.log(this.setTree);
+      });
+    },
+    getQuery() {
+      queryDictItem({
+        pid: "",
+        groupid: "CODE_GABAJZLB",
+      }).then((res) => {
+        res.items.forEach((item, index) => {
+          this.setTree.push({
+            id: index,
             code: item.code,
-            description: item.description
-          })
-        })
-        console.log(this.setTree)
-      })
+            pid: item.pid,
+            groupid: item.groupid,
+            label: item.name,
+            children: [],
+          });
+        });
+        console.log(this.setTree);
+      });
     },
-    handleNodeClick (data) {
-      console.log(data)
-      this.tableData = []
-      console.log(data.pid.length)
-      let arr = []
-      let arr1 = []
-      let index = data.id
+    handleNodeClick(data) {
+      var self = this;
+      this.tableData = [];
+      console.log(data.pid.length);
+      let arr = [];
+      let arr1 = [];
+      let index = data.id;
       queryDictItem({
         pid: data.code,
         groupid: data.groupid,
-      }).then(res => {
+      }).then((res) => {
+        self.formLabelAlign.group = res.items[0].groupname;
+        self.formLabelAlign.parentCode = data.label;
+
         res.items.forEach((item, index) => {
-          arr.push(
-            {
+          arr.push({
+            pid: item.pid,
+            code: item.code,
+            groupid: item.groupid,
+            label: item.name,
+          });
+
+          res.items.forEach((item, index) => {
+            arr.push({
               pid: item.pid,
               code: item.code,
               groupid: item.groupid,
               label: item.name,
-            }
-          )
-          this.tableData.push({
-            name: item.name,
-            code: item.code,
-            description: item.description
-          })
-        })
-        this.setTree[index].children = arr
-      })
-      console.log(arr, "arr")
+            });
+
+            this.tableData.push({
+              name: item.name,
+              code: item.code,
+              description: item.description,
+              pid: item.pid,
+              groupid: item.groupid,
+              isParent: item.isParent,
+              groupname: item.groupname,
+              pname: data.label,
+            });
+          });
+        });
+        this.setTree[index].children = arr;
+      });
+      console.log(arr, "arr");
       if (data.pid.length == 2) {
         queryDictItem({
           pid: data.code,
           groupid: "CODE_GABAJXZLB",
-        }).then(res => {
+        }).then((res) => {
+          self.formLabelAlign.group = res.items[0].groupname;
+          self.formLabelAlign.parentCode = data.label;
           res.items.forEach((item, index) => {
-            console.log(item)
-            arr1.push(
-              {
-                pid: item.pid,
-                code: item.code,
-                groupid: item.groupid,
-                label: item.name,
-              }
-            )
+            console.log(item);
+            arr1.push({
+              pid: item.pid,
+              code: item.code,
+              groupid: item.groupid,
+              label: item.name,
+            });
             this.tableData.push({
               name: item.name,
               code: item.code,
-              description: item.description
-            })
-          })
-
-        })
+              description: item.description,
+              pid: item.pid,
+              groupid: data.groupid,
+              isParent: item.isParent,
+              groupname: item.groupname,
+              pname: data.label,
+            });
+          });
+        });
       }
     },
-    handleOpen (key, keyPath) {
+    handleOpen(key, keyPath) {
       console.log(key, keyPath);
     },
-    handleClose (key, keyPath) {
+    handleClose(key, keyPath) {
       console.log(key, keyPath);
-    }
-  }
+    },
+  },
 };
 </script>
 

vue.config.js

+/*
+ * @Author: your name
+ * @Date: 2021-07-13 10:11:15
+ * @LastEditTime: 2021-07-13 11:31:59
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \founder_vue\vue.config.js
+ */
 const path = require("path");
 // const CompressionPlugin = require('compression-webpack-plugin');
 // const productionGzipExtensions = /\.(js|css|json|txt|html|ico|svg)(\?.*)?$/i;
@@ -58,16 +66,24 @@ module.exports = {
         }
       },
       "/api2": {
-        target: "http://47.92.225.109:3002/", 
+        target: "http://47.92.225.109:3002/",
         ws: true,
         changeOrigin: true,
         pathRewrite: {
           '^/api2': '/'
         }
+      },
+      "/cbypApi": {
+        target: "http://47.92.225.109:8762/",
+        ws: true,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/cbypApi': '/'
+        }
       }
     },
   },
   css: {
-    sourceMap: process.env.NODE_ENV === "development" ?true:false // 在开发环境下开启 CSS sourcemaps
+    sourceMap: process.env.NODE_ENV === "development" ? true : false // 在开发环境下开启 CSS sourcemaps
   }
 };