更换地址，接口地址

.env.development

@@ -2,7 +2,7 @@
  # @Author: 张涛
  # @Date: 2023-11-09 18:29:41
  # @LastEditors: JC9527
- # @LastEditTime: 2024-01-06 10:41:10
+ # @LastEditTime: 2024-01-12 09:30:34
  # @FilePath: \JiangningUrbanManagePc\.env.development
 ### 
 # 页面标题
@@ -13,7 +13,8 @@ ENV = 'development'
 
 # 若依管理系统/开发环境
 # /dev-api
-VUE_APP_BASE_API = 'http://39.101.188.84:9037'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9037'
+VUE_APP_BASE_API = 'https://t-jn-bjh-admin-server.jsszkd.com'
 VUE_APP_BASE_API1 = 'https://t-kd-process-server.jsszkd.com'
 VUE_APP_BASE_API2 = 'https://t-jn-development-manager-server.jsszkd.com/api/webapp'
 # VUE_APP_BASE_API = 'http://192.168.0.108:9037'

.env.production

@@ -1,3 +1,11 @@
+###
+ # @Descripttion: 
+ # @version: 
+ # @Author: JC9527
+ # @Date: 2024-01-09 23:08:15
+ # @LastEditors: JC9527
+ # @LastEditTime: 2024-01-12 09:27:18
+### 
 # 页面标题
 VUE_APP_TITLE = 城市精细化管理监测主题
 
@@ -5,5 +13,7 @@ VUE_APP_TITLE = 城市精细化管理监测主题
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = 'http://39.101.188.84:9037'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9037'
+VUE_APP_BASE_API = 'https://t-jn-bjh-admin-server.jsszkd.com'
 VUE_APP_BASE_API1 = 'https://t-kd-process-server.jsszkd.com'
+VUE_APP_BASE_API2 = 'https://t-jn-development-manager-server.jsszkd.com/api/webapp'

src/api/bigScreenApi/eventApi.js

@@ -10,25 +10,6 @@ export function getTrend(params) {
   })
 }
 
-// 事件列表查询
-export function getQueryViewListPage(params,data) {
-  return request({
-    url: "/api/eform/engine/viewEngine/queryViewListPage",
-    method:'post',
-    params,
-    data
-  })
-}
-
-// 自动提交事件---保存事件数据
-export function eventSaveData(params,data) {
-  return request({
-    url: "/api/eform/engine/formEngine/saveData",
-    method:'post',
-    params,
-    data
-  })
-}
 
 // 事件概况统计
 export function summarystat() {
@@ -47,13 +28,3 @@ export function tasksummarystat() {
     method:'get',
   })
 }
-
-// 自动提交事件流程
-export function formEnginesaveData(data) {
-  return request({
-    baseURL: process.env.VUE_APP_BASE_API2,
-    url: "/api/eform/engine/formEngine/saveData",
-    method:'post',
-    data
-  })
-}

src/api/bigScreenApi/index.js

@@ -119,3 +119,36 @@ export function getAccesstoken(params){
     params
   })
 }
+// 获取用户信息
+export function getUserinfo(params){
+  return request({
+    url:"/jn/single/getUserByaccessToken",
+    method: "get",
+    params,
+    // headers:{
+    //   isToken:false,
+    // }
+  })
+}
+
+// 事件列表查询
+export function getQueryViewListPage(params,data) {
+  return request({
+    baseURL: process.env.VUE_APP_BASE_API2,
+    url: "/api/eform/engine/viewEngine/queryViewListPage",
+    method:'post',
+    params,
+    data
+  })
+}
+
+// 自动提交事件---保存事件数据
+export function eventSaveData(params,data) {
+  return request({
+    baseURL: process.env.VUE_APP_BASE_API2,
+    url: "/api/eform/engine/formEngine/saveData",
+    method:'post',
+    params,
+    data
+  })
+}

src/api/bigScreenApi/robot.js

@@ -0,0 +1,65 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: JC9527
+ * @Date: 2024-01-11 23:19:29
+ * @LastEditors: JC9527
+ * @LastEditTime: 2024-01-12 12:39:16
+ */
+import request from "@/utils/request1"
+
+// 自动提交事件流程
+export function eventSaveData(params,data) {
+  return request({
+    url: "/api/eform/engine/formEngine/saveData",
+    method:'post',
+    params,
+    data
+  })
+}
+// 模拟登录
+export function robotLogin(data){
+  return request({
+    url: "/api/system/robotLogin",
+    method:'post',
+    data
+  })
+}
+// 事件列表
+export function ViewListPage(params,data){
+  return request({
+    url: "/api/eform/engine/viewEngine/queryViewListPage",
+    method:'post',
+    params,
+    data
+  })
+}
+/**
+ * 
+ * 任务派发流程
+ */
+// 任务派发流程
+export function autoSubmit(data){
+  return request({
+    url: "/api/bpm/bpm-front/operateRest/autoSubmit/v1",
+    method:'put',
+    data
+  })
+}
+// 任务派至城管队长----获取流程权限
+export function getBpmOperateVo(params){
+  return request({
+    url: "/api/bpm/bpm-front/displayRest/getBpmOperateVo/v1",
+    method:'get',
+    params
+  })
+}
+// 任务派至城管队长----保存业务数据
+export function distributeSaveData(params,data){
+  return request({
+    url: "/api/eform/engine/formEngine/saveData",
+    method:'post',
+    params,
+    data
+  })
+}

src/assets/font/font.css

