视频、店铺点位聚合

src/api/bigScreenApi/index.js

@@ -84,6 +84,15 @@ export function fence(params){
   })
 }
 
+// 网格
+export function bgridsetting(params){
+  return request({
+    url:'/jn/bgridsetting/list',
+    method:'get',
+    params
+  })
+}
+
 
 /**
  * 车辆管理

src/api/bigScreenApi/robot.js

@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2024-01-11 23:19:29
  * @LastEditors: JC9527
- * @LastEditTime: 2024-01-12 12:39:16
+ * @LastEditTime: 2024-01-12 23:59:57
  */
 import request from "@/utils/request1"
 
@@ -38,7 +38,7 @@ export function ViewListPage(params,data){
  * 
  * 任务派发流程
  */
-// 任务派发流程
+// 任务派发流程----3调用自动提交
 export function autoSubmit(data){
   return request({
     url: "/api/bpm/bpm-front/operateRest/autoSubmit/v1",
@@ -46,7 +46,7 @@ export function autoSubmit(data){
     data
   })
 }
-// 任务派至城管队长----获取流程权限
+// 任务派至城管队长----1获取流程权限
 export function getBpmOperateVo(params){
   return request({
     url: "/api/bpm/bpm-front/displayRest/getBpmOperateVo/v1",
@@ -54,7 +54,7 @@ export function getBpmOperateVo(params){
     params
   })
 }
-// 任务派至城管队长----保存业务数据
+// 任务派至城管队长----2保存业务数据
 export function distributeSaveData(params,data){
   return request({
     url: "/api/eform/engine/formEngine/saveData",

src/permission.js

@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2024-01-09 23:08:15
  * @LastEditors: JC9527
- * @LastEditTime: 2024-01-12 10:52:53
+ * @LastEditTime: 2024-01-17 11:08:57
  */
 import router from './router'
 import store from './store'
@@ -42,9 +42,11 @@ router.beforeEach((to, from, next) => {
       //   localStorage.setItem('AuserInfo', JSON.stringify(el.data))
         
       // })
+    } else {
+      location.href = "https://t-jn-bjh-admin.jsszkd.com/"
     }
   }
-  next()
+  // next()
 
   // if (getToken()) {
   //   to.meta.title && store.dispatch('settings/setTitle', to.meta.title)

src/utils/mapJson/开发区空港开发区GJ02.json

@@ -15,7 +15,7 @@
         "CENTERX": 118.80091257948892,
         "CENTERY": 31.890183680582105,
         "CODE": "320115402",
-        "NAME": "开发区空港开发区",
+        "NAME": "空港开发区",
         "NOTE": null,
         "SHAPE_AREA": 73241240.470899999,
         "SHAPE_LENG": 50271.742558899998,

src/utils/mapJson/开发区软件园GJ02.json

@@ -3,6 +3,6 @@
 "name": "开发区软件园GJ02",
 "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
 "features": [
-{ "type": "Feature", "properties": { "fid": 1.0, "CENTERX": 118.762835877664, "CENTERY": 31.890183680582105, "CODE": "320115402", "NAME": "开发区软件园", "NOTE": null, "SHAPE_AREA": 73241240.470899999, "SHAPE_LENG": 50271.742558899998, "SUMCASE": null, "USERID01": null, "USERID012": null, "USERID0123": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.795924761210415, 31.822844740193673 ], [ 118.791994007008626, 31.821915813271012 ], [ 118.789036842569587, 31.821275807449588 ], [ 118.782049907996893, 31.82025349400611 ], [ 118.773741979907015, 31.819054743529094 ], [ 118.768799612966433, 31.818718500351526 ], [ 118.759493119753984, 31.819742115723148 ], [ 118.751025302463788, 31.820997622322786 ], [ 118.74837406041577, 31.821381065686541 ], [ 118.749448221670164, 31.831464595478231 ], [ 118.74957711296527, 31.83262312332057 ], [ 118.750006509133939, 31.83391043717295 ], [ 118.75030706593347, 31.834639923084726 ], [ 118.751509139595214, 31.836313520295523 ], [ 118.751981376137152, 31.837085919566878 ], [ 118.753483825949885, 31.83893109296622 ], [ 118.751724029417474, 31.839231242234018 ], [ 118.750092994010828, 31.840775608498888 ], [ 118.747938421907378, 31.842308142494456 ], [ 118.745027354391496, 31.84437826161501 ], [ 118.741935838695497, 31.845749876007599 ], [ 118.739101534726359, 31.84634897358438 ], [ 118.734548783169203, 31.847375568138158 ], [ 118.735237043229375, 31.858102807951948 ], [ 118.739017010373232, 31.861280498703735 ], [ 118.742538275761518, 31.859394559490148 ], [ 118.747433140139151, 31.860254654037021 ], [ 118.753185620484203, 31.863345090141635 ], [ 118.758507434406781, 31.865232934511141 ], [ 118.77008105483398, 31.864913510547854 ], [ 118.77118047903501, 31.858323913829825 ], [ 118.77041139498327, 31.856374951295841 ], [ 118.769786635462538, 31.853564041731449 ], [ 118.770132063679711, 31.849482338635532 ], [ 118.770131823336413, 31.846865014246603 ], [ 118.772319290524024, 31.848794552093999 ], [ 118.773005619730995, 31.850553300335875 ], [ 118.773820465965898, 31.851067643996235 ], [ 118.775921704103538, 31.85149521424669 ], [ 118.777465328682553, 31.85149401500593 ], [ 118.778194170522283, 31.850849816789804 ], [ 118.777765195169678, 31.848533195028477 ], [ 118.778879911990003, 31.847974476057928 ], [ 118.779437490353544, 31.850290970503789 ], [ 118.780466508512944, 31.851019474035283 ], [ 118.781581191243134, 31.851361699375271 ], [ 118.783684095891587, 31.847472110963885 ], [ 118.783124504297618, 31.851660554272232 ], [ 118.784217538246963, 31.8508656723988 ], [ 118.785117813125495, 31.851980313270037 ], [ 118.78520339080923, 31.850328307256063 ], [ 118.786081924524183, 31.848418006016917 ], [ 118.787474874071094, 31.847665590412028 ], [ 118.78906061633873, 31.846869981850432 ], [ 118.788096167682511, 31.845648253879666 ], [ 118.78940320863731, 31.843866084922013 ], [ 118.788031604130978, 31.842666287776375 ], [ 118.787067065854714, 31.8408438274368 ], [ 118.784837887271436, 31.837756924790842 ], [ 118.786294979035375, 31.834666043559373 ], [ 118.786294892535878, 31.833722083293804 ], [ 118.782951317023546, 31.832953231291647 ], [ 118.784494287919301, 31.830377228623007 ], [ 118.785093897063817, 31.824884447278194 ], [ 118.794839771769759, 31.826729412247591 ], [ 118.795924761210415, 31.822844740193673 ] ] ] ] } }
+{ "type": "Feature", "properties": { "fid": 1.0, "CENTERX": 118.762835877664, "CENTERY": 31.890183680582105, "CODE": "320115402", "NAME": "江苏软件园", "NOTE": null, "SHAPE_AREA": 73241240.470899999, "SHAPE_LENG": 50271.742558899998, "SUMCASE": null, "USERID01": null, "USERID012": null, "USERID0123": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.795924761210415, 31.822844740193673 ], [ 118.791994007008626, 31.821915813271012 ], [ 118.789036842569587, 31.821275807449588 ], [ 118.782049907996893, 31.82025349400611 ], [ 118.773741979907015, 31.819054743529094 ], [ 118.768799612966433, 31.818718500351526 ], [ 118.759493119753984, 31.819742115723148 ], [ 118.751025302463788, 31.820997622322786 ], [ 118.74837406041577, 31.821381065686541 ], [ 118.749448221670164, 31.831464595478231 ], [ 118.74957711296527, 31.83262312332057 ], [ 118.750006509133939, 31.83391043717295 ], [ 118.75030706593347, 31.834639923084726 ], [ 118.751509139595214, 31.836313520295523 ], [ 118.751981376137152, 31.837085919566878 ], [ 118.753483825949885, 31.83893109296622 ], [ 118.751724029417474, 31.839231242234018 ], [ 118.750092994010828, 31.840775608498888 ], [ 118.747938421907378, 31.842308142494456 ], [ 118.745027354391496, 31.84437826161501 ], [ 118.741935838695497, 31.845749876007599 ], [ 118.739101534726359, 31.84634897358438 ], [ 118.734548783169203, 31.847375568138158 ], [ 118.735237043229375, 31.858102807951948 ], [ 118.739017010373232, 31.861280498703735 ], [ 118.742538275761518, 31.859394559490148 ], [ 118.747433140139151, 31.860254654037021 ], [ 118.753185620484203, 31.863345090141635 ], [ 118.758507434406781, 31.865232934511141 ], [ 118.77008105483398, 31.864913510547854 ], [ 118.77118047903501, 31.858323913829825 ], [ 118.77041139498327, 31.856374951295841 ], [ 118.769786635462538, 31.853564041731449 ], [ 118.770132063679711, 31.849482338635532 ], [ 118.770131823336413, 31.846865014246603 ], [ 118.772319290524024, 31.848794552093999 ], [ 118.773005619730995, 31.850553300335875 ], [ 118.773820465965898, 31.851067643996235 ], [ 118.775921704103538, 31.85149521424669 ], [ 118.777465328682553, 31.85149401500593 ], [ 118.778194170522283, 31.850849816789804 ], [ 118.777765195169678, 31.848533195028477 ], [ 118.778879911990003, 31.847974476057928 ], [ 118.779437490353544, 31.850290970503789 ], [ 118.780466508512944, 31.851019474035283 ], [ 118.781581191243134, 31.851361699375271 ], [ 118.783684095891587, 31.847472110963885 ], [ 118.783124504297618, 31.851660554272232 ], [ 118.784217538246963, 31.8508656723988 ], [ 118.785117813125495, 31.851980313270037 ], [ 118.78520339080923, 31.850328307256063 ], [ 118.786081924524183, 31.848418006016917 ], [ 118.787474874071094, 31.847665590412028 ], [ 118.78906061633873, 31.846869981850432 ], [ 118.788096167682511, 31.845648253879666 ], [ 118.78940320863731, 31.843866084922013 ], [ 118.788031604130978, 31.842666287776375 ], [ 118.787067065854714, 31.8408438274368 ], [ 118.784837887271436, 31.837756924790842 ], [ 118.786294979035375, 31.834666043559373 ], [ 118.786294892535878, 31.833722083293804 ], [ 118.782951317023546, 31.832953231291647 ], [ 118.784494287919301, 31.830377228623007 ], [ 118.785093897063817, 31.824884447278194 ], [ 118.794839771769759, 31.826729412247591 ], [ 118.795924761210415, 31.822844740193673 ] ] ] ] } }
 ]
 }

