bug问题修改

src/settings/designSetting copy.ts

@@ -0,0 +1,49 @@
+import { ThemeEnum } from '../enums/appEnum';
+
+export const prefixCls = 'vben';
+
+export const darkMode = ThemeEnum.LIGHT;
+
+// app theme preset color
+export const APP_PRESET_COLOR_LIST: string[] = [
+  '#0960bd',
+  '#0084f4',
+  '#009688',
+  '#536dfe',
+  '#ff5c93',
+  '#ee4f12',
+  '#0096c7',
+  '#9c27b0',
+  '#ff9800',
+];
+
+// header preset color
+export const HEADER_PRESET_BG_COLOR_LIST: string[] = [
+  '#0671DD',//ffffff
+  '#151515',
+  '#009688',
+  '#5172DC',
+  '#018ffb',
+  '#409eff',
+  '#e74c3c',
+  '#24292e',
+  '#394664',
+  '#001529',
+  '#383f45',
+  '#0671DD',
+];
+
+// sider preset color
+export const SIDE_BAR_BG_COLOR_LIST: string[] = [
+  '#001529',
+  '#212121',
+  '#41567c',//273352
+  '#41567c',//ffffff//324166
+  '#191b24',
+  '#191a23',
+  '#304156',
+  '#001628',
+  '#28333E',
+  '#344058',
+  '#383f45',
+];

src/settings/designSetting.ts

