修改logo

.env.tiankongdi

@@ -21,6 +21,10 @@ VITE_GLOB_UPLOAD_URL=http://60.213.14.14:6070
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=
 
+<<<<<<< HEAD
 VITE_GLOB_APP_TITLE = 临沂市自然资源无人机全域巡查平台
+=======
+VITE_GLOB_APP_TITLE = 临沂市自然资源综合监管平台
+>>>>>>> 1baf4278c134b7cd31e07b595f1947d5358e7099
 
 VITE_GLOB_APP_LOGO = /tiankongdi-logo.png

src/components/FormViewer/index.vue

@@ -15,7 +15,7 @@
             </template>
           </BasicForm>
           <subTable ref="subTableRef" :data="subTableColumns[index]" :tabsKey="tabsKey" />
-          
+
           <template v-for="(item, useIndex) in createOrModifyList[index]" :key="useIndex">
             <CreateOrModifyComponent :data="item" />
           </template>
@@ -74,7 +74,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { onMounted, ref, defineProps,defineEmits } from 'vue';
+  import { onMounted, ref, defineProps, defineEmits } from 'vue';
   import { BasicForm, useForm } from '@/components/Form';
   import { functionGetFormDataFormScheme, LoadFormScheme } from '@/api/demo/formScheme';
   import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue';
@@ -86,7 +86,7 @@
   import { subTableStore } from '@/store/modules/subTable';
   import dayjs from 'dayjs';
 
-  const emit = defineEmits(["getFormSuccess"])
+  const emit = defineEmits(['getFormSuccess']);
   const subTableDataStore = subTableStore();
 
   let formColumns: FormSchema[] = [];