src/utils/request1.js

@@ -91,7 +91,7 @@ service.interceptors.response.use(res => {
           // store.dispatch('LogOut').then(() => {
           //   location.href = '/#/login';
           // })
-          location.href = "http://39.101.188.84:9999/demo/JiangNingUmaleWeb/#/index"
+          location.href = "https://t-jn-bjh-admin.jsszkd.com/"
         }).catch(() => {
           isRelogin.show = false;
         });

src/views/bigScreen/index.vue

@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-14 14:40:02
  * @LastEditors: JC9527
- * @LastEditTime: 2023-12-28 11:10:12
+ * @LastEditTime: 2024-01-12 23:43:59
 -->
 <template>
   <div class="pc-container">
@@ -312,7 +312,7 @@ div {
     display: flex;
     padding: 0 40px;
     .system-title {
-      padding: 18px 0 0 65px;
+      padding: 15px 0 0 45px;
       font-size: 40px;
       font-family: "YouSheBiaoTiHei";
       font-weight: 400;

src/views/components/dialog/index.vue

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

src/views/components/newEvent/index.vue

@@ -1698,11 +1698,10 @@ export default {
           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);
+          // 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.cancel();
               this.$modal.msgSuccess("新增成功");
             }
           })

src/views/components/personageTask/index.vue