@@ -1,4 +1,4 @@
-@font-face {
+/* @font-face {
   font-family: 'YouSheBiaoTiHei';
   src: url('http://www.jichuanglanhai.com/demo/font-file/YouSheBiaoTiHei-2.ttf');
 }
@@ -13,7 +13,7 @@
 @font-face {
   font-family: 'Regular';
   src: url('http://www.jichuanglanhai.com/demo/font-file/Alibaba-PuHuiTi-Regular.otf');
-}
+} */
 @font-face {
   font-family: 'Source Han Sans CN-Regular';
   src: url('./SourceHanSansCN-Regular.otf');

src/permission.js

@@ -1,28 +1,51 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: JC9527
+ * @Date: 2024-01-09 23:08:15
+ * @LastEditors: JC9527
+ * @LastEditTime: 2024-01-12 10:52:53
+ */
 import router from './router'
 import store from './store'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import { getToken, setAccessToken } from '@/utils/auth'
+import { setToken, getToken, setAccessToken } from '@/utils/auth'
 import { isRelogin } from '@/utils/request'
-import { getAccesstoken } from "@/api/bigScreenApi/index"
+import { getAccesstoken, getUserinfo } from "@/api/bigScreenApi/index"
 
 NProgress.configure({ showSpinner: false })
 
 const whiteList = ['/login', '/register', '/bigScreen']
 
 router.beforeEach((to, from, next) => {
+  NProgress.start()
   // console.log('tototo',to.path);
+  if(localStorage.getItem('accessToken') && localStorage.getItem('robotToken')) {
+    next()
+    NProgress.done()
+  } else {
     if (window.location.href.includes("code=")) {
       var reg = new RegExp(/[?&]code=([^&#]+)/);
       var c = window.location.href.match(reg);
       const code = c && c[1];
       getAccesstoken({code:code}).then(res=>{
-      setAccessToken(res.data.accessToken)
+        console.log(res,"res")
-    })
+        // setAccessToken(res.data.accessToken)
-    NProgress.start()
+        localStorage.setItem('accessToken',res.data.accessToken)
         next()
+        NProgress.done()
+        // return getUserinfo({accessToken:res.data.accessToken})
+      })
+      // .then(res=>{
+      //   localStorage.setItem('AuserInfo', JSON.stringify(el.data))
+        
+      // })
     }
+  }
+  next()
+
   // if (getToken()) {
   //   to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
   //   /* has token*/

src/utils/auth.js

@@ -4,7 +4,8 @@ const TokenKey = 'Admin-Token'
 
 const AccessToken = 'X-Access-Token'
 
-Cookies.set(AccessToken,'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MDMwOTkxMTYsInVzZXJuYW1lIjoi6LW15YWtIn0.GwJMwZTBCtjTbG0K-cTV72OJXBxI4VsrSgeBaCCjQM4')
+const robot = 'robotToken'
+
 export function getAccessToken() {
   return Cookies.get(AccessToken)
 }
@@ -13,6 +14,14 @@ export function setAccessToken(token) {
   return Cookies.set(AccessToken,token)
 }
 
+export function getRobotToken() {
+  return Cookies.get(robot)
+}
+
+export function setRobotToken(token) {
+  return Cookies.set(robot,token)
+}
+
 export function getToken() {
   return Cookies.get(TokenKey)
 }

src/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import { Notification, MessageBox, Message, Loading } from 'element-ui'
 import store from '@/store'
-import { getToken, setToken } from '@/utils/auth'
+import { getToken, setToken, getEventToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { tansParams, blobValidate } from "@/utils/ruoyi";
 import cache from '@/plugins/cache'
@@ -32,7 +32,8 @@ service.interceptors.request.use(config => {
   // 是否需要防止数据重复提交
   const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
   if (getToken() && !isToken) {
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    // config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    config.headers['X-Access-Token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
@@ -86,9 +87,10 @@ service.interceptors.response.use(res => {
         isRelogin.show = true;
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
           isRelogin.show = false;
-          store.dispatch('LogOut').then(() => {
+          // store.dispatch('LogOut').then(() => {
-            location.href = '/#/login';
+          //   location.href = '/#/login';
-          })
+          // })
+          location.href = "https://t-jn-bjh-admin.jsszkd.com/"
         }).catch(() => {
           isRelogin.show = false;
         });

src/utils/request1.js

@@ -0,0 +1,180 @@
+import axios from 'axios'
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
+import store from '@/store'
+import { getRobotToken, setToken } from '@/utils/auth'
+import errorCode from '@/utils/errorCode'
+import { tansParams, blobValidate } from "@/utils/ruoyi";
+import cache from '@/plugins/cache'
+import { saveAs } from 'file-saver'
+
+let downloadLoadingInstance;
+// 是否显示重新登录
+export let isRelogin = { show: false };
+
+// 是否正在刷新的标记
+let isRefreshing = false
+//重试队列
+let requests = []
+
+axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+// 创建axios实例
+const service = axios.create({
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  // baseURL: process.env.NODE_ENV === "production" ? location.origin : process.env.VUE_APP_BASE_API1,
+  baseURL: process.env.VUE_APP_BASE_API1,
+  // 超时
+  timeout: 10000
+})
+
+// request拦截器
+service.interceptors.request.use(config => {
+  // 是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  // 是否需要防止数据重复提交
+  const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+  if (localStorage.getItem('robotToken') && !isToken) {
+    // config.headers['Authorization'] = 'Bearer ' +  getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    config.headers['X-Access-Token'] = localStorage.getItem('robotToken') // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  // get请求映射params参数
+  if (config.method === 'get' && config.params) {
+    let url = config.url + '?' + tansParams(config.params);
+    url = url.slice(0, -1);
+    config.params = {};
+    config.url = url;
+  }
+  if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+    const requestObj = {
+      url: config.url,
+      data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+      time: new Date().getTime()
+    }
+    const sessionObj = cache.session.getJSON('sessionObj')
+    if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
+      cache.session.setJSON('sessionObj', requestObj)
+    } else {
+      const s_url = sessionObj.url;                  // 请求地址
+      const s_data = sessionObj.data;                // 请求数据
+      const s_time = sessionObj.time;                // 请求时间
+      const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
+      if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+        const message = '数据正在处理，请勿重复提交';
+        console.warn(`[${s_url}]: ` + message)
+        return Promise.reject(new Error(message))
+      } else {
+        cache.session.setJSON('sessionObj', requestObj)
+      }
+    }
+  }
+  return config
+}, error => {
+    console.log(error)
+    Promise.reject(error)
+})
+
+// 响应拦截器
+service.interceptors.response.use(res => {
+    // console.log(res,'resres');
+    // 未设置状态码则默认成功状态
+    const code = res.data.code || 200;
+    // 获取错误信息
+    const msg = errorCode[code] || res.data.msg || errorCode['default']
+    // 二进制数据则直接返回
+    if (res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer') {
+      return res.data
+    }
+    if (code === 401) {
+      if (!isRelogin.show){
+        isRelogin.show = true;
+        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+          isRelogin.show = false;
+          // store.dispatch('LogOut').then(() => {
+          //   location.href = '/#/login';
+          // })
+          location.href = "http://39.101.188.84:9999/demo/JiangNingUmaleWeb/#/index"
+        }).catch(() => {
+          isRelogin.show = false;
+        });
+        // TODO:无感刷新token暂缺少不需验证码登录接口
+        // const loginForm = {
+        //   username: "admin",
+        //   password: "admin123",
+        // }
+        // store.dispatch("NoCodeLogin", loginForm).then(() => {
+        //   isRelogin.show = false;
+        //   res.headers.Authorization = getToken();
+        //   requests.forEach((cb) => cb(getToken()))
+        //   requests = [] // 重新请求完清空
+        //   return service(res.config)
+        // }).catch(() => {
+        //   isRelogin.show = false;
+        // });
+      } else {
+        return new Promise(resolve => {
+          // 用函数形式将 resolve 存入，等待刷新后再执行
+          requests.push(token => {
+            res.headers.Authorization = `${token}`
+            resolve(service(res.config))
+          })
+        })
+      }
+      // return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+    } else if (code === 500) {
+      Message({ message: msg, type: 'error' })
+      return Promise.reject(new Error(msg))
+    } else if (code === 601) {
+      Message({ message: msg, type: 'warning' })
+      return Promise.reject('error')
+    } else if (code !== 200) {
+      Notification.error({ title: msg })
+      return Promise.reject('error')
+    } else {
+      return res.data
+    }
+  },
+  error => {
+    console.log('err' + error)
+    let { message } = error;
+    const originalRequest = error.config;
+    // console.log(originalRequest,'originalRequest');
+    // console.log(error.response.status,'error.response.status');
+    if (message == "Network Error") {
+      message = "后端接口连接异常";
+    } else if (message.includes("timeout")) {
+      message = "系统接口请求超时";
+    } else if (message.includes("Request failed with status code")) {
+      message = "系统接口" + message.substr(message.length - 3) + "异常";
+    }
+    Message({ message: message, type: 'error', duration: 5 * 1000 })
+    return Promise.reject(error)
+  }
+)
+
+// 通用下载方法
+export function download(url, params, filename, config) {
+  downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+  return service.post(url, params, {
+    transformRequest: [(params) => { return tansParams(params) }],
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    responseType: 'blob',
+    ...config
+  }).then(async (data) => {
+    const isBlob = blobValidate(data);
+    if (isBlob) {
+      const blob = new Blob([data])
+      saveAs(blob, filename)
+    } else {
+      const resText = await data.text();
+      const rspObj = JSON.parse(resText);
+      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+      Message.error(errMsg);
+    }
+    downloadLoadingInstance.close();
+  }).catch((r) => {
+    console.error(r)
+    Message.error('下载文件出现错误，请联系管理员！')
+    downloadLoadingInstance.close();
+  })
+}
+
+export default service

src/utils/request2.js

@@ -21,7 +21,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // baseURL: process.env.NODE_ENV === "production" ? location.origin : process.env.VUE_APP_BASE_API1,
-  baseURL: process.env.VUE_APP_BASE_API1,
+  baseURL: process.env.VUE_APP_BASE_API2,
   // 超时
   timeout: 10000
 })
@@ -32,9 +32,9 @@ service.interceptors.request.use(config => {
   const isToken = (config.headers || {}).isToken === false
   // 是否需要防止数据重复提交
   const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
-  if (getAccessToken() && !isToken) {
+  if (localStorage.getItem('accessToken') && !isToken) {
     // config.headers['Authorization'] = 'Bearer ' +  getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-    config.headers['X-Access-Token'] = getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    config.headers['X-Access-Token'] = localStorage.getItem('accessToken') // 让每个请求携带自定义token 请根据实际情况自行修改
   }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
@@ -88,9 +88,10 @@ service.interceptors.response.use(res => {
         isRelogin.show = true;
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
           isRelogin.show = false;
-          store.dispatch('LogOut').then(() => {
+          // store.dispatch('LogOut').then(() => {
-            location.href = '/#/login';
+          //   location.href = '/#/login';
-          })
+          // })
+          location.href = "https://t-jn-bjh-admin.jsszkd.com/"
         }).catch(() => {
           isRelogin.show = false;
         });

src/views/bigScreen/components/mapLeftContent.vue

@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-15 09:44:13
  * @LastEditors: JC9527
- * @LastEditTime: 2024-01-06 17:14:03
+ * @LastEditTime: 2024-01-11 10:10:12
 -->
 <template>
   <div class="left-box">
@@ -83,7 +83,8 @@
 <script>
 import titleBox from '../../components/title/index.vue'
 import mapNumber from '../../components/mapLeftNumber/index.vue'
-import { getQueryViewListPage, getTrend, summarystat, tasksummarystat } from '@/api/bigScreenApi/eventApi.js'
+import { getTrend, summarystat, tasksummarystat } from '@/api/bigScreenApi/eventApi.js'
+import { getQueryViewListPage } from "@/api/bigScreenApi/index.js"
 export default {
   name: 'mapLeftContent',
   components: { titleBox, mapNumber },

src/views/bigScreen/map/index.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: JC9527
+ * @Date: 2024-01-09 23:08:15
+ * @LastEditors: JC9527
+ * @LastEditTime: 2024-01-12 12:52:48
+-->
 <template>
   <div class="map-main">
     <!-- <div id="showMap" class="showMap"></div> -->
@@ -99,7 +107,7 @@
               <div>附近队员</div>
               <div>位置分享</div>
               <div @click="watchClick">强制观摩</div>
-              <div>任务派发</div>
+              <div @click="taskClick">任务派发</div>
             </div>
           </div>
         </div>
@@ -232,22 +240,22 @@
           <div class="event-info">
               <div class="dot"></div>
               <div class="name">商铺名称：</div>
-              <div class="position">xxx商铺</div>
+              <div class="position">{{ shopInfo.info.shopName }}</div>
             </div>
             <div class="event-info">
               <div class="dot"></div>
               <div class="name">商铺类型：</div>
-              <div class="position">餐饮店</div>
+              <div class="position">{{ shopInfo.info.operation }}</div>
             </div>
             <div class="event-info">
               <div class="dot"></div>
               <div class="name">所在地址：</div>
-              <div class="position">XX街道XX小区</div>
+              <div class="position">{{ shopInfo.info.bodyAddress }}</div>
             </div>
             <div class="event-info">
               <div class="dot"></div>
               <div class="name">描述：</div>
-              <div class="position">xxxxxxxxxxxxxxxxxxxxxxxx</div>
+              <div class="position">{{ shopInfo.info.bodyName }}</div>
             </div>
           
             <div class="btn" @click="getShopInfo">
@@ -396,8 +404,12 @@
     <crew-assign ref="crewAssign"></crew-assign>
     <!-- <video-wall ref="videoWall"></video-wall> -->
     <alone-video ref="aloneVideo"></alone-video>
+    <!-- 商铺详情 -->
     <shop ref="shop" width="50%" title="商铺详情查看" />
+    <!-- 新增事件 -->
     <new-event ref="newEvent" @cancel="cancel"></new-event>
+    <!-- 任务派发 -->
+    <personage-task ref="personageTask"></personage-task>
     <!-- 强制观摩弹框 -->
     <el-dialog 
       :visible.sync="showVideo" 
@@ -424,20 +436,6 @@
   </div>
 </template>
 <script>
-// import L from "leaflet";
-
-//引入坐标系转换插件
-// import "proj4";
-// import "proj4leaflet";
-//引入中国底图插件
-// import "@/utils/lib/leaflet.ChineseTmsProviders.js";
-//引入坐标系偏移插件
-// import "@/utils/lib/leaflet.mapCorrection.min.js";//
-// import "@/utils/lib/leaflet-tilelayer-colorizr.js";
-// import zhifarenyuan from "@/utils/mapJson/zhifarenyuan.json"
-// import shijianfenbu from "@/utils/mapJson/shijianfenbu.json"
-// import zhifacheliang from "@/utils/mapJson/zhifacheliang.json"
-// import jiankongshipin from "@/utils/mapJson/jiankongshipin.json"
 import point from "@/utils/mapJson/point.json";
 
 import jiangninggeo from "@/utils/mapJson/jiangningjingkaiqugeo.json";
@@ -448,11 +446,6 @@ import ThreeGJ02 from "@/utils/mapJson/3GJ02.json";
 import FourGJ02 from "@/utils/mapJson/4GJ02.json";
 import kaifaqu from "@/utils/mapJson/开发区空港开发区GJ02.json";
 import ruanjianyuan from "@/utils/mapJson/开发区软件园GJ02.json";
-// 一级网格
-// import detachment1 from "@/utils/mapJson/detachment1.json";
-// import detachment2 from "@/utils/mapJson/detachment2.json";
-// import detachment3 from "@/utils/mapJson/detachment3.json";
-// import detachment4 from "@/utils/mapJson/detachment4.json";
 // 二级网格
 import gridding from "@/utils/mapJson/中队小网格.json"
 
@@ -464,6 +457,7 @@ import mapRight from "../components/mapRightContent.vue";
 // import mapCentre from "../components/mapCentre.vue"
 // 弹窗
 import personageTrack from "../../components/personagetrack/index.vue";
+import personageTask from "../../components/personageTask/index.vue";
 import crewAssign from "../../components/crewAssign/index.vue";
 import videoWall from "../../components/videoWall/index.vue";
 import shop from "../../components/shop/index.vue";
@@ -485,6 +479,11 @@ import {
   getCarManageList,
   getStreetShopList,
 } from "@/api/bigScreenApi";
+import {
+  robotLogin,
+  ViewListPage
+} from "@/api/bigScreenApi/robot.js"
+import { setRobotToken } from '@/utils/auth'
 import flvjs from "flv.js";
 import axios from "axios";
 
@@ -498,7 +497,8 @@ export default {
     videoWall,
     shop,
     aloneVideo,
-    newEvent
+    newEvent,
+    personageTask
   },
   data() {
     return {
@@ -536,6 +536,7 @@ export default {
       // 沿街商铺弹框信息
       shopInfo: {
         position: [],
+        info:{},
         visible: false,
       },
       isClickLingtedPolygonId:false,
@@ -1396,6 +1397,8 @@ export default {
         this.monitoringInfo.visible = true;
       } else if (this.actionMap == 5) {
         this.shopInfo.position = marker.position;
+        this.shopInfo.info = marker.info;
+        console.log(marker.info);
         this.shopInfo.visible = true;
       }
     },
@@ -1421,6 +1424,10 @@ export default {
         this.$refs.personageTrack.open("car");
       }
     },
+    // 任务派发事件
+    taskClick(){
+      this.$refs.personageTask.open(this.personInfo.info);
+    },
     // 播放监控视频
     initVideoPlayer(videoUrl){
       this.$nextTick(()=>{
@@ -1554,7 +1561,7 @@ export default {
     },
     // 商铺详情查看
     getShopInfo(){
-      this.$refs.shop.open();
+      this.$refs.shop.open(this.shopInfo.info);
     },
 
 
@@ -2800,10 +2807,22 @@ export default {
         clearInterval(timer)
       }
     },
+    // 模拟登录获取token
+    getrobotToken(){
+      robotLogin({username:"赵六",password:"zl@123456"}).then(res=>{
+        console.log(res,"登录信息");
+        if(res.code == 200) {
+          // setRobotToken(res.result.token)
+          localStorage.setItem('robotToken',res.result.token)
+        }
+      })
+    },
+    
   },
 
   mounted() {
-    this.getCarList()
+    this.getCarList();
+    this.getrobotToken();
     // this.markerInterval()
   },
 };

src/views/components/dialog/index.vue

@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-16 14:19:37
  * @LastEditors: JC9527
- * @LastEditTime: 2023-12-26 14:25:50
+ * @LastEditTime: 2024-01-12 11:29:36
 -->
 <template>
   <el-dialog
@@ -23,6 +23,8 @@
         ? 'dialog-boxed2'
         : type == 3
         ? 'dialog-boxed3'
+        : type == 10
+        ? 'dialog-boxed10'
         : ''
     "
   >
@@ -168,4 +170,19 @@ export default {
     }
   }
 }
+::v-deep .dialog-boxed10 {
+  background-image: url("../../../assets/images/dialogbg/792@2x.png");
+  .el-dialog__header {
+    .closeClick {
+      .close {
+        position: absolute;
+        width: 20px;
+        height: 18px;
+        right: 17px;
+        top: 8px;
+        cursor: pointer;
+      }
+    }
+  }
+}
 </style>

src/views/components/mapRight/index.vue

@@ -3,8 +3,8 @@
     <div class="header-title">
       <div>{{ id == 1 ? '网格名称' : id == 2 ? '区域名称' : id == 3 ? "路段名称" : "围栏名称"}}</div>
       <div>{{ id == 4 ? '今日已打卡' : '今日事件' }}</div>
-      <div>{{ id == 4 ? '今日未打卡' : '已解决' }}</div>
+      <div>{{ id == 4 ? '今日未打卡' : '已处理' }}</div>
-      <div>{{ id == 4 ? '打卡异常' : '未解决' }}</div>
+      <div>{{ id == 4 ? '打卡异常' : '未处理' }}</div>
     </div>
     <div class="lists-main" id="rightBox" :style="{'height':(height - lists.height - 20) + 'px'}">
       <div class="main" v-for="(item,index) in rightArray" :key="index" :class="(index+1) % 2 == 0 ? 'main1':''">

src/views/components/newEvent/index.vue

@@ -166,7 +166,7 @@ import { formEnginesaveData } from '@/api/bigScreenApi/eventApi.js'
 import {
   getQueryViewListPage,
   eventSaveData
-} from "@/api/bigScreenApi/eventApi.js";
+} from "@/api/bigScreenApi/robot.js";
 export default {
   components:{diaLog,myUpload,videoUpload},
   data() {
@@ -246,8 +246,8 @@ export default {
       },
       gridOptions: [
         {
-          value: '一中队网格',
+          value: '一中队',
-          label: '一中队网格',
+          label: '一中队',
           children: [
             {
               value: '一号网格',
@@ -273,8 +273,8 @@ export default {
             },
           ]
         },{
-          value: '二中队网格',
+          value: '二中队',
-          label: '二中队网格',
+          label: '二中队',
           children: [
             {
               value: '一号网格',
@@ -291,8 +291,8 @@ export default {
             }
           ]
         },{
-          value: '三中队网格',
+          value: '三中队',
-          label: '三中队网格',
+          label: '三中队',
           children: [
             {
               value: '一号网格',
@@ -312,8 +312,8 @@ export default {
             }
           ]
         },{
-          value: '四中队网格',
+          value: '四中队',
-          label: '四中队网格',
+          label: '四中队',
           children: [
             {
               value: '一号网格',
@@ -341,7 +341,13 @@ export default {
               label: '八号网格',
             },
           ]
-        },
+        },{
+          value: '开发区空港开发区',
+          label: '开发区空港开发区',
+        },{
+          value: '开发区软件园',
+          label: '开发区软件园',
+        }
       ],
       options: [
         {
@@ -1269,165 +1275,393 @@ export default {
             },
           ]
         },{
-          value: '扩展事件1',
+          value: '垃圾分类',
-          label: '扩展事件1',
+          label: '垃圾分类',
           children: [
             {
-              value: '占道经营',
+              value: '未按规定配置生活垃圾分类收集容器',
-              label: '占道经营',
+              label: '未按规定配置生活垃圾分类收集容器',
             },{
-              value: '排水管道堵塞',
+              value: '住宅物业企业未配备生活垃圾分类指导员',
-              label: '排水管道堵塞',
+              label: '住宅物业企业未配备生活垃圾分类指导员',
-            },{
-              value: '火灾',
-              label: '火灾',
-            },{
-              value: '伤亡事故',
-              label: '伤亡事故',
-            },{
-              value: '化粪池满溢',
-              label: '化粪池满溢',
-            },{
-              value: '违规高空悬吊作业',
-              label: '违规高空悬吊作业',
-            },{
-              value: '临街屠宰',
-              label: '临街屠宰',
-            },{
-              value: '畜力车进城',
-              label: '畜力车进城',
-            },{
-              value: '无证餐饮',
-              label: '无证餐饮',
-            },{
-              value: '居民小区垃圾分类收集容器维护',
-              label: '居民小区垃圾分类收集容器维护',
-            },{
-              value: '居住区垃圾混装混运',
-              label: '居住区垃圾混装混运',
             },{
-              value: '居住区垃圾分类信息没有公示',
+              value: '住宅小区生活垃圾清运不及时',
-              label: '居住区垃圾分类信息没有公示',
+              label: '住宅小区生活垃圾清运不及时',
-            },{
+            },
-              value: '机扫垃圾转运不规范',
+          ]
-              label: '机扫垃圾转运不规范',
-            },{
-              value: '当月实收金额未完成基数、漏审或私自处理的',
-              label: '当月实收金额未完成基数、漏审或私自处理的',
-            },{
-              value: '未按规定着装、未执证上岗、脱岗、上岗未开启POS机',
-              label: '未按规定着装、未执证上岗、脱岗、上岗未开启POS机',
-            },{
-              value: '不按规定收费，不使用POS机采取人工收费、涉嫌私藏票款',
-              label: '不按规定收费，不使用POS机采取人工收费、涉嫌私藏票款',
-            },{
-              value: '非法占道经营的夜市排挡',
-              label: '非法占道经营的夜市排挡',
-            },{
-              value: '疏导点周边环境脏乱',
-              label: '疏导点周边环境脏乱',
-            },{
-              value: '早餐车超时经营',
-              label: '早餐车超时经营',
         },{
-              value: '早餐车占用盲道影响市容',
+          value: '其他设施',
-              label: '早餐车占用盲道影响市容',
+          label: '其他设施',
+          children: [
+            {
+              value: '重大危险源',
+              label: '重大危险源',
             },{
-              value: '早餐车周边脏乱',
+              value: '工地',
-              label: '早餐车周边脏乱',
+              label: '工地',
             },{
-              value: '农贸市场溢摊经营',
+              value: '属于附属设施',
-              label: '农贸市场溢摊经营',
+              label: '属于附属设施',
             },{
-              value: '农贸市场车辆乱停放',
+              value: '水域护栏',
-              label: '农贸市场车辆乱停放',
+              label: '水域护栏',
             },{
-              value: '农贸市场外垃圾及污水',
+              value: '港监设施',
-              label: '农贸市场外垃圾及污水',
+              label: '港监设施',
             },{
-              value: '货物乱堆放周边张贴',
+              value: '防汛墙',
-              label: '货物乱堆放周边张贴',
+              label: '防汛墙',
+            },
+          ]
         },{
-              value: '装潢垃圾未及时清运',
+          value: '其他事件',
-              label: '装潢垃圾未及时清运',
+          label: '其他事件',
+          children: [
+            {
+              value: '垃圾箱（桶）脏乱，周边有暴露垃圾',
+              label: '垃圾箱（桶）脏乱，周边有暴露垃圾',
             },{
               value: '小区内垃圾容器及周边不洁',
               label: '小区内垃圾容器及周边不洁',
             },{
-              value: '小区内有散在垃圾',
+              value: '有乱排污现象',
-              label: '小区内有散在垃圾',
+              label: '有乱排污现象',
             },{
               value: '居民区有卫生死角',
               label: '居民区有卫生死角',
             },{
-              value: '小区绿地被破坏，毁绿种菜',
+              value: '临街屠宰',
-              label: '小区绿地被破坏，毁绿种菜',
+              label: '临街屠宰',
-            },{
-              value: '小区绿地内存在垃圾、杂物',
-              label: '小区绿地内存在垃圾、杂物',
-            },{
-              value: '小区内有店外出摊、乱设摊',
-              label: '小区内有店外出摊、乱设摊',
-            },{
-              value: '小区内乱搭建',
-              label: '小区内乱搭建',
-            },{
-              value: '小区内有新搭违法建设',
-              label: '小区内有新搭违法建设',
-            },{
-              value: '小区内乱堆放、拉挂',
-              label: '小区内乱堆放、拉挂',
-            },{
-              value: '小区内散养家禽',
-              label: '小区内散养家禽',
-            },{
-              value: '小区内乱贴乱挂',
-              label: '小区内乱贴乱挂',
             },{
-              value: '暴露垃圾和建筑垃圾或焚烧垃圾',
+              value: '野生动物交易',
-              label: '暴露垃圾和建筑垃圾或焚烧垃圾',
+              label: '野生动物交易',
             },{
-              value: '有乱堆放、乱排污现象',
+              value: '小区内私搭乱建',
-              label: '有乱堆放、乱排污现象',
+              label: '小区内私搭乱建',
             },{
-              value: '有乱张贴、乱涂写现象',
+              value: '小区内乱张贴、乱喷涂',
-              label: '有乱张贴、乱涂写现象',
+              label: '小区内乱张贴、乱喷涂',
             },{
-              value: '公共绿地种菜',
+              value: '小区内毁绿种菜',
-              label: '公共绿地种菜',
+              label: '小区内毁绿种菜',
             },{
-              value: '临街区域占道经营、占道加工',
+              value: '小区内僵尸车、车辆乱停放',
-              label: '临街区域占道经营、占道加工',
+              label: '小区内僵尸车、车辆乱停放',
+            },
+          ]
         },{
-              value: '有垃圾焚烧现象或焚烧痕迹',
+          value: '施工管理 ',
-              label: '有垃圾焚烧现象或焚烧痕迹',
+          label: '施工管理 ',
+          children: [
+            {
+              value: '施工扰民 ',
+              label: '施工扰民 ',
             },{
-              value: '公厕周边污水满溢',
+              value: '工地扬尘',
-              label: '公厕周边污水满溢',
+              label: '工地扬尘',
             },{
-              value: '公厕脏乱，乱涂写、乱张贴',
+              value: '施工废弃料',
-              label: '公厕脏乱，乱涂写、乱张贴',
+              label: '施工废弃料',
             },{
-              value: '有家禽（畜）散养现象',
+              value: '施工占道',
-              label: '有家禽（畜）散养现象',
+              label: '施工占道',
             },{
-              value: '有擅自新搭建的棚户',
+              value: '无证掘路',
-              label: '有擅自新搭建的棚户',
+              label: '无证掘路',
             },{
-              value: '水面不洁，有垃圾漂浮物',
+              value: '其他施工管理问题',
-              label: '水面不洁，有垃圾漂浮物',
+              label: '其他施工管理问题',
+            },
+          ]
         },{
-              value: '斜坡或驳岸以下部位脏乱',
+          value: '市容环境',
-              label: '斜坡或驳岸以下部位脏乱',
+          label: '市容环境',
+          children: [
+            {
+              value: '公共厕所',
+              label: '公共厕所'
+            },
+            {
+              value: '化粪池',
+              label: '化粪池'
+            },
+            {
+              value: '公厕指示牌',
+              label: '公厕指示牌'
+            },
+            {
+              value: '垃圾间（楼）',
+              label: '垃圾间（楼）'
+            },
+            {
+              value: '垃圾箱',
+              label: '垃圾箱'
+            },
+            {
+              value: '灯箱霓虹灯',
+              label: '灯箱霓虹灯'
+            },
+            {
+              value: '广告牌匾',
+              label: '广告牌匾'
+            },
+            {
+              value: '环保监测站',
+              label: '环保监测站'
+            },
+            {
+              value: '气象监测站',
+              label: '气象监测站'
+            },
+            {
+              value: '污水口监测站',
+              label: '污水口监测站'
+            },
+            {
+              value: '噪声显示屏',
+              label: '噪声显示屏'
+            },
+            {
+              value: '私搭乱建',
+              label: '私搭乱建'
+            },
+            {
+              value: '暴露垃圾',
+              label: '暴露垃圾'
+            },
+            {
+              value: '积存垃圾渣',
+              label: '积存垃圾渣'
+            },
+            {
+              value: '道路不洁',
+              label: '道路不洁'
+            },
+            {
+              value: '水域不洁',
+              label: '水域不洁'
+            },
+            {
+              value: '绿地脏乱',
+              label: '绿地脏乱'
+            },
+            {
+              value: '废弃车辆',
+              label: '废弃车辆'
+            },
+            {
+              value: '废弃家具设备',
+              label: '废弃家具设备'
+            },
+            {
+              value: '非装饰性树挂',
+              label: '非装饰性树挂'
+            },
+            {
+              value: '道路破损',
+              label: '道路破损'
+            },
+            {
+              value: '河堤破损',
+              label: '河堤破损'
+            },
+            {
+              value: '道路遗撒',
+              label: '道路遗撒'
+            },
+            {
+              value: '建筑物外立面不洁',
+              label: '建筑物外立面不洁'
+            },
+            {
+              value: '水域秩序问题',
+              label: '水域秩序问题'
+            },
+            {
+              value: '焚烧垃圾、树叶',
+              label: '焚烧垃圾、树叶'
+            },
+            {
+              value: '油烟污染',
+              label: '油烟污染'
+            },
+            {
+              value: '动物尸体清理',
+              label: '动物尸体清理'
+            },
+            {
+              value: '路牙破损',
+              label: '路牙破损'
+            },
+            {
+              value: '其他市容环境问题',
+              label: '其他市容环境问题'
+            },
+            {
+              value: '垃圾桶破损',
+              label: '垃圾桶破损'
+            },
+            {
+              value: '垃圾箱（桶）脏乱，周边有暴露垃圾',
+              label: '垃圾箱（桶）脏乱，周边有暴露垃圾'
+            },
+            {
+              value: '暴露垃圾',
+              label: '暴露垃圾'
+            },
+            {
+              value: '乱丢弃医疗废物(口罩）',
+              label: '乱丢弃医疗废物(口罩）'
+            },
+            {
+              value: '乱倒乱排污水、废水',
+              label: '乱倒乱排污水、废水'
+            },
+            {
+              value: '动物尸体',
+              label: '动物尸体'
+            },
+            {
+              value: '垃圾容器设置不规范',
+              label: '垃圾容器设置不规范'
+            },
+            {
+              value: '垃圾容器收运不及时、满溢',
+              label: '垃圾容器收运不及时、满溢'
+            },
+            {
+              value: '垃圾容器未套袋收集',
+              label: '垃圾容器未套袋收集'
+            },
+            {
+              value: '垃圾容器违规摆放',
+              label: '垃圾容器违规摆放'
+            },
+            {
+              value: '垃圾容器分类标识缺损',
+              label: '垃圾容器分类标识缺损'
+            },
+            {
+              value: '垃圾容器脏污、不洁、未密闭',
+              label: '垃圾容器脏污、不洁、未密闭'
+            }
+          ]
         },{
-              value: '共享单车乱停放',
+          value: '突发事件',
-              label: '共享单车乱停放',
+          label: '突发事件',
+          children: [
+            {
+              value: '道路塌陷',
+              label: '道路塌陷'
+            },
+            {
+              value: '自来水管破裂',
+              label: '自来水管破裂'
+            },
+            {
+              value: '燃气管道破裂',
+              label: '燃气管道破裂'
+            },
+            {
+              value: '下水道堵塞或破裂',
+              label: '下水道堵塞或破裂'
+            },
+            {
+              value: '热力管道破裂',
+              label: '热力管道破裂'
+            },
+            {
+              value: '道路积水',
+              label: '道路积水'
+            },
+            {
+              value: '道路积雪结冰',
+              label: '道路积雪结冰'
+            },
+            {
+              value: '架空线缆损坏',
+              label: '架空线缆损坏'
+            },
+            {
+              value: '群发性事件',
+              label: '群发性事件'
+            },
+            {
+              value: '其他突发事件',
+              label: '其他突发事件'
+            }
+          ]
         },{
-              value: '阻扰检查',
+          value: '宣传广告',
-              label: '阻扰检查',
+          label: '宣传广告',
+          children: [
+            {
+              value: '非法小广告',
+              label: '非法小广告'
+            },
+            {
+              value: '违章张贴悬挂广告牌匾',
+              label: '违章张贴悬挂广告牌匾'
+            },
+            {
+              value: '占道广告牌',
+              label: '占道广告牌'
             },
+            {
+              value: '街头散发广告',
+              label: '街头散发广告'
+            },
+            {
+              value: '广告招牌破损',
+              label: '广告招牌破损'
+            }
           ]
+        },{
+          value: '园林绿化',
+          label: '园林绿化',
+          children: [
+            {
+              value: '古树名木',
+              label: '古树名木'
+            },
+            {
+              value: '行道树',
+              label: '行道树'
             },
+            {
+              value: '护树设施',
+              label: '护树设施'
+            },
+            {
+              value: '花架花钵',
+              label: '花架花钵'
+            },
+            {
+              value: '绿地',
+              label: '绿地'
+            },
+            {
+              value: '雕塑',
+              label: '雕塑'
+            },
+            {
+              value: '街头座椅',
+              label: '街头座椅'
+            },
+            {
+              value: '绿地护栏',
+              label: '绿地护栏'
+            },
+            {
+              value: '绿地维护设施',
+              label: '绿地维护设施'
+            },
+            {
+              value: '喷泉',
+              label: '喷泉'
+            }
+          ]
+        }
       ],
       marker:null,
     }
@@ -1463,11 +1697,13 @@ export default {
           this.formInline.reportEventObj.videoUrl = this.baseUrl + this.formInline.reportEventObj.videoUrl;
           this.formInline.reportEventObj.audioUrl = this.baseUrl + this.formInline.reportEventObj.audioUrl;
           this.formInline.reportEventObj.meshOccurs = this.formInline.reportEventObj.meshOccurs.join(',');
+          this.formInline.reportEventObj.type = this.formInline.reportEventObj.type.join(',');
           console.log(this.formInline);
           eventSaveData(this.formInfo,{formData:this.formInline}).then(res=>{
             console.log(res,'===================res');
             if(res.code == 200 && res.success == true) {
               this.$refs.dialog5.Close();
+              this.$modal.msgSuccess("新增成功");
             }
           })
         }

src/views/components/personageTask/index.vue

@@ -0,0 +1,252 @@
+<template>
+  <!-- 选择事件，及派发按钮 -->
+  <dia-log ref="taskDialog" width="30%" :title="title">
+    <el-form :inline="true" :model="taskForm" class="demo-form-task" ref="formTask" :rules="rules">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item>
+            <template slot="label">
+              <div class="new-event-form">
+                <div class="ball"></div>
+                <span>人员名称：</span>
+              </div>
+            </template>
+            <div class="form-div">{{ info ? info.userName : "" }}</div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item>
+            <template slot="label">
+              <div class="new-event-form">
+                <div class="ball"></div>
+                <span>当前地址：</span>
+              </div>
+            </template>
+            <div class="form-div">{{ info ? info.address : "" }}</div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item prop="task">
+            <template slot="label">
+              <div class="new-event-form">
+                <div class="ball"></div>
+                <span>事件名称：</span>
+              </div>
+            </template>
+            <el-select v-model="taskForm.task" placeholder="请选择事件">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <div class="btns">
+            <div class="btn" @click="cancel('formTask')">取消</div>
+            <div class="btn btnTwo" @click="confirm('formTask')">确定</div>
+          </div>
+        </el-col>
+      </el-row>
+    </el-form>
+  </dia-log>
+</template>
+<script>
+import diaLog from "../../components/dialog/index.vue"
+import { ViewListPage, autoSubmit, getBpmOperateVo, distributeSaveData } from "@/api/bigScreenApi/robot.js"
+export default {
+  components:{diaLog},
+  data() {
+    return {
+      title:"任务派发",
+      taskForm:{
+        task:"",
+      },
+      options:[],
+      rules:{
+        task:[
+          {required:true,message:"请选择事件",trigger:"change"}
+        ]
+      },
+      info:null,
+    }
+  },
+  mounted() {
+    this.getViewListPageList();
+  },
+  methods:{
+    open(info){
+      this.info = info;
+      this.$refs.taskDialog.open();
+    },
+    getViewListPageList(){
+      let data = {'queryValue' : [], "myInstanceClassify" : "all"}
+      ViewListPage({viewCode:'event-all-list',pageNo:"1",pageSize:"50"}, data).then(res => {
+        console.log(res,"获取的事件列表");
+        if(res.code == 200) {
+          res.result.records.forEach(item => {
+            let obj = {};
+            obj["label"] = item.name;
+            obj["value"] = item.id;
+            this.options.push(obj);
+          })
+        }
+        
+      })
+
+    },
+    // 取消按钮
+    cancel(refForm){
+      this.$refs[refForm].resetFields();
+      this.$refs.dialog5.Close();
+    },
+    // 确定按钮
+    confirm(refForm){
+      autoSubmit().then(res=>{
+        
+      })
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .demo-form-task {
+  .btns {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 20px;
+    .btn {
+      width: 91px;
+      height: 30px;
+      background: rgba(0, 60, 116, 0.6);
+      box-shadow: inset 0px 0px 6px 0px #00c2ff;
+      border-radius: 2px 2px 2px 2px;
+      opacity: 1;
+      border: 1px solid rgba(181, 207, 255, 0.5);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 14px;
+      font-family: "Source Han Sans CN-Regular";
+      font-weight: 400;
+      color: #d3eef2;
+      line-height: 20px;
+      cursor: pointer;
+    }
+    .btnTwo {
+      margin-left: 15px;
+    }
+  }
+  .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before {
+    content: ' ';
+    width: 0px;
+    margin-right: 0px;
+  }
+  .new-event-form {
+    display: flex;
+    align-items: center;
+    .ball {
+      width: 4px;
+      height: 4px;
+      background: #daebff;
+      box-shadow: 0px 0px 10px 5px rgba(0, 119, 255, 0.25),
+        0px 0px 5px 0px rgba(229, 241, 255, 0.25);
+      border-radius: 20px 20px 20px 20px;
+      margin-right: 15px;
+    }
+    span {
+      font-size: 14px;
+      font-family: Source Han Sans CN, Source Han Sans CN;
+      font-weight: 500;
+      color: #CCCCCC;
+      line-height: 35px;
+    }
+  }
+  .el-form-item__content {
+    // background-image: url("../../../assets/images/timebg.png");
+    .form-div {
+      font-size: 14px;
+      font-family: Source Han Sans CN, Source Han Sans CN;
+      font-weight: 500;
+      color: #CCCCCC;
+      line-height: 35px;
+    }
+    background-size: 100% 100%;
+    width: 250px;
+    height: 35px;
+    .el-input__prefix {
+      display: none;
+    }
+    // .el-input--medium {
+    //   background-color: transparent;
+    //   width: 250px;
+    // }
+    .el-select {
+      background-color: transparent;
+      background-image: url("../../../assets/images/timebg.png");
+      background-size: 100% 100%;
+      width: 400px;
+      height: 35px;
+      .el-input
+        .el-input__suffix
+        .el-input__suffix-inner
+        .el-icon-arrow-up {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+      .el-input
+        .el-input__suffix
+        .el-input__suffix-inner
+        .el-icon-arrow-up::before {
+        content: "";
+        background: url("~@/assets/images/pull-down.png") center center
+          no-repeat;
+        background-size: 100% 100%;
+        // position: absolute;
+        width: 100%;
+        height: 22px;
+        // top: 50%;
+        // left: 50%;
+        // transform: translate(-50%, -50%);
+        transform: rotate(180deg);
+      }
+      .el-input__suffix .el-input__suffix-inner .el-select__caret {
+        width: 22px;
+      }
+      .el-input__suffix {
+        margin-right: 5px;
+      }
+      .el-input__inner {
+        background-color: transparent;
+        border: none;
+        width: 100%;
+        height: 35px;
+        font-size: 14px;
+        font-family: "Source Han Sans CN-Medium";
+        font-weight: 500;
+        color: #e9f4ff;
+      }
+      .el-input__inner::placeholder {
+        /* 在这里添加你想要修改的 placeholder 样式 */
+        font-size: 14px;
+        font-family: "Source Han Sans CN-Regular";
+        font-weight: 400;
+        color: #d3eef2;
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: rgba(211, 238, 242, 0.2);
+      }
+    }
+  }
+}
+</style>

src/views/components/shop/components/TabOne.vue

@@ -9,8 +9,8 @@
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
-            <div class="item-lable">主体名称：</div>
+            <div class="item-lable">店铺名称：</div>
-            <div class="item-value">南京市百家湖片区XX杂食店</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.shopName : '/' }}</div>
           </div>
         </div>
         <div class="main-cell">
@@ -18,7 +18,7 @@
             <div class="item-icon"></div>
             <div class="item-lable">营业执照：</div>
             <div class="item-value value-image">
-              <img src="@/assets/images/zs.jpg" alt="" />
+              <img :src="myShopInfo ? myShopInfo.businessLicenseUrl : ''" alt="" />
             </div>
           </div>
         </div>
@@ -26,7 +26,7 @@
           <div class="cell-item">
             <div class="item-icon"></div>
             <div class="item-lable">经营范围：</div>
-            <div class="item-value">预包装食品（不含冷藏冷冻食品）销售</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.operation : '/' }}</div>
           </div>
         </div>
         <div class="main-cell">
@@ -40,7 +40,7 @@
           <div class="cell-item">
             <div class="item-icon"></div>
             <div class="item-lable">许可项目：</div>
-            <div class="item-value">/</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.permissionProject : '/'}}</div>
           </div>
         </div>
       </div>
@@ -49,42 +49,42 @@
           <div class="cell-item">
             <div class="item-icon"></div>
             <div class="item-lable">食品生产经营主体类别：</div>
-            <div class="item-value">食品销售</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.operation : '/' }}</div>
           </div>
         </div>
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
             <div class="item-lable">法定代表人：</div>
-            <div class="item-value">张三</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.bodyPrincipal : '' }}</div>
           </div>
         </div>
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
             <div class="item-lable">有效期至：</div>
-            <div class="item-value">2021-02-01</div>
+            <div class="item-value">2025-02-01</div>
           </div>
         </div>
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
             <div class="item-lable">企业地址：</div>
-            <div class="item-value">南京市江宁区将军大道11号</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.bodyAddress : '' }}</div>
           </div>
         </div>
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
             <div class="item-lable">统一社会信用代码：</div>