@@ -20,30 +20,30 @@ export const APP_PRESET_COLOR_LIST: string[] = [
 // header preset color
 export const HEADER_PRESET_BG_COLOR_LIST: string[] = [
   '#0671DD',//ffffff
-  '#151515',
-  '#009688',
-  '#5172DC',
-  '#018ffb',
-  '#409eff',
-  '#e74c3c',
-  '#24292e',
-  '#394664',
-  '#001529',
-  '#383f45',
+  '#0671DD',
+  '#0671DD',
+  '#0671DD',
+  '#0671DD',
+  '#0671DD',
+  '#0671DD',
+  '#0671DD',
+  '#0671DD',
+  '#0671DD',
+  '#0671DD',
   '#0671DD',
 ];
 
 // sider preset color
 export const SIDE_BAR_BG_COLOR_LIST: string[] = [
-  '#001529',
-  '#212121',
+  '#41567c',
+  '#41567c',
   '#41567c',//273352
   '#41567c',//ffffff//324166
-  '#191b24',
-  '#191a23',
-  '#304156',
-  '#001628',
-  '#28333E',
-  '#344058',
-  '#383f45',
+  '#41567c',
+  '#41567c',
+  '#41567c',
+  '#41567c',
+  '#41567c',
+  '#41567c',
+  '#41567c',
 ];

src/utils/http/axios/checkStatus.ts

@@ -22,6 +22,9 @@ export function checkStatus(
   switch (status) {
     case 400:
       errMessage = `${msg}`;
+      if (msg.indexOf("服务内部错误") > -1) {
+        errMessage = '用户名或者密码错误!'
+      }
       break;
     // 401: Not logged in
     // Jump to the login page if not logged in, and carry the path of the current page

src/views/dataAdmin/dataAdmin/fileResourceUpload/fileUploadData.js

@@ -52,13 +52,10 @@ export const columns = [
 export const searchFormSchema = [
   {
     field: 'resourceTags',
-    label: '资源标签',
+    label: '系统标签',
     component: 'Select',
     componentProps: {
       options: serviceTags
-      // [
-      //   { label: '无', value: 0 },
-      // ],
     },
     colProps: { span: 6 },
   },
@@ -131,6 +128,26 @@ export const accountFormSchema = [
       options: serviceTags
     },
   },
+
+
+  // {
+  //   label: '角色',
+  //   field: 'userjs',
+  //   component: 'Select',
+  //   colProps: { span: 24 },
+  //   slot: 'roleSlot',
+  //   rules: [
+  //     {
+  //       required: true,
+  //       message: '请选择角色',
+  //       type: 'array',
+  //     },
+  //   ],
+  // },
+
+
+
+
   {
     field: 'serviceversion',
     label: '数据版本',

src/views/dataAdmin/dataAdmin/mapUpload/SourceDetail.vue

@@ -18,23 +18,13 @@
             </a-form-item>
           </a-col> -->
           <a-col :span="12" class="form-col">
-            <a-form-item
-              ref="servicename"
-              label="资源名称"
-              name="servicename"
-              class="label-form-item"
-            >
+            <a-form-item ref="servicename" label="资源名称" name="servicename" class="label-form-item">
               <a-input v-model:value="formState.servicename" :disabled="isView" />
             </a-form-item>
           </a-col>
 
           <a-col :span="12" class="form-col">
-            <a-form-item
-              ref="servicealiasname"
-              label="资源别名"
-              name="servicealiasname"
-              class="label-form-item"
-            >
+            <a-form-item ref="servicealiasname" label="资源别名" name="servicealiasname" class="label-form-item">
               <a-input v-model:value="formState.servicealiasname" :disabled="isView" />
             </a-form-item>
           </a-col>
@@ -50,26 +40,15 @@
           </a-col>
 
           <a-col :span="24" class="form-col">
-            <a-form-item
-              ref="description"
-              label="资源描述"
-              name="description"
-              class="label-form-item"
-              :disabled="isView"
-            >
+            <a-form-item ref="description" label="资源描述" name="description" class="label-form-item" :disabled="isView">
               <a-textarea v-model:value="formState.description" :rows="2" />
             </a-form-item>
           </a-col>
 
           <a-col :span="24" class="form-col">
             <a-form-item ref="thumbnail" label="缩略图" name="thumbnail" class="label-form-item">
-              <a-upload
-                action=""
-                v-model:file-list="fileList"
-                @change="uploadFilesChange"
-                :multiple="false"
-                :disabled="isView"
-              >
+              <a-upload action="" v-model:file-list="fileList" @change="uploadFilesChange" :multiple="false"
+                :disabled="isView">
                 <a-button style="background-color: #0671dd; color: #fff; border-radius: 4px">
                   <upload-outlined></upload-outlined>
                   文件上传
@@ -84,12 +63,7 @@
         <div class="title">描述信息</div>
         <a-row class="form-container">
           <a-col :span="12" class="form-col">
-            <a-form-item
-              ref="servicetype"
-              label="资源类型"
-              name="servicetype"
-              class="label-form-item"
-            >
+            <a-form-item ref="servicetype" label="资源类型" name="servicetype" class="label-form-item">
               <a-select v-model:value="formState.servicetype" :disabled="isView">
                 <template v-for="tag in serviceTypes" :key="tag.value">
                   <a-select-option :value="tag.value">{{ tag.label }}</a-select-option>
@@ -133,12 +107,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="12" class="form-col">
-            <a-form-item
-              ref="sourcetable"
-              label="数据表"
-              name="sourcetable"
-              class="label-form-item"
-            >
+            <a-form-item ref="sourcetable" label="数据表" name="sourcetable" class="label-form-item">
               <a-input v-model:value="formState.formdatabase" :disabled="isView" />
             </a-form-item>
           </a-col>
@@ -164,14 +133,8 @@
           <a-col :span="12" class="form-col">
             <a-form-item ref="source" label="发布日期" name="source" class="label-form-item">
               <!-- <a-input v-model:value="formState.publishtime" disabled /> -->
-              <a-date-picker
-                v-model:value="formState.publishtime"
-                format="YYYY-MM-DD hh:mm:ss"
-                style="width: 100%"
-                disabled
-                show-time
-                :disabled="isView"
-              >
+              <a-date-picker v-model:value="formState.publishtime" format="YYYY-MM-DD hh:mm:ss" style="width: 100%"
+                disabled show-time :disabled="isView">
                 <template #renderExtraFooter>extra footer</template>
               </a-date-picker>
             </a-form-item>
@@ -183,29 +146,14 @@
           </a-col>
 
           <a-col :span="12" class="form-col">
-            <a-form-item
-              ref="updatetype"
-              label="更新方式"
-              name="updatetype"
-              class="label-form-item"
-            >
+            <a-form-item ref="updatetype" label="更新方式" name="updatetype" class="label-form-item">
               <a-input v-model:value="formState.updateType" :disabled="isView" />
             </a-form-item>
           </a-col>
           <a-col :span="12" class="form-col">
-            <a-form-item
-              ref="updatetime"
-              label="更新时间"
-              name="updatetime"
-              class="label-form-item"
-            >
-              <a-date-picker
-                v-model:value="formState.updatetime"
-                format="YYYY-MM-DD hh:mm:ss"
-                style="width: 100%"
-                disabled
-                show-time
-              >
+            <a-form-item ref="updatetime" label="更新时间" name="updatetime" class="label-form-item">
+              <a-date-picker v-model:value="formState.updatetime" format="YYYY-MM-DD hh:mm:ss" style="width: 100%"
+                disabled show-time>
                 <template #renderExtraFooter>extra footer</template>
               </a-date-picker>
             </a-form-item>
@@ -231,64 +179,33 @@
           </a-col> -->
 
           <a-col :span="5" class="form-col">
-            <a-form-item
-              ref="runtimestatus"
-              label="运行状态"
-              name="runtimestatus"
-              class="label-form-item"
-            >
-              <a-switch
-                checked-children=""
-                un-checked-children=""
-                v-model:checked="formState.runtimestatus"
-                :disabled="isView"
-              />
+            <a-form-item ref="runtimestatus" label="运行状态" name="runtimestatus" class="label-form-item">
+              <a-switch checked-children="" un-checked-children="" v-model:checked="formState.runtimestatus"
+                :disabled="isView" />
             </a-form-item>
           </a-col>
 
           <a-col :span="5" class="form-col">
             <a-form-item ref="public" label="是否公开" name="public" class="label-form-item">
-              <a-switch
-                checked-children=""
-                un-checked-children=""
-                v-model:checked="formState.public"
-                :disabled="isView"
-              />
+              <a-switch checked-children="" un-checked-children="" v-model:checked="formState.public"
+                :disabled="isView" />
             </a-form-item>
           </a-col>
           <a-col :span="5" class="form-col">
             <a-form-item ref="share" label="是否共享" name="share" class="label-form-item">
-              <a-switch
-                checked-children=""
-                un-checked-children=""
-                v-model:checked="formState.share"
-                :disabled="isView"
-              />
+              <a-switch checked-children="" un-checked-children="" v-model:checked="formState.share" :disabled="isView" />
             </a-form-item>
           </a-col>
           <a-col :span="5" class="form-col">
-            <a-form-item
-              ref="externalApply"
-              label="是否外部申请"
-              name="externalApply"
-              class="label-form-item"
-            >
-              <a-switch
-                checked-children=""
-                un-checked-children=""
-                v-model:checked="formState.externalApply"
-                :disabled="isView"
-              />
+            <a-form-item ref="externalApply" label="是否外部申请" name="externalApply" class="label-form-item">
+              <a-switch checked-children="" un-checked-children="" v-model:checked="formState.externalApply"
+                :disabled="isView" />
             </a-form-item>
           </a-col>
           <a-col :span="4" class="form-col">
             <a-form-item ref="searched" label="是否展示" name="searched" class="label-form-item">
-              <a-switch
-                checked-children=""
-                un-checked-children=""
-                v-model:checked="formState.searched"
-                :disabled="isView"
-              />
+              <a-switch checked-children="" un-checked-children="" v-model:checked="formState.searched"
+                :disabled="isView" />
             </a-form-item>
           </a-col>
 
@@ -626,7 +543,7 @@ export default defineComponent({
         : '';
       formState.coordinate = data.detail?.crs;
       formState.searched = data.detail.searched === '0' ? false : true;
-      formState.keywords = data.detail?.keywords;
+      formState.keywords = data?.detail?.keywords ? JSON.parse(data.detail?.keywords) : '';
       formState.description = data.detail?.description;
       formState.mapingurl = data.detail?.mapingurl;
       formState.dataScope = data.detail?.dataScope;
@@ -657,13 +574,13 @@ export default defineComponent({
           },
         };
         const result = await submitExamine(param) as any
-        if(result){
-          console.log('已提交审核',result)
+        if (result) {
+          console.log('已提交审核', result)
           createMessage.success('已提交审核，请及时关注审核信息！')
         }
       }
-      else{
-        createMessage.error('未查到【' + data.flowName +'，请配置完成在提交审核');
+      else {
+        createMessage.error('未查到【' + data.flowName + '，请配置完成在提交审核');
         return
       }
     };
@@ -696,14 +613,16 @@ export default defineComponent({
 });
 </script>
   
-  <style scoped lang="less">
+<style scoped lang="less">
 .source-detail {
   height: 100%;
   width: 100%;
   padding: 0 20px;
+
   .compontents {
     width: 100%;
     height: auto;
+
     .title {
       height: 19px;
       line-height: 18px;
@@ -715,22 +634,27 @@ export default defineComponent({
       font-weight: 350;
       letter-spacing: 0px;
     }
+
     .form-container {
       width: 100%;
       height: auto;
+
       .form-col {
         height: 100%;
       }
+
       .form-col-left {
         padding-right: 20px;
       }
     }
   }
 }
+
 .label-form-item {
   :deep(.ant-form-item-label) {
     width: 90px;
   }
+
   :deep(.ant-form-item-control) {
     width: calc(100% - 90px);
   }

src/views/dataAdmin/dataAdmin/mapUpload/index.vue

@@ -5,16 +5,19 @@
         <Authority>
           <a-button type="primary" @click="handleCreate">新增地图</a-button>
         </Authority>
-        <Authority>
+        <!-- <Authority>
           <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)">
             <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
           </Popconfirm>
-        </Authority>
+        </Authority> -->
       </template>
       <!-- <template #status="{ record }">
         <Switch :checked="record.status === 1" :loading="record.pendingStatus" checkedChildren="启用" unCheckedChildren="禁用"
           @change="(checked: boolean) => statusChange(checked, record)" />
       </template> -->
+      <template #checktime="{ record }">
+        {{record?.checktime?.replace('.0', "")}}
+      </template>
       <template #action="{ record }">
         <TableAction :actions="[
           {
@@ -47,7 +50,7 @@
             icon: '' /**ant-design:delete-outlined'*/,
             color: 'error',
             ifShow: record.roleType != RoleEnum.SYS_ADMIN,
-            disabled: (record.nodename || record.status == 1) ? true : false,
+            disabled: (!record.nodename && !record.status || record.status == 2 || record.status == 1) ? false : true,
             popConfirm: {
               title: '是否确认删除',
               confirm: handleDelete.bind(null, record),

src/views/dataAdmin/dataAdmin/mapUpload/map.data.ts

@@ -110,6 +110,7 @@ export const columns: BasicColumn[] = [
     title: '审核时间',
     dataIndex: 'checktime',
     width: 180,
+    slots: { customRender: 'checktime' },
   },
 ];
 

src/views/dataAdmin/dataAdmin/sceneResourceUpload/sceneUploadData.js

@@ -424,22 +424,22 @@ export const accountFormSchema = [
     },
   },
 
-  {
-    field: 'shsqlc',
-    label: '适合申请流程',
-    required: false,
-    component: 'Select',
-    colProps: { span: 12 },
-    componentProps: {
-      replaceFields: {
-        title: 'label',
-        key: 'value',
-        value: 'value',
-      },
-      maxTagCount: 10,
-      options: ApplProcesses
-    },
-  },
+  // {
+  //   field: 'shsqlc',
+  //   label: '适合申请流程',
+  //   required: false,
+  //   component: 'Select',
+  //   colProps: { span: 12 },
+  //   componentProps: {
+  //     replaceFields: {
+  //       title: 'label',
+  //       key: 'value',
+  //       value: 'value',
+  //     },
+  //     maxTagCount: 10,
+  //     options: ApplProcesses
+  //   },
+  // },
 
   {
     field: 'runtimestatus',

src/views/dataAdmin/dataAdmin/sysDic.ts

@@ -17,16 +17,17 @@ resTag.map(item => {
   })
 })
 export const serviceTags = listTag;
+console.log('serviceTags:', serviceTags)
 /**
  * 密级字典
 */
 const restSecretList = await queryDicsByName('密级')
 let secretList = []
-restSecretList.map(item=>{
-  secretList.push({...item,...{label:item.name,value:item.code}})
+restSecretList.map(item => {
+  secretList.push({ ...item, ...{ label: item.name, value: item.code } })
 })
 export const secrets = secretList;
-console.log('secrets',secrets)
+console.log('secrets', secrets)
 /**
  * 服务标签
 */
@@ -39,8 +40,8 @@ coors.map(item => {
   coorList.push({
     label: item.GEOMNAME,
     value: item.GEOMTITLE,
-    GEOMNAME:item.GEOMNAME,
-    GEOMTITLE:item.GEOMTITLE,
+    GEOMNAME: item.GEOMNAME,
+    GEOMTITLE: item.GEOMTITLE,
   })
 })
 export const sysCoors = coorList
@@ -62,7 +63,7 @@ export const serviceTypes = listType
 const respDepts = await queryDicsByName('责任科室')
 let respList = []
 respDepts.map(item => {
-  respList.push({...item,...{label:item.name,value:item.code}})
+  respList.push({ ...item, ...{ label: item.name, value: item.code } })
 })
 export const respDept = respList
 
@@ -72,7 +73,7 @@ export const respDept = respList
 const collects = await queryDicsByName('管理部门')
 let collectList = []
 collects.map(item => {
-  collectList.push({...item,...{label:item.name,value:item.code}})
+  collectList.push({ ...item, ...{ label: item.name, value: item.code } })
 })
 export const collectDept = collectList
 /**
@@ -81,7 +82,7 @@ export const collectDept = collectList
 export const ECodes = await queryDicsByName('EPSG code')
 let epsgList = []
 ECodes.map(item => {
-  epsgList.push({...item,...{label:item.name,value:item.code}})
+  epsgList.push({ ...item, ...{ label: item.name, value: item.code } })
 })
 export const EPSGCodes = epsgList
 
@@ -93,7 +94,7 @@ export const checkStatus = [
   { label: '审核通过', value: 5 },
 ]
 
-export const ApplProcesses= [
+export const ApplProcesses = [
   { value: "ggdata", label: "国家秘密和工作秘密数据成果申请" },
   { value: "other", label: "其他数据成果申请" },
   { value: "mr", label: "地图资源申请" },

src/views/resource/examine/index.vue

@@ -20,17 +20,18 @@
             {
               label: '浏览',
               icon: '' /**clarity:note-edit-line*/,
+              ifShow: current == 'DR' ? false : true,
               onClick: handleVliew.bind(null, record),
             },
             {
-              label: '详情',
+              label: '查看',
               icon: '' /**clarity:note-edit-line*/,
               onClick: handleDetail.bind(null, record),
             },
             {
               label: '审核',
               icon: '' /**clarity:note-edit-line*/,
-              disabled: !record.status ? false : true,
+              disabled: statusShow == 1 ? false : true,
               color: 'warning',
               onClick: handleEdit.bind(null, record),
             },
@@ -59,6 +60,13 @@
             }}
           </Tag>
         </template>
+        <template #BLZT="{ record }">
+          <Tag :style="`color:${record.status === 3 || record.status === 3 ? 'red' : ''};`">
+            {{
+              record.BLZT == '在办' ? '审核中' : record.BLZT == '已办结' ? '审核完' : ''
+            }}
+          </Tag>
+        </template>
       </BasicTable>
       <check v-if="ischect" @register="registerModal1" @success="handleSuccess" />
       <map-resource-upload v-if="!ischect && current === 'MR'" @register="registerModalMR"
@@ -115,6 +123,7 @@ export default defineComponent({
   },
   setup() {
     let current = ref('MR');
+    let statusShow = ref(1);
     //const [registerDrawer, { openDrawer }] = useDrawer();
     const [registerModal, { openModal }] = useModal();
     const registerModal1 = registerModal,
@@ -131,6 +140,8 @@ export default defineComponent({
     const [registerTable, { getSelectRows, setProps, reload, setSelectedRowKeys }] = useTable({
       title: '地图资源审核列表',
       api: (param) => {
+        console.log(param);
+        statusShow.value = param.checkStatus;
         const data = Object.assign(param, { serviceType: current.value });
         return updateExamine(data);
       }, //求接口
@@ -254,11 +265,11 @@ export default defineComponent({
      * 审核
      */
     function handleEdit(record: Recordable) {
-      ischect.value = true,
-        openModal1(true, {
-          record,
-          isUpdate: true,
-        });
+      ischect.value = true;
+      openModal1(true, {
+        record,
+        isUpdate: true,
+      });
     }
     /**
      * 浏览
@@ -349,6 +360,7 @@ export default defineComponent({
     }
 
     return {
+      statusShow,
       current,
       moment,
       ischect,

src/views/resource/examine/map.data.ts

@@ -53,8 +53,11 @@ const checkStatus = [
   // { label: '审核通过', value: 1 },
   // { label: '审核不通过', value: 2 },
 
-  { label: '待办', value: 1 },
-  { label: '已办', value: 2 },
+  // { label: '待办', value: 1 },
+  // { label: '已办', value: 2 },
+
+  { label: '待审核', value: 1 },
+  { label: '已审核', value: 2 },
 ]
 export enum KeysTypeEnum {
   DISABLED = 'disabled',
@@ -211,7 +214,7 @@ export const columns: BasicColumn[] = [
     title: '审核状态',
     dataIndex: 'BLZT',
     width: 80,
-    // slots: { customRender: 'status' },
+    slots: { customRender: 'BLZT' },
   },
   // {
   //   title: '审核时间',
@@ -259,7 +262,7 @@ export const accountFormSchema = [
     component: 'RadioButtonGroup',
     required: true,
     colProps: { span: 24 },
-    defaultValue: '0',
+    defaultValue: '1',
     componentProps: {
       options: [
         { label: "通过", value: '1' },
@@ -271,7 +274,7 @@ export const accountFormSchema = [
   {
     field: 'opinion',
     label: '审核意见',
-    required: true,
+    // required: true,
     component: 'Input',
     colProps: { span: 24 },
     componentProps: {