@@ -146,7 +146,7 @@
     if (data) {
       const scheme = JSON.parse(data.scheme);
       scheme.formInfo.tabList.forEach((tabElement, index) => {
-        createOrModifyList.value.push([])
+        createOrModifyList.value.push([]);
         tabElement.schemas.forEach((element) => {
           //流程设置的表单显示和编辑与表单做关联
           props.formConfig.forEach((configElement) => {
@@ -300,10 +300,10 @@
         resetFields();
         if (!disDetail) {
           if (props.flowFormData) {
-            if(props.flowFormData.mapGeom){
+            if (props.flowFormData.mapGeom) {
               props.flowFormData.MapGeom = props.flowFormData.mapGeom;
             }
-            console.log("flowFormDataAfter",props.flowFormData);
+            console.log('flowFormDataAfter', props.flowFormData);
             setFieldsValue(props.flowFormData);
           }
         }
@@ -380,7 +380,6 @@
       data[mainTableName].forEach((item) => {
         infoUseMainTableData.value = { ...infoUseMainTableData.value, ...item };
       });
-    
     }
     if (Object.keys(cardValues.value).length > 0) {
       Object.keys(cardValues.value).forEach((cardItem) => {
@@ -399,7 +398,7 @@
       });
     }
     let mainTable = subTableDB.value.find((item) => item.type === 'main').name;
-    emit("getFormSuccess",data[mainTable][0])
+    emit('getFormSuccess', data[mainTable][0]);
   }
   const groupRef = ref();
   async function getForm() {
@@ -434,7 +433,7 @@
       // 存储创建人、创建时间等内容
       if (createOrModifyList.value.length > 0) {
         createOrModifyList.value.forEach((childTab) => {
-          childTab.forEach(item => {
+          childTab.forEach((item) => {
             if (!item.componentProps.disabled) {
               if (item.type == 'createuser' || item.type == 'modifyuser') {
                 query[item.field] = userName;
@@ -442,7 +441,7 @@
                 query[item.field] = nowTime.value;
               }
             }
-          })
+          });
         });
       }
       return query;
@@ -470,7 +469,17 @@
   }
   .my-form-viewer {
     overflow: auto;
-    width:100%;
+    width: 100%;
     height: calc(100vh - 350px);
   }
+  ::v-deep .ant-tabs .ant-tabs-nav-wrap {
+    position: fixed;
+    width: 100%;
+    z-index: 1;
+    background-color: @component-background;
+    border-bottom: 1px solid rgba(5, 5, 5, 0.06);
+  }
+  ::v-deep .ant-tabs-content-holder {
+    margin-top: 40px;
+  }
 </style>

src/layouts/default/header/index.vue

@@ -37,7 +37,7 @@
 
       <ErrorAction v-if="getUseErrorHandle" :class="`${prefixCls}-action__item error-action`" />
 
-      <Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" />
+      <!-- <Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" /> -->
 
       <FullScreen v-if="getShowFullScreen" :class="`${prefixCls}-action__item fullscreen-item`" />
 

src/locales/lang/en/sys.json

@@ -50,7 +50,7 @@
     "backLogin": "Back Login",
     "backHome": "Back Home",
     "subTitle403": "Sorry, you don't have access to this page.",
-    "subTitle404": "Sorry, the page you visited does not exist.",
+    "subTitle404": "The current account does not have permission.",
     "subTitle500": "Sorry, the server is reporting an error.",
     "noDataTitle": "No data on the current page.",
     "networkErrorTitle": "Network Error",

src/locales/lang/zh-CN/sys.json

@@ -50,7 +50,7 @@
     "backLogin": "返回登录",
     "backHome": "返回首页",
     "subTitle403": "抱歉，您无权访问此页面。",
-    "subTitle404": "抱歉，您访问的页面不存在。",
+    "subTitle404": "当前账号无权限访问",
     "subTitle500": "抱歉，服务器报告错误。",
     "noDataTitle": "当前页无数据",
     "networkErrorTitle": "网络错误",

src/router/routes/index.ts

@@ -1,6 +1,7 @@
 import type { AppRouteRecordRaw, AppRouteModule } from '@/router/types';
 
 import { PAGE_NOT_FOUND_ROUTE, REDIRECT_ROUTE } from '@/router/routes/basic';
+import { LAYOUT } from '@/router/constant';
 
 import { mainOutRoutes } from './mainOut';
 import { PageEnum } from '@/enums/pageEnum';
@@ -88,6 +89,27 @@ export const SubjectRoute: AppRouteRecordRaw = {
     title: '主题',
   },
 };
+export const FORMCALLPAGE_ROUTE: AppRouteRecordRaw = {
+  path: '/formCallPageParent',
+  component: LAYOUT,
+  name: 'formCallPageParent',
+  meta: {
+    title: '表单',
+    hideBreadcrumb: true,
+    hideMenu: true,
+  },
+  children: [
+    {
+      path: '/formCallPage',
+      name: 'formCallPage',
+      component: () => import('@/views/demo/onlineform/formCall/index.vue'),
+      meta: {
+        title: '表单调用',
+        hideBreadcrumb: true,
+      },
+    },
+  ],
+};
 // Basic routing without permission
 // 未经许可的基本路由
 export const basicRoutes = [
@@ -102,4 +124,5 @@ export const basicRoutes = [
   TaskLookRoute,
   SchemeRoute,
   SubjectRoute,
+  FORMCALLPAGE_ROUTE,
 ];

src/views/demo/bootstraps/auditinfo/MapList/index.vue

@@ -133,7 +133,21 @@
       :destroyOnClose="true"
     >
       <template #footer> </template>
+      <div class="handoff">
+        <a-button
+          :disabled="showDataIndex === 0"
+          type="primary" 
+          style="margin-right: 25px;"
+          @click="prevData"
+        >上一条</a-button>
+        <a-button
+          :disabled="showDataIndex === dataList.length -1"
+          type="primary"
+          @click="nextData"
+        >下一条</a-button>
+      </div>
       <Audit
+        v-if="handoffShow"
         ref="posRef"
         :processId="processId"
         :taskId="taskId"
@@ -167,6 +181,8 @@
   const isRead: any = ref(0);
   const type = ref('');
   const auditOpen = ref(false);
+  const showDataIndex = ref()
+  const handoffShow = ref(true)
   const params = ref({
     page: 1,
     limit: 10,
@@ -201,6 +217,7 @@
     getTaskList();
   }
   async function goAudit(record) {
+    showDataIndex.value = dataList.value.findIndex(item => item.taskeid === record.taskeid)
     let data = await getDetail({ code: record.processcode });
     let scheme = JSON.parse(data.scheme.content);
     let wfData = scheme.wfData;
@@ -237,6 +254,40 @@
       getTaskList();
     })
   }
+  const prevData = async () => {
+    if(showDataIndex.value === 0){
+      message.warning('已经是第一条数据了')
+      return
+    }
+    handoffShow.value = false
+    showDataIndex.value = showDataIndex.value -1
+    let record = dataList.value[showDataIndex.value]
+    let data = await getDetail({ code: record.processcode });
+    let scheme = JSON.parse(data.scheme.content);
+    let wfData = scheme.wfData;
+    flowWfDataStore.setWfDataAll(wfData);
+    processId.value = record.processid;
+    taskId.value = record.taskeid;
+    type.value = record.type;
+    handoffShow.value = true
+  }
+  const nextData = async () => {
+    if(showDataIndex.value === dataList.value.length -1){
+      message.warning('已经是最后一条数据了')
+      return
+    }
+    handoffShow.value = false
+    showDataIndex.value = showDataIndex.value + 1
+    let record = dataList.value[showDataIndex.value]
+    let data = await getDetail({ code: record.processcode });
+    let scheme = JSON.parse(data.scheme.content);
+    let wfData = scheme.wfData;
+    flowWfDataStore.setWfDataAll(wfData);
+    processId.value = record.processid;
+    taskId.value = record.taskeid;
+    type.value = record.type;
+    handoffShow.value = true
+  }
 </script>
 <style lang="less">
   .full-modal {
@@ -255,6 +306,12 @@
   }
 </style>
 <style lang="less" scoped>
+  .handoff{
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    padding-right: 25px;
+  }
   .content {
     height: 100%;
     display: flex;

src/views/sys/exception/Exception.vue

@@ -70,7 +70,7 @@
         title: '403',
         status: `${ExceptionEnum.PAGE_NOT_ACCESS}`,
         subTitle: t('sys.exception.subTitle403'),
-        btnText: props.full ? backLoginI18n : backHomeI18n,
+        // btnText: props.full ? backLoginI18n : backHomeI18n,
         handler: () => (props.full ? go(PageEnum.BASE_LOGIN) : go()),
       });
 
@@ -78,7 +78,7 @@
         title: '404',
         status: `${ExceptionEnum.PAGE_NOT_FOUND}`,
         subTitle: t('sys.exception.subTitle404'),
-        btnText: props.full ? backLoginI18n : backHomeI18n,
+        // btnText: props.full ? backLoginI18n : backHomeI18n,
         handler: () => (props.full ? go(PageEnum.BASE_LOGIN) : go()),
       });