街道获取方式优化

src/api/backend/street.js

@@ -33,6 +33,13 @@ export function getStreet(id) {
     method: 'get'
   })
 }
+// 获得街道信息列表
+export function getStreetList() {
+  return request({
+    url: '/backend/street/getAll',
+    method: 'get'
+  })
+}
 
 // 获得街道信息分页
 export function getStreetPage(query) {
@@ -52,3 +59,4 @@ export function exportStreetExcel(query) {
     responseType: 'blob'
   })
 }
+

src/store/modules/permission.js

@@ -111,7 +111,7 @@ function filterChildren(childrenMap, lastRouter = false) {
 }
 
 export const loadView = (view) => { // 路由懒加载
-  console.log('loadView view=', view)
+  // console.log('loadView view=', view)
   return (resolve) => require([`@/views/${view}`], resolve)
 }
 

src/utils/dict.js

@@ -159,3 +159,19 @@ export function getDictDataLabel(dictType, value) {
     const dict = getDictData(dictType, value);
     return dict ? dict.label : "";
 }
+
+//获取本地的街道信息
+export function getStreetValue(key) {
+    // console.log('key',key);
+    const streetArr = JSON.parse(localStorage.getItem('streetList'))
+    // console.log('streetArr',streetArr);
+    if(!key ||key.length === 0){
+        return ''
+    }
+    key = key - 0
+   const thisStreet =  streetArr.find(item=>item.key === key)
+   if(!thisStreet){
+    return ''
+   }
+   return thisStreet.value
+}

src/views/backend/streetAnnex2/index.vue

@@ -59,7 +59,12 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="所属乡镇街道" align="center" prop="streetId" width="120" />
+      <!-- <el-table-column label="所属乡镇街道" align="center" prop="streetId" width="120" /> -->
+      <el-table-column label="所属乡镇街道" align="center" prop="streetId" width="120" >
+        <template v-slot="scope">
+          <span>{{ getValue(scope.row.streetId) }}</span>
+        </template>
+        </el-table-column>
       <el-table-column label="居民住宅区名称" align="center" prop="jmzzqmc" width="140" />
       <el-table-column label="地址" align="center" prop="dz" width="200" />
       <el-table-column label="居民人数" align="center" prop="jmrs" width="80" />
@@ -142,6 +147,7 @@
 <script>
 import { createStreetAnnex2, updateStreetAnnex2, deleteStreetAnnex2, getStreetAnnex2, getStreetAnnex2Page, exportStreetAnnex2Excel } from "@/api/backend/streetAnnex2"
 import exportFile from "@/components/exportFile";