@@ -81,12 +81,13 @@ export default {
     }
   },
   mounted() {
-    this.getViewListPageList();
+    // this.getViewListPageList();
   },
   methods:{
     open(info){
       this.info = info;
       this.$refs.taskDialog.open();
+      this.getViewListPageList();
     },
     getViewListPageList(){
       let data = {'queryValue' : [], "myInstanceClassify" : "all"}
@@ -111,8 +112,17 @@ export default {
     },
     // 确定按钮
     confirm(refForm){
-      autoSubmit().then(res=>{
-        
+      this.$refs[formName].validate((valid) => {
+        if(valid){
+          let ts = Math.round(new Date().getTime()/1000).toString();
+          // console.log(ts,"tstststs");
+          // console.log(this.taskForm,"taskForm");
+          // getBpmOperateVo({_t:ts,id:this.taskForm.task,idType:"formId",formCode:"event-holder"}).then(res=>{
+          //   if(res.code == 200) {
+          //     return distributeSaveData()
+          //   }
+          // })
+        }
       })
     },
   },

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

@@ -16,24 +16,50 @@
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
-            <div class="item-lable">营业执照：</div>
-            <div class="item-value value-image">
-              <img :src="myShopInfo ? myShopInfo.businessLicenseUrl : ''" alt="" />
+            <div class="item-lable">营业执照名称：</div>
+            <!--  value-image -->
+            <div class="item-value">
+              <!-- <img :src="myShopInfo ? myShopInfo.bodyName : ''" alt="" /> -->
+              {{ myShopInfo ? myShopInfo.bodyName : '' }}
             </div>
           </div>
         </div>
         <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">{{ 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-lable">统一社会信用代码：</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">{{ myShopInfo ? myShopInfo.bodyPrincipal : '/'}}</div>
+          </div>
+        </div>
+        <div class="main-cell">
+          <div class="cell-item">
+            <div class="item-icon"></div>
+            <div class="item-lable">二维码：</div>
+            <!--  value-image -->
+            <div class="item-value value-image" v-if="myShopInfo.baseImg">
+              <img :src="myShopInfo ? myShopInfo.baseImg : ''" alt="" />
+            </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">{{ myShopInfo ? myShopInfo.manageScope : '/'}}</div>
           </div>
         </div>
         <div class="main-cell">
@@ -43,44 +69,51 @@
             <div class="item-value">{{ myShopInfo ? myShopInfo.permissionProject : '/'}}</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">{{ myShopInfo ? myShopInfo.sbLevel : '/'}}</div>
+          </div>
+        </div>
       </div>
       <div class="cell-right">
         <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">{{ 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">{{ myShopInfo ? myShopInfo.bodyPrincipal : '' }}</div>
+            <div class="item-lable">路段：</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.road : '' }}</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">2025-02-01</div>
+            <div class="item-lable">营业执照领取时间：</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.businessLicenseTime : '' }}</div>
           </div>
         </div>
         <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">{{ 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">{{ myShopInfo ? myShopInfo.code : '' }}</div>