-            <div class="item-value">92210211MAWUJDT0X2</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.code : '' }}</div>
           </div>
         </div>
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
             <div class="item-lable">登记地址 ：</div>
-            <div class="item-value">南京市江宁区将军大道11号</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.road : '' }}</div>
           </div>
         </div>
         <div class="main-cell">
@@ -98,7 +98,7 @@
           <div class="cell-item">
             <div class="item-icon"></div>
             <div class="item-lable">成立日期：</div>
-            <div class="item-value">/</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.businessLicenseTime : '/' }}</div>
           </div>
         </div>
       </div>
@@ -107,7 +107,32 @@
 </template>
 
 <script>
-export default {};
+export default {
+  data() {
+    return {
+      myShopInfo: null,
+    };
+  },
+  props: {
+    shopInfo: {
+      type: Object,
+      default: ()=>{
+        return {}
+      },
+    },
+  },
+  watch:{
+    shopInfo:{
+      handler(newInfo){
+        console.log(newInfo,"获取的商店消息");
+        if(newInfo) {
+          this.myShopInfo = newInfo;
+        }
+      },
+      immediate:true,
+    }
+  }
+};
 </script>
 
 <style lang="scss" scoped>
@@ -157,6 +182,7 @@ export default {};
         color: #cccccc;
       }
       .item-value {
+        flex: 1;
         min-height: 30px;
         line-height: 30px;
         font-size: 14px;

src/views/components/shop/index.vue

@@ -12,7 +12,7 @@
       </div>
     </div>
     <div class="tab-page">
-      <tab-one v-show="currentIndex == 0"></tab-one>
+      <tab-one v-show="currentIndex == 0" :shopInfo="shopInfo"></tab-one>
       <tab2 v-show="currentIndex == 1" />
       <tab3 v-show="currentIndex == 2" />
       <tab4 v-show="currentIndex == 3" />
@@ -43,6 +43,7 @@ export default {
         { name: "整改过程信息" },
         { name: "过期未整改告警" },
       ],
+      shopInfo:null,
     };
   },
   methods: {
@@ -50,7 +51,8 @@ export default {
       if (this.currentIndex == index) return;
       this.currentIndex = index;
     },
-    open() {
+    open(info) {
+      this.shopInfo = info;
       this.$refs.dialog5.open("1");
     },
     Close() {

vue.config.js

@@ -25,7 +25,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/demo/citymanage" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）