+import { getStreetValue } from "@/utils/dict"
 export default {
   name: "StreetAnnex2",
   components: {
@@ -209,6 +215,11 @@ export default {
     UploadOpen(e){
       this.uploadOpen=e
     },
+    //获取街道
+    getValue(key){
+     const res =  getStreetValue(key)
+     return res
+    },
     /** 查询列表 */
     getList() {
       this.loading = true

src/views/backend/streetAnnex3/index.vue

@@ -61,7 +61,12 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="所属乡镇街道" align="center" prop="streetId" width="120"/>
+      <!-- <el-table-column label="所属乡镇街道" align="center" prop="streetId" width="120"/> -->
+            <el-table-column label="所属乡镇街道" align="center" prop="streetId" width="120" >
+        <template v-slot="scope">
+          <span>{{ getValue(scope.row.streetId) }}</span>
+        </template>
+        </el-table-column>
       <el-table-column label="居（村）民委员会名称" align="center" prop="jwhmc" width="150"/>
       <el-table-column label="办公地址" align="center" prop="bgdz" />
       <el-table-column label="所辖居（村）民人数" align="center" prop="sxjmrs" width="140"/>
@@ -140,6 +145,7 @@
 <script>
 import { createStreetAnnex3, updateStreetAnnex3, deleteStreetAnnex3, getStreetAnnex3, getStreetAnnex3Page, exportStreetAnnex3Excel } from "@/api/backend/streetAnnex3"
 import exportFile from "@/components/exportFile";
+import { getStreetValue } from "@/utils/dict"
 export default {
   name: "StreetAnnex3",
   components: {exportFile
@@ -207,6 +213,11 @@ export default {
     UploadOpen(e){
       this.uploadOpen=e
     },
+    //获取街道
+        getValue(key){
+     const res =  getStreetValue(key)
+     return res
+    },
     /** 查询列表 */
     getList() {
       this.loading = true

src/views/backend/streetAnnex4/index.vue

@@ -64,7 +64,11 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="所属乡镇街道" align="center" prop="streetId" width="120"/>
+      <el-table-column label="所属乡镇街道" align="center" prop="streetId" width="120" >
+        <template v-slot="scope">
+          <span>{{ getValue(scope.row.streetId) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="名称" align="center" prop="mc" />
       <el-table-column label="地址" align="center" prop="dz" />
       <el-table-column label="性质" align="center" prop="xz" />
@@ -147,6 +151,7 @@
 <script>
 import { createStreetAnnex4, updateStreetAnnex4, deleteStreetAnnex4, getStreetAnnex4, getStreetAnnex4Page, exportStreetAnnex4Excel } from "@/api/backend/streetAnnex4"
 import exportFile from "@/components/exportFile";
+import { getStreetValue } from "@/utils/dict"
 export default {
   name: "StreetAnnex4",
   components: {exportFile
@@ -208,6 +213,11 @@ export default {
     UploadOpen(e){
       this.uploadOpen=e
     },
+        //获取街道
+    getValue(key){
+     const res =  getStreetValue(key)
+     return res
+    },
     /** 查询列表 */
     getList() {
       this.loading = true

src/views/backend/streetAnnex5/index.vue

@@ -61,7 +61,11 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="所属乡镇街道" align="center" prop="streetId" width="100"/>
+      <el-table-column label="所属乡镇街道" align="center" prop="streetId" width="120" >
+        <template v-slot="scope">
+          <span>{{ getValue(scope.row.streetId) }}</span>
+        </template>
+        </el-table-column>
       <el-table-column label="起火时间" align="center" prop="qhsj" />
       <el-table-column label="地点" align="center" prop="dd" />
       <el-table-column label="过火面积" align="center" prop="ghmj" />
@@ -141,6 +145,7 @@
 <script>
 import { createStreetAnnex5, updateStreetAnnex5, deleteStreetAnnex5, getStreetAnnex5, getStreetAnnex5Page, exportStreetAnnex5Excel } from "@/api/backend/streetAnnex5"
 import exportFile from "@/components/exportFile";
+import { getStreetValue } from "@/utils/dict"
 export default {
   name: "StreetAnnex5",
   components: {exportFile
@@ -203,6 +208,11 @@ export default {
     UploadOpen(e){
       this.uploadOpen=e
     },
+        //获取街道
+    getValue(key){
+     const res =  getStreetValue(key)
+     return res
+    },
     /** 查询列表 */
     getList() {
       this.loading = true

src/views/backend/streetAnnex6/index.vue

@@ -64,7 +64,11 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="所属乡镇街道" align="center" prop="streetId" width="100"/>
+      <el-table-column label="所属乡镇街道" align="center" prop="streetId" width="120" >
+        <template v-slot="scope">
+          <span>{{ getValue(scope.row.streetId) }}</span>
+        </template>
+        </el-table-column>
       <el-table-column label="检查时间" align="center" prop="jcsj"  width="100"/>
       <el-table-column label="检查人员" align="center" prop="jcry" />
       <el-table-column label="检查单位场所名称" align="center" prop="jcdwscmc" width="140"/>
@@ -142,6 +146,7 @@
 <script>
 import { createStreetAnnex6, updateStreetAnnex6, deleteStreetAnnex6, getStreetAnnex6, getStreetAnnex6Page, exportStreetAnnex6Excel } from "@/api/backend/streetAnnex6"
 import exportFile from "@/components/exportFile";
+import { getStreetValue } from "@/utils/dict"
 export default {
   name: "StreetAnnex6",
   components: {exportFile
@@ -204,6 +209,11 @@ export default {
     UploadOpen(e){
       this.uploadOpen=e
     },
+        //获取街道
+    getValue(key){
+     const res =  getStreetValue(key)
+     return res
+    },
     /** 查询列表 */
     getList() {
       this.loading = true

src/views/index.vue

@@ -405,7 +405,7 @@ export default {
         userId: this.$store.state.user.id,
       });
       this.lineChartData = res;
-      console.log(res, "ressrw");
+      // console.log(res, "ressrw");
     },
     async countdengerbydayno() {
       //未解决
@@ -414,7 +414,7 @@ export default {
         userId: this.$store.state.user.id,
       });
       this.lineChartDatano = res;
-      console.log(res, "ressrw");
+      // console.log(res, "ressrw");
     },
     //任务列表表格
     filterTags(filters) {
@@ -444,7 +444,7 @@ export default {
     getList() {
       // 执行查询
       getTaskInfoPage(this.queryParams).then((response) => {
-        console.log(response, "responseresponse");
+        // console.log(response, "responseresponse");
         this.tableDataMiddle = response.data.list;
       });
     },
@@ -459,7 +459,7 @@ export default {
     //右下角数据
     rightGetList() {
       getHiddenDangerPage(this.Params).then((response) => {
-        console.log(response, "responseresponseresponse");
+        // console.log(response, "responseresponseresponse");
         this.tableData = response.data.list;
       });
     },

src/views/login.vue

@@ -107,6 +107,7 @@ import { sendSmsCode, socialAuthRedirect } from "@/api/login";
 import { getTenantIdByName } from "@/api/system/tenant";
 import { SystemUserSocialTypeEnum } from "@/utils/constants";
 import { getCaptchaEnable, getTenantEnable } from "@/utils/ruoyi";
+import { getStreetList } from "@/api/backend/street"
 import { addUserOrgSaveBatch, getOneUser2OrgList } from "@/api/system/org";
 import {
   getPassword,
@@ -261,6 +262,17 @@ export default {
           // 发起登陆
           // console.log("发起登录", this.loginForm);
           this.$store.dispatch(this.loginForm.loginType === "sms" ? "SmsLogin" : "Login", this.loginForm).then(() => {
+            getStreetList().then((res)=>{
+              // console.log('login',res);
+              const streetList = res.data.map(item=>{
+                return {
+                  key:item.id,
+                  value:item.qumc
+                }
+              })
+              // console.log('streetList = ',streetList);
+              localStorage.setItem('streetList',JSON.stringify(streetList))
+            })
             this.$router.push({ path: this.redirect || "/" }).catch(() => {
             });
           }).catch(() => {