+            <div class="item-lable">负责人手机号：</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.phoneOne : '' }}</div>
           </div>
         </div>
-        <div class="main-cell">
+        <!-- <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
             <div class="item-lable">登记地址 ：</div>
@@ -100,7 +133,7 @@
             <div class="item-lable">成立日期：</div>
             <div class="item-value">{{ myShopInfo ? myShopInfo.businessLicenseTime : '/' }}</div>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
   </div>
@@ -154,7 +187,7 @@ export default {
 .tab-main {
   margin-top: 20px;
   display: flex;
-  align-items: center;
+  // align-items: center;
   & > div {
     flex: 1;
   }
@@ -166,7 +199,7 @@ export default {
     .cell-item {
       flex: 1;
       display: flex;
-      align-items: flex-start;
+      // align-items: flex-start;
       margin-bottom: 20px;
       .item-icon {
         height: 30px;
@@ -190,12 +223,13 @@ export default {
         color: #e9f4ff;
       }
       .value-image {
-        width: 243px;
-        height: 163px;
+        width: 150px;
+        height: 150px;
         img {
           display: block;
           height: 100%;
-          width: 100%;
+          // width: 100%;
+          width: 150px;
         }
       }
     }

src/views/components/shop/index.vue

@@ -53,7 +53,11 @@ export default {
     },
     open(info) {
       this.shopInfo = info;
-      this.$refs.dialog5.open("1");
+      if(info.baseImg) {
+        this.$refs.dialog5.open("10");
+      } else {
+        this.$refs.dialog5.open("9");
+      }
     },
     Close() {
       this.$refs.dialog5.Close();

src/views/components/title/index.vue

@@ -4,11 +4,11 @@
  * @Author: JC9527
  * @Date: 2023-08-15 09:52:05
  * @LastEditors: JC9527
- * @LastEditTime: 2023-08-16 13:13:48
+ * @LastEditTime: 2024-01-12 23:50:11
 -->
 <template>
   <div class="mytitle">
-    <div class="title-text">
+    <div class="title-text" :text="title">
       {{ title }}
     </div>
     <!-- <div class="title-num" v-show="numShow > 0">
@@ -43,13 +43,25 @@ export default {
   display: flex;
   justify-content: space-between;
   .title-text {
-    font-size: vw(22);
+    font-size: vw(20);
     letter-spacing: vw(2);
-    font-family: 'YouSheBiaoTiHei';
+    font-family: 'Source Han Sans CN--Bold';
     font-weight: 400;
     color: #e9eff5;
     text-align: left;
     padding-left: vw(30);
+    &::before {
+      content: attr(text);
+      position: absolute;
+      z-index: 10;
+      color: #ffffff;
+      // 渐变样式
+      background: linear-gradient(180deg, #ffffff 0%, #43B4C5  100%);
+      -webkit-background-clip: text;
+      color: transparent;
+      // 去除继承父级样式
+      text-shadow: none;
+    }
   }
   .title-num {
     margin-right: vw(15);