1110xx

src/views/dataAdmin/dataAdmin/resourceCataloging/index.vue

@@ -259,6 +259,7 @@ export default defineComponent({
       checked.value = ['MR', 'DR', 'ER']
       typeChangeValue.value = 'MR,ER,DR'
       coordinateChangeValue.value = ''
+      getUsedResource()
     }
 
     // 坐标系下拉框处理函数

src/views/interface/item/child/InterfaceCarModal.vue

@@ -64,6 +64,8 @@
             <a-button type="primary" @click="handleSubmit">确定</a-button>
         </template>
     </a-modal>
+    <!-- 申请弹出框 -->
+    <ApplyModal @register="registerModal" @success="applyHandleSuccess" />
 </template>
 <script>
 import { defineComponent, reactive, ref, onMounted, watch, toRefs, computed, createVNode } from 'vue';
@@ -79,6 +81,8 @@ import { getResInCar, clearResInCar, deleteResInCar } from '/@/api/resource/plat
 import { queryFlowInfoPage, submitExamine } from '/@/api/resource/examine';
 //获取应用数据
 import { list } from '/@/api/authorize/authorize';
+import ApplyModal from './applyModal/ApplyModal.vue';
+import { useModal } from '/@/components/Modal';
 
 const props = {
     // resId: {
@@ -88,8 +92,9 @@ const props = {
 }
 export default defineComponent({
     name: 'modal',
-    components: { BasicTable, TableAction, ExclamationCircleOutlined },
+    components: { BasicTable, TableAction, ExclamationCircleOutlined, ApplyModal },
     props,
+    emits:['closeModal'],
     setup(props, { emit }) {
         const data = reactive({
             width: '1440px',
@@ -119,6 +124,7 @@ export default defineComponent({
         const selectAppKey = ref('')
         const showSelectAppModal = ref(false)
         const appOptions = []
+        const [registerModal, { openModal }] = useModal();
         // 请求所有申请库中的资源
         const getAllData = () => {
             return new Promise((resolve) => {
@@ -286,8 +292,13 @@ export default defineComponent({
         }
         //添加申请
         const handleAdd = () => {
-            showSelectAppModal.value = true;
-            selectAppKey.value = ''
+            // showSelectAppModal.value = true;
+            // selectAppKey.value = ''
+            var list = getSelectRowKeys();
+            openModal(true, {
+                isUpdate: false,
+                sqzys: list
+            });
         }
         const handleSubmit = () => {
             queryFlowInfoPage({
@@ -331,6 +342,12 @@ export default defineComponent({
         const onClose = (e) => {
             emit('closeModal')
         }
+        /**
+         * 申请成功
+         */
+        function applyHandleSuccess() {
+            reload();
+        }
         //初始化请求所需数据
         onMounted(() => {
             list().then(res => {
@@ -355,6 +372,7 @@ export default defineComponent({
             wrapperCol: { span: 16 },
             hasSelected,
             ...toRefs(data),
+            registerModal,
             registerTable,
             handleReset,
             handleSearch,
@@ -362,7 +380,8 @@ export default defineComponent({
             handleAdd,
             onClose,
             closeSelectAppModal,
-            handleSubmit
+            handleSubmit,
+            applyHandleSuccess
         };
     },
 });

src/views/interface/item/child/Search.vue

@@ -2,12 +2,12 @@
     <div class="wrapper">
         <span class="sqrk"  @click="showModal">申请库({{ resNum }})</span>
         <span>
-            <a-select allowClear="true" ref="select" v-model:value="value" style="width: 200px" :options="options"
+            <a-select allowClear ref="select" v-model:value="value" style="width: 200px" :options="options"
                 @change="handleChange">
             </a-select>
         </span>
         <span>
-            <a-input-search allowClear="true" v-model:value="key" placeholder="请输入搜索内容" style="width: 200px" @search="onSearch" />
+            <a-input-search allowClear v-model:value="key" placeholder="请输入搜索内容" style="width: 200px" @search="onSearch" />
         </span>
         <div class="total-num">
             <!-- <a-checkbox v-model:checked="checked1">全部</a-checkbox>

src/views/interface/item/child/applyModal/ApplyModal.vue

@@ -3,7 +3,7 @@
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
-<script lang="ts">
+<script>
 import { defineComponent, ref } from 'vue';
 import { BasicForm, useForm } from '/@/components/Form/index';
 import { formSchema } from './config.data';
@@ -36,20 +36,12 @@ export default defineComponent({
         sqzys: data.sqzys.length,
         sqr: session.getItem("userInfo").EMPLOYEE.NAME,
         sqdw: session.getItem("userInfo").ROLES[0].COMPANY_ID,
-        // sqdw: '44a67bb2-9f4b-4eb2-b297-c53775dc7fd2',
       }
       setFieldsValue({ ...defValue });
       ids = data.sqzys;
       console.log("ids:", ids);
     });
-
-    function judgeType(id) {
-      var id = JSON.stringify(id);
-      return id.indexOf('MR') > -1 ? '地图资源授权' : id.indexOf('ER') > -1 ? '场景资源授权' : '文件资源授权';
-    }
-    function getType(id) {
-      return JSON.stringify(id).indexOf('MR') > -1 ? 'MAP' : id.indexOf('ER') > -1 ? 'SCENE' : 'DR';
-    }
+    
     //得到页面标题
     const getTitle = "提交申请";
     //提交按钮
@@ -60,12 +52,11 @@ export default defineComponent({
         rows: 1000000
       }).then(flowRes => {
         if (flowRes && flowRes.length) {
-          var type = judgeType(ids)
-          const flow = flowRes.find(i => i.FLOWNAME === type);
+          const flow = flowRes.find(i => i.FLOWNAME === '接口授权');
           if (flow && ids && ids.length) {
             let params = {
               bussInfo: {
-                bussname: type,//业务名称
+                bussname: '接口授权',//业务名称
                 flowid: flow?.id,//流程id
                 serverids: ids.toString(),//资源id
                 ...value
@@ -75,7 +66,6 @@ export default defineComponent({
             submitExamine(params).then(res => {
               if (res.resp_code === 0 && res.resp_msg === '提交成功') {
                 message.success('申请成功')
-                eventBus.emit('platListCenter', { type: getType(ids) })
                 closeModal();
                 emit('success');
               } else {

src/views/systemAdmin/system/account/AccountModal1.vue

@@ -194,17 +194,17 @@ export default defineComponent({
             ssjg: [{
                 required: true,
                 message: '请选择机构',
-                trigger: 'blur'
+                trigger: 'change'
             }],
             sszw: [{
                 required: true,
                 message: '请选择职位',
-                trigger: 'blur'
+                trigger: 'change'
             }],
             ssgw: [{
                 required: true,
                 message: '请选择岗位',
-                trigger: 'blur'
+                trigger: 'change'
             }],
             userjsArr: [
                 { required: true, validator: checkRole, trigger: "blur" },