Merge branch 'refs/heads/master' into master_ljb

components.d.ts

@@ -27,6 +27,7 @@ declare module 'vue' {
         GlobalPopup: typeof import('./src/mocp/components/global-popup/global-popup.vue')['default']
         GlobalRadio: typeof import('./src/mocp/components/global-radio/global-radio.vue')['default']
         GlobalTabs: typeof import('./src/mocp/components/global-tabs/global-tabs.vue')['default']
+        GlobalTag: typeof import('./src/mocp/components/global-tag/global-tag.vue')['default']
         GlobalUpload: typeof import('./src/mocp/components/global-upload/global-upload.vue')['default']
         GlobalUploadImage: typeof import('./src/mocp/components/global-upload-image/global-upload-image.vue')['default']
         // 自定义组件

src/mocp/api/work-assignment.js

 import { http } from 'mocp/utils/http'
 
-export const getDecisionApi = (data, config) => {
+export const getWorkTaskListApi = (data, config) => {
     return http({
         method: 'POST',
-        url: '/workbench/getDecision',
+        url: '/workbench/getWorkTaskList',
         data,
         config
     })
 }
-export const updateDecisionApi = (data, config) => {
+export const WorkTaskIsSuccessApi = (data, config) => {
     return http({
         method: 'POST',
-        url: '/workbench/updateDecision',
-        data,
-        config
-    })
-}
-export const updateMcoDirectorInfoApi = (data, config) => {
-    return http({
-        method: 'POST',
-        url: '/workbench/updateMcoDirectorInfo',
-        data,
-        config
-    })
-}
-export const updateApproverInfoApi = (data, config) => {
-    return http({
-        method: 'POST',
-        url: '/workbench/updateApproverInfo',
+        url: '/workbench/WorkTaskIsSuccess',
         data,
         config
     })

src/mocp/components/global-button/global-button.scss

-@mixin global-button-light {
+//primary
+@mixin global-button-primary-plain {
     color: $mocp-primary-6;
     background-color: $mocp-primary-1;
 }
-@mixin global-button-light-active {
+@mixin global-button-primary-plain-active {
     color: darken($mocp-primary-6, 10%);
     background-color: darken($mocp-primary-1, 5%);
     border-color: darken($mocp-primary-1, 5%);
@@ -16,6 +17,16 @@
     background-color: darken($mocp-primary-7, 5%);
     border-color: darken($mocp-primary-7, 5%);
 }
+//success
+@mixin global-button-success-plain {
+    color: $mocp-success-6;
+    background-color: $mocp-success-1;
+}
+@mixin global-button-success-plain-active {
+    color: darken($mocp-success-6, 10%);
+    background-color: darken($mocp-success-1, 5%);
+    border-color: darken($mocp-success-1, 5%);
+}
 @mixin global-button-success {
     color: #fff;
     background-color: $mocp-success-6;
@@ -25,6 +36,16 @@
     background-color: darken($mocp-success-7, 5%);
     border-color: darken($mocp-success-7, 5%);
 }
+//warning
+@mixin global-button-warning-plain {
+    color: $mocp-warning-6;
+    background-color: $mocp-warning-1;
+}
+@mixin global-button-warning-plain-active {
+    color: darken($mocp-warning-6, 10%);
+    background-color: darken($mocp-warning-1, 5%);
+    border-color: darken($mocp-warning-1, 5%);
+}
 @mixin global-button-warning {
     color: #fff;
     background-color: $mocp-warning-6;
@@ -34,6 +55,16 @@
     background-color: darken($mocp-warning-7, 5%);
     border-color: darken($mocp-warning-7, 5%);
 }
+//danger
+@mixin global-button-danger-plain {
+    color: $mocp-danger-6;
+    background-color: $mocp-danger-1;
+}
+@mixin global-button-danger-plain-active {
+    color: darken($mocp-danger-6, 10%);
+    background-color: darken($mocp-danger-1, 5%);
+    border-color: darken($mocp-danger-1, 5%);
+}
 @mixin global-button-danger {
     color: #fff;
     background-color: $mocp-danger-6;
@@ -47,10 +78,10 @@
     padding: 0 20rpx;
     margin: 0;
     font-size: 28rpx;
-    &.light {
-        @include global-button-light;
+    &.primary-plain {
+        @include global-button-primary-plain;
         &:active {
-            @include global-button-light-active;
+            @include global-button-primary-plain-active;
         }
         &::after {
             border: none;
@@ -62,18 +93,45 @@
             @include global-button-primary-active;
         }
     }
+    &.success-plain {
+        @include global-button-success-plain;
+        &:active {
+            @include global-button-success-plain-active;
+        }
+        &::after {
+            border: none;
+        }
+    }
     &.success {
         @include global-button-success;
         &:active {
             @include global-button-success-active;
         }
     }
+    &.warning-plain {
+        @include global-button-warning-plain;
+        &:active {
+            @include global-button-warning-plain-active;
+        }
+        &::after {
+            border: none;
+        }
+    }
     &.warning {
         @include global-button-warning;
         &:active {
             @include global-button-warning-active;
         }
     }
+    &.danger-plain {
+        @include global-button-danger-plain;
+        &:active {
+            @include global-button-danger-plain-active;
+        }
+        &::after {
+            border: none;
+        }
+    }
     &.danger {
         @include global-button-danger;
         &:active {

src/mocp/components/global-button/global-button.vue

 <template>
     <!-- 全局button -->
     <button :class="getClass" :style="style" :loading="loading" :disabled="disabled">
+        <global-icon class="icon" :icon="icon" v-if="icon"></global-icon>
         <slot></slot>
     </button>
 </template>
@@ -22,7 +23,12 @@ const ps = defineProps({
             return {}
         }
     },
-    //default,light,primary,success,warning,danger,text
+    //图标
+    icon: {
+        type: String,
+        default: ''
+    },
+    //default,primary,success,warning,danger,text
     type: {
         type: String,
         default: 'default'
@@ -32,6 +38,11 @@ const ps = defineProps({
         type: String,
         default: 'default'
     },
+    //是否镂空
+    plain: {
+        type: Boolean,
+        default: false
+    },
     loading: {
         type: Boolean,
         default: false
@@ -46,9 +57,12 @@ const getClass = computed(() => {
     if (ps.class) {
         _class.push(ps.class)
     }
-    if (ps.type) {
+    if (ps.plain) {
+        _class.push(ps.type + '-plain')
+    } else {
         _class.push(ps.type)
     }
+
     return _class
 })
 const getSize = computed(() => {
@@ -75,5 +89,8 @@ const getRadius = computed(() => {
     border-radius: v-bind(getRadius);
     height: v-bind(getSize);
     line-height: v-bind(getSize);
+    .icon {
+        margin-right: 8rpx;
+    }
 }
 </style>

src/mocp/components/global-icon/global-icon.vue

@@ -11,7 +11,7 @@ const ps = defineProps({
     },
     color: {
         type: String,
-        default: '#4E5969'
+        default: 'currentColor'
     },
     size: {
         type: [Number, String],

src/mocp/components/global-picker/global-picker.vue

@@ -167,7 +167,11 @@ const defaultIndex = ref(0)
 //获取下拉框的内容Columns
 const getColumns = computed(() => {
     if (ps.dictkey) {
-        return cloneDeep(dictData[ps.dictkey])
+        if (dictData[ps.dictkey]) {
+            return cloneDeep(dictData[ps.dictkey])
+        } else {
+            throw new Error('请输入存在的dictkey值')
+        }
     } else {
         if (ps.options && Object.prototype.toString.call(ps.options[0]) == '[object Object]') {
             return ps.options
@@ -185,8 +189,8 @@ const getColumns = computed(() => {
 watch(
     [() => ps.modelValue, () => ps.options],
     () => {
-        const option = getColumns.value.find((option) => String(option[ps.valueField]) === String(ps.modelValue))
-        const index = getColumns.value.findIndex((option) => String(option[ps.valueField]) === String(ps.modelValue))
+        const option = getColumns.value?.find((option) => String(option[ps.valueField]) === String(ps.modelValue))
+        const index = getColumns.value?.findIndex((option) => String(option[ps.valueField]) === String(ps.modelValue))
         if (option) {
             labelValue.value = option[ps.labelField]
             nextTick(() => {

src/mocp/components/global-tag/global-tag.vue

+<template>
+    <text class="global-tag" :class="getClass">
+        <slot></slot>
+    </text>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+const ps = defineProps({
+    //primary / success / warning / danger
+    type: {
+        type: String,
+        default: 'primary'
+    },
+    class: {
+        type: String,
+        default: ''
+    },
+    radious: {
+        type: [String, Number],
+        default: 6
+    }
+})
+//获取class
+const getClass = computed(() => {
+    const _class = []
+    if (ps.class) {
+        _class.push(ps.class)
+    }
+    if (ps.type == 'primary') {
+        _class.push('mocp-bg-primary-2')
+        _class.push('mocp-color-primary-6')
+    }
+    if (ps.type == 'success') {
+        _class.push('mocp-bg-success-2')
+        _class.push('mocp-color-success-6')
+    }
+    if (ps.type == 'warning') {
+        _class.push('mocp-bg-warning-2')
+        _class.push('mocp-color-warning-6')
+    }
+    if (ps.type == 'danger') {
+        _class.push('mocp-bg-danger-2')
+        _class.push('mocp-color-danger-6')
+    }
+    return _class
+})
+//获取圆角
+const getRadious = computed(() => {
+    if (typeof ps.radious == 'string') {
+        return ps.radious
+    } else {
+        return ps.radious + 'rpx'
+    }
+})
+</script>
+<style lang="scss" scoped>
+.global-tag {
+    font-size: 24rpx;
+    padding: 4rpx 8rpx;
+    border-radius: v-bind(getRadious);
+}
+</style>

src/mocp/components/global-upload/global-upload.vue

@@ -72,7 +72,7 @@ const ps = defineProps({
         }
     },
     fileList: {
-        type: Array,
+        type: [Array, String],
         default: () => {
             return []
         }
@@ -102,7 +102,13 @@ const fileList = ref([])
 watch(
     () => ps.fileList,
     (value) => {
-        fileList.value = cloneDeep(value)
+        if (value) {
+            if (Array.isArray(value)) {
+                fileList.value = cloneDeep(value)
+            } else {
+                fileList.value = JSON.parse(value)
+            }
+        }
     },
     { immediate: true }
 )

src/mocp/hooks/use-dict/dict-data/index.js

@@ -2,3 +2,4 @@ export * from './appraisal-record'
 export * from './assign-work'
 export * from './move-decision'
 export * from './technology-evaluation'
+export * from './work-assignment'

src/mocp/hooks/use-dict/dict-data/work-assignment.js

+// 建议以文件名首字母作为前缀wa_
+export const wa_state = [
+    { label: 'OPEN', value: '1' },
+    { label: 'CLOSE', value: '2' }
+]
+export const wa_isSuccess = [
+    { label: '已拒绝', value: '1' },
+    { label: '待接收', value: '2' },
+    { label: '已接收', value: '3' }
+]
+export const wa_isSuccessType = [
+    { label: 'danger', value: '1' },
+    { label: 'primary', value: '2' },
+    { label: 'success', value: '3' }
+]

src/mocp/store/work-assignment.js

@@ -4,12 +4,13 @@ const useWorkAssignmentStore = defineStore('workAssignment', {
     state: () => {
         return {
             searchData: {
-                state: 1,
-                presenter: '',
-                seat: '',
-                workType: null,
-                startDateTime: null,
-                endDateTime: null
+                state: '1',
+                machineNumber: '',
+                model: '',
+                aviation: '',
+                terminal: '',
+                feedbackTime: '',
+                sponsor: ''
             },
             details: undefined
         }
@@ -18,12 +19,13 @@ const useWorkAssignmentStore = defineStore('workAssignment', {
     actions: {
         resetForm() {
             this.searchData = {
-                state: 1,
-                presenter: '',
-                seat: '',
-                workType: null,
-                startDateTime: null,
-                endDateTime: null
+                state: '1',
+                machineNumber: '',
+                model: '',
+                aviation: '',
+                terminal: '',
+                feedbackTime: '',
+                sponsor: ''
             }
         },
         setState(...args) {
@@ -31,6 +33,16 @@ const useWorkAssignmentStore = defineStore('workAssignment', {
         }
     },
     // 配置持久化
-    persist: false
+    persist: {
+        // 调整为兼容多端的API
+        storage: {
+            setItem(key, value) {
+                uni.setStorageSync(key, value)
+            },
+            getItem(key) {
+                return uni.getStorageSync(key)
+            }
+        }
+    }
 })
 export default useWorkAssignmentStore

src/pages.json

@@ -254,6 +254,12 @@
             "style": {
                 "navigationBarTitleText": "工作任务指令"
             }
+        },
+        {
+            "path": "pages/modules/mocp/panel/work-assignment/details",
+            "style": {
+                "navigationBarTitleText": "工作任务指令详情"
+            }
         }
     ],
     "globalStyle": {

src/pages/modules/mocp/panel/appraisal-record/search.vue

@@ -50,7 +50,7 @@
             <view class="footer-btn">
                 <up-row gutter="10">
                     <up-col span="6">
-                        <global-button type="light" size="large" :radius="5" @tap="handleReset">重置</global-button>
+                        <global-button type="primary" plain size="large" :radius="5" @tap="handleReset">重置</global-button>
                     </up-col>
                     <up-col span="6"><global-button type="primary" size="large" :radius="5" @tap="handleConfirm">确定</global-button></up-col>
                 </up-row>

src/pages/modules/mocp/panel/assign-work/details.vue

@@ -202,12 +202,21 @@ const assignWorkStore = useAssignWorkStore()
 const { details, arrangeWorkExtendList, arrangeWorkExtend } = storeToRefs(assignWorkStore)
 onLoad(async () => {
     assignWorkStore.setState('id', query.id)
-    uni.showLoading({
-        title: '加载中...',
-        mask: true
-    })
-    await Promise.all([assignWorkStore.getArrangeWorkDetail(), assignWorkStore.getEnetOrgTree()])
-    uni.hideLoading()
+    if (arrangeWorkExtendList.value.length > 1) {
+        uni.showLoading({
+            title: '加载中...',
+            mask: true
+        })
+        await Promise.all([assignWorkStore.getArrangeWorkDetail(), assignWorkStore.getEnetOrgTree()])
+        uni.hideLoading()
+    } else {
+        uni.showLoading({
+            title: '加载中...',
+            mask: true
+        })
+        await assignWorkStore.getArrangeWorkDetail()
+        uni.hideLoading()
+    }
 })
 //责任公司弹框
 const companyPopupRef = ref()

src/pages/modules/mocp/panel/assign-work/search.vue

@@ -47,7 +47,7 @@
             <view class="footer-btn">
                 <up-row gutter="10">
                     <up-col span="6">
-                        <global-button type="light" size="large" :radius="5" @tap="handleReset">重置</global-button>
+                        <global-button type="primary" plain size="large" :radius="5" @tap="handleReset">重置</global-button>
                     </up-col>
                     <up-col span="6"><global-button type="primary" size="large" :radius="5" @tap="handleConfirm">确定</global-button></up-col>
                 </up-row>

src/pages/modules/mocp/panel/move-decision/search.vue

@@ -62,7 +62,7 @@
             <view class="footer-btn">
                 <up-row gutter="10">
                     <up-col span="6">
-                        <global-button type="light" size="large" :radius="5" @tap="handleReset">重置</global-button>
+                        <global-button type="primary" plain size="large" :radius="5" @tap="handleReset">重置</global-button>
                     </up-col>
                     <up-col span="6"><global-button type="primary" size="large" :radius="5" @tap="handleConfirm">确定</global-button></up-col>
                 </up-row>

src/pages/modules/mocp/panel/technology-evaluation/search.vue

@@ -37,7 +37,7 @@
             <view class="footer-btn">
                 <up-row gutter="10">
                     <up-col span="6">
-                        <global-button type="light" size="large" :radius="5" @tap="handleReset">重置</global-button>
+                        <global-button type="primary" plain size="large" :radius="5" @tap="handleReset">重置</global-button>
                     </up-col>
                     <up-col span="6"><global-button type="primary" size="large" :radius="5" @tap="handleConfirm">确定</global-button></up-col>
                 </up-row>

src/pages/modules/mocp/panel/work-assignment/constants/details.scss

+.details {
+    padding: 16rpx 24rpx;
+    border-radius: 12rpx;
+    background: #ffffff;
+    color: $mocp-text-4;
+    &-header {
+        &-top {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 16rpx;
+        }
+        &-bottom {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding-bottom: 16rpx;
+            .left {
+                display: flex;
+                align-items: center;
+                .left-icon {
+                    margin-right: 16rpx;
+                }
+            }
+        }
+    }
+    &-body {
+        &-content {
+            padding: 16rpx 0;
+            font-size: 30rpx;
+            border-top: 2rpx solid #f4f4f4;
+            border-bottom: 2rpx solid #f4f4f4;
+        }
+        &-file {
+            padding-top: 16rpx;
+            image {
+                width: 100%;
+            }
+        }
+    }
+    &-footer {
+        padding-top: 16rpx;
+        border-top: 2rpx solid #f4f4f4;
+        .row {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            margin-bottom: 16rpx;
+            &:last-child {
+                margin-bottom: 0;
+            }
+        }
+    }
+}

src/pages/modules/mocp/panel/work-assignment/details.vue

+<template>
+    <global-page :padding="24" title="工作任务指令详情">
+        <template v-if="details">
+            <view class="details">
+                <view class="details-header">
+                    <view class="details-header-top">
+                        <view class="left">
+                            <custom-state :value="useGetDictByValue('wa_state', details.state)" :size="32"></custom-state>
+                        </view>
+                        <view class="right">
+                            <global-tag :type="useGetDictByValue('wa_isSuccessType', details.isSuccess)">
+                                {{ useGetDictByValue('wa_isSuccess', details.isSuccess) }}
+                            </global-tag>
+                        </view>
+                    </view>
+                    <view class="details-header-bottom">
+                        <view class="left">
+                            <global-icon class="left-icon" icon="Vector" size="24" color="#DD4012"></global-icon>
+                            <view class="txt">{{ details.aviation }} {{ details.machineNumber }} {{ details.model }}</view>
+                        </view>
+                        <view class="right">
+                            <view class="txt">{{ details.terminal }}</view>
+                        </view>
+                    </view>
+                </view>
+                <view class="details-body">
+                    <view class="details-body-content">
+                        {{ details.taskDescription || '无' }}
+                    </view>
+                    <view class="details-body-file">
+                        <global-upload :fileList="details.taskFile" :showUpload="false"></global-upload>
+                    </view>
+                </view>
+                <view class="details-footer">
+                    <view class="row">
+                        <global-field label="反馈时限:" :value="timeStampFormat(details.feedbackTime, { format: 'YYYY/MM/DD' })"></global-field>
+                    </view>
+                    <view class="row">
+                        <global-field label="发起人:" :value="details.sponsor || '-'"></global-field>
+                        <global-field label="发起时间:" :value="timeStampFormat(details.creationTime, { format: 'YYYY/MM/DD' })"></global-field>
+                    </view>
+                    <view class="row">
+                        <global-field label="接收人:" :value="details.recipient || '-'"></global-field>
+                        <global-field label="接收时间:" :value="timeStampFormat(details.recipientTime, { format: 'YYYY/MM/DD' })"></global-field>
+                    </view>
+                </view>
+            </view>
+        </template>
+        <template #bottom>
+            <view class="footer-btn">
+                <template
+                    v-if="
+                        details.sponsorId == userStore.userInfo?.realUserInfo.id ||
+                        details.recipientId == userStore.userInfo?.realUserInfo.id ||
+                        details.isSuccess != '2'
+                    "
+                >
+                    <global-button type="success" plain size="large" :radius="5" icon="check-circle-filled" v-if="details.isSuccess == '3'">
+                        已接收
+                    </global-button>
+                    <global-button type="danger" plain size="large" :radius="5" icon="close-circle-filled" v-if="details.isSuccess == '1'">
+                        已拒绝
+                    </global-button>
+                </template>
+                <template v-else>
+                    <up-row gutter="10">
+                        <up-col span="6">
+                            <global-button type="primary" plain size="large" :radius="5" @tap="confirm('1')">拒绝</global-button>
+                        </up-col>
+                        <up-col span="6">
+                            <global-button type="primary" size="large" :radius="5" @tap="confirm('3')">接收</global-button>
+                        </up-col>
+                    </up-row>
+                </template>
+            </view>
+        </template>
+        <up-modal
+            :width="250"
+            :content="isSuccessValue == '1' ? '确认拒绝吗?' : '确认接收吗?'"
+            :show="show"
+            showCancelButton
+            closeOnClickOverlay
+            @confirm="handleWorkTaskIsSuccess"
+            @cancel="show = false"
+            @close="show = false"
+        ></up-modal>
+    </global-page>
+</template>
+
+<script setup>
+import useWorkAssignmentStore from 'mocp/store/work-assignment'
+import { storeToRefs } from 'pinia'
+import useUserStore from 'mocp/store/user'
+import { timeStampFormat } from 'mocp/utils/tool'
+import { useGetDictByValue } from 'mocp/hooks/use-dict/useDict'
+import { ref } from 'vue'
+import { WorkTaskIsSuccessApi } from 'mocp/api/work-assignment'
+
+const workAssignmentStore = useWorkAssignmentStore()
+const { details } = storeToRefs(workAssignmentStore)
+const userStore = useUserStore()
+//接收或者拒绝
+const show = ref(false)
+const isSuccessValue = ref('')
+const confirm = (isSuccess) => {
+    show.value = true
+    isSuccessValue.value = isSuccess
+}
+const handleWorkTaskIsSuccess = async () => {
+    const params = {
+        id: details.value.id,
+        isSuccess: isSuccessValue.value
+    }
+    const res = await WorkTaskIsSuccessApi(params, { loading: true })
+    if ((res.code = 200)) {
+        show.value = false
+        uni.$mocpMessage.success(res.message)
+        //更新详情
+        workAssignmentStore.setState('details', res.data)
+    } else {
+        uni.$mocpMessage.error(res.message)
+    }
+}
+</script>
+<style lang="scss" scoped>
+@import './constants/details.scss';
+.footer-btn {
+    padding: 24rpx 32rpx;
+    background-color: #fff;
+}
+</style>

src/pages/modules/mocp/panel/work-assignment/list.vue

@@ -11,28 +11,30 @@
         navRightType="icon"
         navRightIcon="saixuan-01"
         @handleRightClick="handleRightClick"
-        :api="getDecisionApi"
+        :api="getWorkTaskListApi"
         :padding="24"
     >
         <template #="{ dataList }">
             <view class="item" v-for="item in dataList" :key="item.id" @tap="goDetails(item)">
                 <view class="item-title">
                     <view class="left">
-                        <custom-state :value="useGetDictByValue('md_state', item.state)"></custom-state>
+                        <custom-state :value="useGetDictByValue('wa_state', item.state)"></custom-state>
+                        <text class="txt u-line-1" v-if="item.machineNumber">{{ item.machineNumber }}</text>
                     </view>
                     <view class="right">
-                        <text class="txt u-line-1" v-if="item.machineNumber">{{ item.machineNumber }}</text>
-                        <text class="txt u-line-1" v-if="item.aviation">{{ item.aviation }}</text>
+                        <global-tag :type="useGetDictByValue('wa_isSuccessType', item.isSuccess)">
+                            {{ useGetDictByValue('wa_isSuccess', item.isSuccess) }}
+                        </global-tag>
                     </view>
                 </view>
                 <view class="item-content u-line-3">
-                    {{ item.faultDescription || '无' }}
+                    {{ item.taskDescription || '无' }}
                 </view>
                 <view class="item-footer">
                     <view class="label">
                         <global-icon icon="calendar"></global-icon>
                         <text class="txt">
-                            {{ timeStampFormat(item.filledTime, { format: 'YYYY/MM/DD HH:mm' }) }}
+                            {{ timeStampFormat(item.feedbackTime, { format: 'YYYY/MM/DD' }) }}
                         </text>
                     </view>
                 </view>
@@ -44,18 +46,18 @@
 <script setup>
 import { ref } from 'vue'
 import { timeStampFormat } from 'mocp/utils/tool'
-import { getDecisionApi } from 'mocp/api/move-decision'
 import { useGetDictByValue } from 'mocp/hooks/use-dict/useDict'
-import useMoveDecisionStore from 'mocp/store/move-decision'
+import useWorkAssignmentStore from 'mocp/store/work-assignment'
 import { storeToRefs } from 'pinia'
 import { onUnload } from '@dcloudio/uni-app'
+import { getWorkTaskListApi } from 'mocp/api/work-assignment'
 
 //跳转
-const moveDecisionStore = useMoveDecisionStore()
-const { searchData } = storeToRefs(moveDecisionStore)
+const workAssignmentStore = useWorkAssignmentStore()
+const { searchData } = storeToRefs(workAssignmentStore)
 const goDetails = (data) => {
     uni.$mocpJump.navigateTo('/panel/work-assignment/details', { id: data.id }).then(() => {
-        moveDecisionStore.setState('details', data)
+        workAssignmentStore.setState('details', data)
     })
 }
 //筛选

src/pages/modules/mocp/panel/work-assignment/search.vue

@@ -3,58 +3,37 @@
         <view class="search-form">
             <up-form labelPosition="left" labelWidth="auto">
                 <up-form-item label="状态" prop="state" :borderBottom="true">
-                    <global-picker v-model="formData.state" pickAlign="right" clearable dictkey="md_state"></global-picker>
+                    <global-picker v-model="formData.state" pickAlign="right" clearable dictkey="wa_state"></global-picker>
                 </up-form-item>
-                <up-form-item label="航站" prop="terminal" :borderBottom="true">
-                    <global-picker
-                        pickAlign="right"
-                        v-model="formData.terminal"
-                        clearable
-                        :options="baseStore.getTerminalSelect"
-                        filter
-                    ></global-picker>
+                <up-form-item label="机号" prop="machineNumber" :borderBottom="true">
+                    <global-picker pickAlign="right" v-model="formData.machineNumber" :options="deviceNumList" clearable filter></global-picker>
                 </up-form-item>
-                <up-form-item label="是否有效" prop="valid" :borderBottom="true">
-                    <global-picker
-                        v-model="formData.valid"
-                        pickAlign="right"
-                        :options="[
-                            { label: '有效', value: '1' },
-                            { label: '无效', value: '0' }
-                        ]"
-                        clearable
-                    ></global-picker>
+                <up-form-item label="机型" prop="model" :borderBottom="true">
+                    <global-picker v-model="formData.model" pickAlign="right" :options="baseStore.getTypeSelect" clearable filter></global-picker>
                 </up-form-item>
-                <up-form-item label="决策结果" prop="decisionState" :borderBottom="true">
+                <up-form-item label="航司" prop="aviation" :borderBottom="true">
                     <global-picker
-                        v-model="formData.decisionState"
+                        v-model="formData.aviation"
                         pickAlign="right"
-                        :options="[
-                            { label: '同意', value: '1' },
-                            { label: '不同意', value: '0' }
-                        ]"
+                        :options="baseStore.getAirlineSelect"
                         clearable
+                        filter
                     ></global-picker>
                 </up-form-item>
-                <up-form-item label="航司" prop="aviation" :borderBottom="true">
+                <up-form-item label="航站" prop="terminal" :borderBottom="true">
                     <global-picker
-                        v-model="formData.aviation"
                         pickAlign="right"
-                        :options="baseStore.getAirlineSelect"
+                        v-model="formData.terminal"
                         clearable
+                        :options="baseStore.getTerminalSelect"
                         filter
                     ></global-picker>
                 </up-form-item>
-                <up-form-item label="机号" prop="machineNumber" :borderBottom="true">
-                    <global-picker pickAlign="right" v-model="formData.machineNumber" :options="deviceNumList" clearable filter></global-picker>
+                <up-form-item label="发起人" prop="sponsor" :borderBottom="true">
+                    <up-input v-model="formData.sponsor" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
                 </up-form-item>
-                <up-form-item label="日期" :borderBottom="true">
-                    <global-calendar
-                        pickAlign="right"
-                        v-model:startTime="formData.startDateTime"
-                        v-model:endTime="formData.endDateTime"
-                        clearable
-                    ></global-calendar>
+                <up-form-item label="反馈时限" prop="feedbackTime" :borderBottom="true">
+                    <global-date v-model="formData.feedbackTime" pickAlign="right" clearable></global-date>
                 </up-form-item>
             </up-form>
         </view>
@@ -62,7 +41,7 @@
             <view class="footer-btn">
                 <up-row gutter="10">
                     <up-col span="6">
-                        <global-button type="light" size="large" :radius="5" @tap="handleReset">重置</global-button>
+                        <global-button type="primary" plain size="large" :radius="5" @tap="handleReset">重置</global-button>
                     </up-col>
                     <up-col span="6"><global-button type="primary" size="large" :radius="5" @tap="handleConfirm">确定</global-button></up-col>
                 </up-row>
@@ -73,27 +52,27 @@
 
 <script setup>
 import useBaseStore from 'mocp/store/base'
-import useMoveDecisionStore from 'mocp/store/move-decision'
 import { storeToRefs } from 'pinia'
 import { cloneDeep } from 'lodash'
 import { ref } from 'vue'
+import useWorkAssignmentStore from 'mocp/store/work-assignment'
 
 //获取下拉框选项
 const baseStore = useBaseStore()
 const {
     selectList: { deviceNumList }
 } = useBaseStore()
-const moveDecisionStore = useMoveDecisionStore()
+const workAssignmentStore = useWorkAssignmentStore()
 //获取查询表单数据
-const { searchData } = storeToRefs(moveDecisionStore)
+const { searchData } = storeToRefs(workAssignmentStore)
 const formData = ref(cloneDeep(searchData.value))
 const handleReset = () => {
-    moveDecisionStore.resetForm()
+    workAssignmentStore.resetForm()
     uni.$mocpJump.redirectTo('/panel/work-assignment/list')
     uni.$emit('workAssignmentReload')
 }
 const handleConfirm = () => {
-    moveDecisionStore.setState('searchData', formData.value)
+    workAssignmentStore.setState('searchData', formData.value)
     uni.$mocpJump.redirectTo('/panel/work-assignment/list')
     uni.$emit('workAssignmentReload')
 }

src/static/mocp/font/demo_index.html

@@ -55,6 +55,18 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe6e4;</span>
+                <div class="name">close-circle-filled</div>
+                <div class="code-name">&amp;#xe6e4;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6e5;</span>
+                <div class="name">check-circle-filled</div>
+                <div class="code-name">&amp;#xe6e5;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe6e3;</span>
                 <div class="name">fly</div>
                 <div class="code-name">&amp;#xe6e3;</div>
@@ -168,9 +180,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1720593389064') format('woff2'),
-       url('iconfont.woff?t=1720593389064') format('woff'),
-       url('iconfont.ttf?t=1720593389064') format('truetype');
+  src: url('iconfont.woff2?t=1721199173027') format('woff2'),
+       url('iconfont.woff?t=1721199173027') format('woff'),
+       url('iconfont.ttf?t=1721199173027') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -197,6 +209,24 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-close-circle-filled"></span>
+            <div class="name">
+              close-circle-filled
+            </div>
+            <div class="code-name">.icon-close-circle-filled
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-check-circle-filled"></span>
+            <div class="name">
+              check-circle-filled
+            </div>
+            <div class="code-name">.icon-check-circle-filled
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-fly"></span>
             <div class="name">
               fly
@@ -369,6 +399,22 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-close-circle-filled"></use>
+                </svg>
+                <div class="name">close-circle-filled</div>
+                <div class="code-name">#icon-close-circle-filled</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-check-circle-filled"></use>
+                </svg>
+                <div class="name">check-circle-filled</div>
+                <div class="code-name">#icon-check-circle-filled</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fly"></use>
                 </svg>
                 <div class="name">fly</div>

src/static/mocp/font/iconfont.css

 @font-face {
   font-family: "iconfont"; /* Project id 4550048 */
-  src: url('iconfont.woff2?t=1720593389064') format('woff2'),
-       url('iconfont.woff?t=1720593389064') format('woff'),
-       url('iconfont.ttf?t=1720593389064') format('truetype');
+  src: url('iconfont.woff2?t=1721199173027') format('woff2'),
+       url('iconfont.woff?t=1721199173027') format('woff'),
+       url('iconfont.ttf?t=1721199173027') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-close-circle-filled:before {
+  content: "\e6e4";
+}
+
+.icon-check-circle-filled:before {
+  content: "\e6e5";
+}
+
 .icon-fly:before {
   content: "\e6e3";
 }

src/static/mocp/font/iconfont.js

-window._iconfont_svg_string_4550048='<svg><symbol id="icon-fly" viewBox="0 0 1024 1024"><path d="M435.2 224c0-83.2 51.2-128 76.8-140.8 25.6 12.8 76.8 51.2 76.8 140.8V384l332.8 275.2v83.2L576 576v192l108.8 172.8-172.8-64-172.8 64L448 768V576l-339.2 172.8v-83.2L435.2 384V224z"  ></path></symbol><symbol id="icon-saixuan-01" viewBox="0 0 1024 1024"><path d="M89.6 172.8c6.4-12.8 19.2-25.6 38.4-25.6h768c19.2 0 32 12.8 38.4 25.6 6.4 12.8 6.4 32-6.4 44.8L633.6 569.6V896c0 12.8-6.4 25.6-19.2 38.4-12.8 6.4-25.6 6.4-38.4 0l-153.6-76.8c-12.8-6.4-25.6-19.2-25.6-38.4v-256L96 217.6c-12.8-12.8-12.8-25.6-6.4-44.8z m128 64l249.6 288c6.4 6.4 12.8 19.2 12.8 25.6v243.2l70.4 32V550.4c0-12.8 6.4-19.2 12.8-25.6l249.6-288H217.6z"  ></path></symbol><symbol id="icon-jpg" viewBox="0 0 1024 1024"><path d="M128 128C128 83.2 166.4 44.8 211.2 44.8H640c12.8 0 19.2 6.4 32 12.8l211.2 211.2c6.4 6.4 12.8 19.2 12.8 32V896c0 44.8-38.4 83.2-83.2 83.2H211.2c-44.8 0-83.2-38.4-83.2-83.2V128z" fill="#65C466" ></path><path d="M256 320c0-70.4 57.6-128 128-128s128 57.6 128 128-57.6 128-128 128-128-57.6-128-128zM736 384c19.2 12.8 32 25.6 32 44.8v358.4c0 25.6-19.2 44.8-44.8 44.8H300.8c-25.6 0-44.8-19.2-44.8-44.8V588.8c0-12.8 6.4-32 19.2-38.4 12.8-12.8 32-12.8 44.8-6.4l166.4 64 198.4-211.2c12.8-12.8 38.4-19.2 51.2-12.8z" fill="#FFFFFF" ></path></symbol><symbol id="icon-pdf" viewBox="0 0 1024 1024"><path d="M128 128C128 83.2 166.4 44.8 211.2 44.8H640c12.8 0 19.2 6.4 32 12.8l211.2 211.2c6.4 6.4 12.8 19.2 12.8 32V896c0 44.8-38.4 83.2-83.2 83.2H211.2c-44.8 0-83.2-38.4-83.2-83.2V128z" fill="#F7CE46" ></path><path d="M640 339.2H384c-25.6 0-44.8 19.2-44.8 44.8s19.2 44.8 44.8 44.8h83.2v300.8c0 19.2 19.2 38.4 44.8 38.4s44.8-19.2 44.8-44.8V428.8H640c25.6 0 44.8-19.2 44.8-44.8s-19.2-44.8-44.8-44.8z" fill="#FFFFFF" ></path></symbol><symbol id="icon-video" viewBox="0 0 1024 1024"><path d="M128 128C128 83.2 166.4 44.8 211.2 44.8H640c12.8 0 19.2 6.4 32 12.8l211.2 211.2c6.4 6.4 12.8 19.2 12.8 32V896c0 44.8-38.4 83.2-83.2 83.2H211.2c-44.8 0-83.2-38.4-83.2-83.2V128z" fill="#165DFF" ></path><path d="M256 428.8c0-25.6 19.2-44.8 44.8-44.8h288c25.6 0 44.8 19.2 44.8 44.8v12.8l83.2-32c12.8-6.4 25.6-6.4 38.4 6.4 6.4 6.4 12.8 19.2 12.8 38.4V704c0 12.8-6.4 32-19.2 38.4-12.8 6.4-25.6 12.8-38.4 6.4l-83.2-32v12.8c0 25.6-19.2 44.8-44.8 44.8H300.8c-25.6-6.4-44.8-25.6-44.8-51.2V428.8z" fill="#FFFFFF" ></path></symbol><symbol id="icon-delete-01" viewBox="0 0 1024 1024"><path d="M723.2 192V108.8H300.8V192h-192v83.2h76.8v576c0 38.4 25.6 64 64 64h531.2c38.4 0 64-25.6 64-64v-576h76.8V192h-198.4zM268.8 832V275.2h492.8V832H268.8zM384 384v320h83.2V384H384z m172.8 0v320H640V384H556.8z"  ></path></symbol><symbol id="icon-navbarright" viewBox="0 0 1024 1024"><path d="M896 748.8H128V832h768v-83.2z m0-281.6H467.2v83.2H896V467.2zM128 192h768v83.2H128V192z m172.8 448c12.8 6.4 32 0 32-19.2V409.6c0-19.2-19.2-25.6-32-19.2L140.8 499.2c-12.8 6.4-12.8 25.6 0 38.4L300.8 640z"  ></path></symbol><symbol id="icon-drive" viewBox="0 0 1024 1024"><path d="M236.8 172.8v684.8h556.8v-448H620.8c-38.4 0-64-25.6-64-64V172.8h-320z m403.2 57.6V320h89.6L640 230.4zM147.2 147.2c0-38.4 25.6-64 64-64h403.2l262.4 262.4v531.2c0 38.4-25.6 64-64 64H211.2c-38.4 0-64-25.6-64-64V147.2z"  ></path></symbol><symbol id="icon-safe" viewBox="0 0 1024 1024"><path d="M512 76.8l19.2 12.8c70.4 38.4 153.6 64 217.6 83.2 32 6.4 57.6 12.8 76.8 19.2 12.8 0 19.2 0 25.6 6.4h44.8v371.2l-44.8-6.4h44.8V576c0 6.4-6.4 19.2-12.8 32-6.4 25.6-25.6 64-51.2 108.8-51.2 83.2-147.2 172.8-307.2 224H512l-12.8-6.4c-160-44.8-256-140.8-307.2-224-25.6-32-38.4-70.4-51.2-102.4-6.4-12.8-6.4-25.6-6.4-32v-12.8l44.8-6.4-51.2 6.4V198.4l38.4-6.4h6.4c6.4 0 12.8 0 25.6-6.4 19.2 0 44.8-6.4 76.8-19.2 64-12.8 147.2-38.4 217.6-83.2l19.2-6.4z m-300.8 192v288c0 6.4 6.4 12.8 6.4 25.6 6.4 25.6 19.2 51.2 44.8 89.6 44.8 64 115.2 140.8 249.6 179.2 128-38.4 204.8-115.2 249.6-179.2 19.2-32 32-64 44.8-89.6 6.4-12.8 6.4-19.2 6.4-25.6V268.8c-19.2-6.4-51.2-6.4-83.2-19.2-64-12.8-140.8-38.4-217.6-76.8-76.8 44.8-153.6 64-217.6 83.2-32 6.4-57.6 12.8-83.2 12.8z m518.4 147.2l-243.2 243.2-160-153.6L384 448l96 96 185.6-185.6 64 57.6z"  ></path></symbol><symbol id="icon-subscribed" viewBox="0 0 1024 1024"><path d="M234.688 170.688v654.208L512 676.992l277.312 147.904V170.688H234.688z m-85.376-21.312a64 64 0 0 1 64-64h597.376a64 64 0 0 1 64 64v739.52c0 35.456-37.76 58.112-69.056 41.408L512 773.76l-293.632 156.608a46.912 46.912 0 0 1-69.056-41.408V149.376zM471.36 468.48l165.952-165.952 60.352 60.352-226.304 226.304-135.68-135.744 60.288-60.352L471.36 468.48z" fill="#4E5969" ></path></symbol><symbol id="icon-mind-mapping" viewBox="0 0 1024 1024"><path d="M106.688 213.312a85.312 85.312 0 1 1 128 73.92v182.08h106.624v85.376H234.688V768h106.624v85.312h-192V287.232a85.312 85.312 0 0 1-42.624-73.92zM917.312 256H426.688V170.688h490.624V256z m0 298.688H426.688V469.312h490.624v85.376z m0 298.624H426.688V768h490.624v85.312z" fill="#4E5969" ></path></symbol><symbol id="icon-email" viewBox="0 0 1024 1024"><path d="M149.312 128a64 64 0 0 0-64 64v640a64 64 0 0 0 64 64h725.376a64 64 0 0 0 64-64V192a64 64 0 0 0-64-64H149.312z m21.376 682.688V213.312h682.624v597.376H170.688z m88.32-483.072L512 502.784l253.056-175.168 48.576 70.144-265.216 183.552a64 64 0 0 1-72.832 0L210.368 397.76l48.64-70.144z" fill="#4E5969" ></path></symbol><symbol id="icon-idcard" viewBox="0 0 1024 1024"><path d="M85.312 213.312C85.312 166.208 123.52 128 170.688 128h682.624c47.168 0 85.376 38.208 85.376 85.312v597.376c0 47.104-38.208 85.312-85.376 85.312H170.688a85.312 85.312 0 0 1-85.376-85.312V213.312z m768 0H170.688v597.376h682.624V213.312z m-426.624 192h-192V320h192v85.312z m0 149.376h-192V469.312h192v85.376zM341.312 704H234.688V618.688h106.624V704z m277.376-106.688C559.808 597.312 512 645.12 512 704H426.688a192 192 0 0 1 114.24-175.616 128 128 0 1 1 155.456 0A192 192 0 0 1 810.688 704h-85.376c0-58.88-47.744-106.688-106.624-106.688zM576 426.688a42.688 42.688 0 1 1 85.312 0 42.688 42.688 0 0 1-85.312 0z" fill="#4E5969" ></path></symbol><symbol id="icon-calendar" viewBox="0 0 1024 1024"><path d="M256 149.312v-42.688h85.312v42.688h341.376v-42.688H768v42.688h85.312a64 64 0 0 1 64 64v640a64 64 0 0 1-64 64H170.688a64 64 0 0 1-64-64v-640a64 64 0 0 1 64-64H256z m0 85.312H192v192h640v-192h-64v42.688h-85.312v-42.688H341.312v42.688H256v-42.688zM832 512H192v320h640V512z" fill="#4E5969" ></path></symbol><symbol id="icon-message" viewBox="0 0 1024 1024"><path d="M106.688 512a405.312 405.312 0 1 1 810.624 0v13.44a391.936 391.936 0 0 1-391.872 391.872H106.688V512zM512 192a320 320 0 0 0-320 320v320h333.44A306.56 306.56 0 0 0 832 525.44V512a320 320 0 0 0-320-320z m192 192v85.312H320V384h384z m-192 277.312H320V576h192v85.312z" fill="#4E5969" ></path></symbol><symbol id="icon-Vector" viewBox="0 0 1228 1024"><path d="M285.360264 841.131887c15.870413 7.372063 15.870413 22.013799 23.754425 36.553144 0 22.013799-15.768023 43.925207-47.50885 43.925208-23.754425 7.269673-47.611239-14.641736-55.49525-43.925208 0-21.911409 15.870413-43.822818 47.508849-65.734226a263.960804 263.960804 0 0 1 150.615339 0c95.222478 36.553145 182.356164 116.929107 206.110588 168.123988-47.508849-175.49605-253.619438-321.708629-443.859614-241.332667-71.365663 29.283472-103.106489 87.748025-103.106489 153.584641C71.365663 965.637836 134.744926 1024 221.981002 1024c47.508849 0 87.133687-14.641736 110.990501-43.925207 31.740826-51.194881 15.768023-116.929107-47.611239-138.942906z m657.956604 0c-15.870413 7.372063-23.754425 14.641736-23.754424 36.553144 0 22.013799 15.768023 43.925207 47.508849 43.925208 23.754425 7.269673 47.611239-14.641736 55.49525-43.925208 0-21.911409-15.870413-43.822818-47.508849-65.734226a263.960804 263.960804 0 0 0-150.615338 0c-95.222478 36.553145-182.356164 116.929107-213.994601 168.123988 47.508849-175.49605 261.50345-321.708629 451.743626-241.332667 63.481652 22.013799 103.106489 80.478352 95.222478 146.314968-7.986401 73.106289-63.481652 131.673233-150.717729 131.673233-47.508849 0-87.133687-14.641736-110.990501-43.925208-23.754425-43.925207-15.768023-109.659434 47.611239-131.673232zM610.242976 387.750025C784.817518 387.750025 927.446455 307.271673 927.446455 204.881912c0-80.478352-87.236076-146.314969-206.110589-175.496051 142.731327 29.181082 245.735426 109.659434 245.735427 197.40746C967.071293 336.555144 832.428757 409.661434 713.451855 424.30317c-71.365663 7.269673-79.249675 7.269673-103.10649 29.283471-7.884012-22.013799-23.754425-22.013799-87.133686-29.283471C404.234777 409.661434 269.489851 329.183082 269.489851 226.793321c0-87.748025 103.106489-168.226377 245.735426-197.40746C388.466753 58.464554 301.230677 124.40356 301.230677 204.881912c0 102.389761 142.628937 182.868113 309.217078 182.868113z m0 117.031497c31.740826-22.013799 79.249675-29.283472 118.976902-36.655535C903.692031 431.572843 1014.682532 351.29927 1014.682532 241.435056c0-43.822818-15.870413-80.478352-47.611239-109.659434-63.481652-58.566943-158.49935-102.389761-277.476253-117.031496 213.994601 14.641736 372.69873 124.30117 372.698731 255.974402 0 117.031497-118.976902 204.779522-309.217079 248.60234-79.249675 22.013799-118.874513 36.655534-142.731327 73.208679-15.870413-36.553145-55.49525-43.925207-134.744925-73.208679-190.240176-43.822818-309.217078-131.570843-309.217078-248.60234 0-131.673233 158.70413-234.062994 372.69873-255.974402C427.989201 29.385861 332.971503 73.208679 269.489851 131.775622c-31.740826 29.181082-47.508849 73.106289-47.508849 109.659434 0 109.761824 110.990501 190.137786 285.360264 226.690931 31.740826 7.372063 79.249675 14.641736 103.004099 36.655535z m0 175.49605c39.624838-58.566943 118.976902-87.748025 190.240176-109.761824 23.856814-7.269673 31.740826-14.539346 55.49525-14.539346 150.615338-51.194881 245.735426-146.314969 253.721828-255.974402 0-153.584642-198.226577-277.988201-443.962004-299.89961C975.057694 14.744126 1228.677132 175.59844 1228.677132 358.466553c0 124.30117-95.120088 234.062994-277.476252 299.89961-79.249675 21.911409-285.360264 80.375962-340.855515 292.527548-47.508849-204.779522-253.619438-270.616138-332.869113-292.527548C95.120088 585.157484 0 482.767723 0 358.466553 0 175.59844 253.619438 22.013799 562.836516 0.10239 317.10109 14.744126 118.772123 139.045295 118.772123 292.629937c7.986401 109.761824 103.106489 204.779522 245.735426 255.974403 23.856814 7.372063 31.740826 14.641736 55.495251 14.641735 79.249675 29.283472 158.60174 58.464554 190.240176 117.031497z m-110.990501-511.948805C499.354865 109.659434 546.966103 58.464554 618.434157 58.464554 689.59504 58.566943 737.206279 102.492151 737.206279 168.328767c0 58.464554-47.611239 109.659434-118.874512 109.659434-71.365663 0-118.976902-43.822818-118.976902-109.659434z" fill="#DD4012" ></path></symbol></svg>',function(e){var t=(t=document.getElementsByTagName("script"))[t.length-1],c=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var i,o,l,a,h,n=function(t,c){c.parentNode.insertBefore(t,c)};if(c&&!e.__iconfont__svg__cssinject__){e.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}i=function(){var t,c=document.createElement("div");c.innerHTML=e._iconfont_svg_string_4550048,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(t=document.body).firstChild?n(c,t.firstChild):t.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),i()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(l=i,a=e.document,h=!1,d(),a.onreadystatechange=function(){"complete"==a.readyState&&(a.onreadystatechange=null,v())})}function v(){h||(h=!0,l())}function d(){try{a.documentElement.doScroll("left")}catch(t){return void setTimeout(d,50)}v()}}(window);
+window._iconfont_svg_string_4550048='<svg><symbol id="icon-close-circle-filled" viewBox="0 0 1024 1024"><path d="M1000.727273 512C1000.727273 242.036364 781.963636 23.272727 512 23.272727S23.272727 242.036364 23.272727 512s218.763636 488.727273 488.727273 488.727273S1000.727273 781.963636 1000.727273 512zM349.090909 297.890909l162.909091 162.909091L674.909091 297.890909l51.2 51.2-162.909091 162.909091 162.909091 162.909091-51.2 51.2-162.909091-162.909091L349.090909 726.109091l-51.2-51.2L460.8 512 297.890909 349.090909 349.090909 297.890909z"  ></path></symbol><symbol id="icon-check-circle-filled" viewBox="0 0 1024 1024"><path d="M512 1000.727273c269.963636 0 488.727273-218.763636 488.727273-488.727273S781.963636 23.272727 512 23.272727 23.272727 242.036364 23.272727 512 242.036364 1000.727273 512 1000.727273zM269.963636 525.963636l51.2-51.2 125.672728 125.672728 265.309091-265.309091 51.2 51.2L446.836364 698.181818l-176.872728-172.218182z"  ></path></symbol><symbol id="icon-fly" viewBox="0 0 1024 1024"><path d="M435.2 224c0-83.2 51.2-128 76.8-140.8 25.6 12.8 76.8 51.2 76.8 140.8V384l332.8 275.2v83.2L576 576v192l108.8 172.8-172.8-64-172.8 64L448 768V576l-339.2 172.8v-83.2L435.2 384V224z"  ></path></symbol><symbol id="icon-saixuan-01" viewBox="0 0 1024 1024"><path d="M89.6 172.8c6.4-12.8 19.2-25.6 38.4-25.6h768c19.2 0 32 12.8 38.4 25.6 6.4 12.8 6.4 32-6.4 44.8L633.6 569.6V896c0 12.8-6.4 25.6-19.2 38.4-12.8 6.4-25.6 6.4-38.4 0l-153.6-76.8c-12.8-6.4-25.6-19.2-25.6-38.4v-256L96 217.6c-12.8-12.8-12.8-25.6-6.4-44.8z m128 64l249.6 288c6.4 6.4 12.8 19.2 12.8 25.6v243.2l70.4 32V550.4c0-12.8 6.4-19.2 12.8-25.6l249.6-288H217.6z"  ></path></symbol><symbol id="icon-jpg" viewBox="0 0 1024 1024"><path d="M128 128C128 83.2 166.4 44.8 211.2 44.8H640c12.8 0 19.2 6.4 32 12.8l211.2 211.2c6.4 6.4 12.8 19.2 12.8 32V896c0 44.8-38.4 83.2-83.2 83.2H211.2c-44.8 0-83.2-38.4-83.2-83.2V128z" fill="#65C466" ></path><path d="M256 320c0-70.4 57.6-128 128-128s128 57.6 128 128-57.6 128-128 128-128-57.6-128-128zM736 384c19.2 12.8 32 25.6 32 44.8v358.4c0 25.6-19.2 44.8-44.8 44.8H300.8c-25.6 0-44.8-19.2-44.8-44.8V588.8c0-12.8 6.4-32 19.2-38.4 12.8-12.8 32-12.8 44.8-6.4l166.4 64 198.4-211.2c12.8-12.8 38.4-19.2 51.2-12.8z" fill="#FFFFFF" ></path></symbol><symbol id="icon-pdf" viewBox="0 0 1024 1024"><path d="M128 128C128 83.2 166.4 44.8 211.2 44.8H640c12.8 0 19.2 6.4 32 12.8l211.2 211.2c6.4 6.4 12.8 19.2 12.8 32V896c0 44.8-38.4 83.2-83.2 83.2H211.2c-44.8 0-83.2-38.4-83.2-83.2V128z" fill="#F7CE46" ></path><path d="M640 339.2H384c-25.6 0-44.8 19.2-44.8 44.8s19.2 44.8 44.8 44.8h83.2v300.8c0 19.2 19.2 38.4 44.8 38.4s44.8-19.2 44.8-44.8V428.8H640c25.6 0 44.8-19.2 44.8-44.8s-19.2-44.8-44.8-44.8z" fill="#FFFFFF" ></path></symbol><symbol id="icon-video" viewBox="0 0 1024 1024"><path d="M128 128C128 83.2 166.4 44.8 211.2 44.8H640c12.8 0 19.2 6.4 32 12.8l211.2 211.2c6.4 6.4 12.8 19.2 12.8 32V896c0 44.8-38.4 83.2-83.2 83.2H211.2c-44.8 0-83.2-38.4-83.2-83.2V128z" fill="#165DFF" ></path><path d="M256 428.8c0-25.6 19.2-44.8 44.8-44.8h288c25.6 0 44.8 19.2 44.8 44.8v12.8l83.2-32c12.8-6.4 25.6-6.4 38.4 6.4 6.4 6.4 12.8 19.2 12.8 38.4V704c0 12.8-6.4 32-19.2 38.4-12.8 6.4-25.6 12.8-38.4 6.4l-83.2-32v12.8c0 25.6-19.2 44.8-44.8 44.8H300.8c-25.6-6.4-44.8-25.6-44.8-51.2V428.8z" fill="#FFFFFF" ></path></symbol><symbol id="icon-delete-01" viewBox="0 0 1024 1024"><path d="M723.2 192V108.8H300.8V192h-192v83.2h76.8v576c0 38.4 25.6 64 64 64h531.2c38.4 0 64-25.6 64-64v-576h76.8V192h-198.4zM268.8 832V275.2h492.8V832H268.8zM384 384v320h83.2V384H384z m172.8 0v320H640V384H556.8z"  ></path></symbol><symbol id="icon-navbarright" viewBox="0 0 1024 1024"><path d="M896 748.8H128V832h768v-83.2z m0-281.6H467.2v83.2H896V467.2zM128 192h768v83.2H128V192z m172.8 448c12.8 6.4 32 0 32-19.2V409.6c0-19.2-19.2-25.6-32-19.2L140.8 499.2c-12.8 6.4-12.8 25.6 0 38.4L300.8 640z"  ></path></symbol><symbol id="icon-drive" viewBox="0 0 1024 1024"><path d="M236.8 172.8v684.8h556.8v-448H620.8c-38.4 0-64-25.6-64-64V172.8h-320z m403.2 57.6V320h89.6L640 230.4zM147.2 147.2c0-38.4 25.6-64 64-64h403.2l262.4 262.4v531.2c0 38.4-25.6 64-64 64H211.2c-38.4 0-64-25.6-64-64V147.2z"  ></path></symbol><symbol id="icon-safe" viewBox="0 0 1024 1024"><path d="M512 76.8l19.2 12.8c70.4 38.4 153.6 64 217.6 83.2 32 6.4 57.6 12.8 76.8 19.2 12.8 0 19.2 0 25.6 6.4h44.8v371.2l-44.8-6.4h44.8V576c0 6.4-6.4 19.2-12.8 32-6.4 25.6-25.6 64-51.2 108.8-51.2 83.2-147.2 172.8-307.2 224H512l-12.8-6.4c-160-44.8-256-140.8-307.2-224-25.6-32-38.4-70.4-51.2-102.4-6.4-12.8-6.4-25.6-6.4-32v-12.8l44.8-6.4-51.2 6.4V198.4l38.4-6.4h6.4c6.4 0 12.8 0 25.6-6.4 19.2 0 44.8-6.4 76.8-19.2 64-12.8 147.2-38.4 217.6-83.2l19.2-6.4z m-300.8 192v288c0 6.4 6.4 12.8 6.4 25.6 6.4 25.6 19.2 51.2 44.8 89.6 44.8 64 115.2 140.8 249.6 179.2 128-38.4 204.8-115.2 249.6-179.2 19.2-32 32-64 44.8-89.6 6.4-12.8 6.4-19.2 6.4-25.6V268.8c-19.2-6.4-51.2-6.4-83.2-19.2-64-12.8-140.8-38.4-217.6-76.8-76.8 44.8-153.6 64-217.6 83.2-32 6.4-57.6 12.8-83.2 12.8z m518.4 147.2l-243.2 243.2-160-153.6L384 448l96 96 185.6-185.6 64 57.6z"  ></path></symbol><symbol id="icon-subscribed" viewBox="0 0 1024 1024"><path d="M234.688 170.688v654.208L512 676.992l277.312 147.904V170.688H234.688z m-85.376-21.312a64 64 0 0 1 64-64h597.376a64 64 0 0 1 64 64v739.52c0 35.456-37.76 58.112-69.056 41.408L512 773.76l-293.632 156.608a46.912 46.912 0 0 1-69.056-41.408V149.376zM471.36 468.48l165.952-165.952 60.352 60.352-226.304 226.304-135.68-135.744 60.288-60.352L471.36 468.48z" fill="#4E5969" ></path></symbol><symbol id="icon-mind-mapping" viewBox="0 0 1024 1024"><path d="M106.688 213.312a85.312 85.312 0 1 1 128 73.92v182.08h106.624v85.376H234.688V768h106.624v85.312h-192V287.232a85.312 85.312 0 0 1-42.624-73.92zM917.312 256H426.688V170.688h490.624V256z m0 298.688H426.688V469.312h490.624v85.376z m0 298.624H426.688V768h490.624v85.312z" fill="#4E5969" ></path></symbol><symbol id="icon-email" viewBox="0 0 1024 1024"><path d="M149.312 128a64 64 0 0 0-64 64v640a64 64 0 0 0 64 64h725.376a64 64 0 0 0 64-64V192a64 64 0 0 0-64-64H149.312z m21.376 682.688V213.312h682.624v597.376H170.688z m88.32-483.072L512 502.784l253.056-175.168 48.576 70.144-265.216 183.552a64 64 0 0 1-72.832 0L210.368 397.76l48.64-70.144z" fill="#4E5969" ></path></symbol><symbol id="icon-idcard" viewBox="0 0 1024 1024"><path d="M85.312 213.312C85.312 166.208 123.52 128 170.688 128h682.624c47.168 0 85.376 38.208 85.376 85.312v597.376c0 47.104-38.208 85.312-85.376 85.312H170.688a85.312 85.312 0 0 1-85.376-85.312V213.312z m768 0H170.688v597.376h682.624V213.312z m-426.624 192h-192V320h192v85.312z m0 149.376h-192V469.312h192v85.376zM341.312 704H234.688V618.688h106.624V704z m277.376-106.688C559.808 597.312 512 645.12 512 704H426.688a192 192 0 0 1 114.24-175.616 128 128 0 1 1 155.456 0A192 192 0 0 1 810.688 704h-85.376c0-58.88-47.744-106.688-106.624-106.688zM576 426.688a42.688 42.688 0 1 1 85.312 0 42.688 42.688 0 0 1-85.312 0z" fill="#4E5969" ></path></symbol><symbol id="icon-calendar" viewBox="0 0 1024 1024"><path d="M256 149.312v-42.688h85.312v42.688h341.376v-42.688H768v42.688h85.312a64 64 0 0 1 64 64v640a64 64 0 0 1-64 64H170.688a64 64 0 0 1-64-64v-640a64 64 0 0 1 64-64H256z m0 85.312H192v192h640v-192h-64v42.688h-85.312v-42.688H341.312v42.688H256v-42.688zM832 512H192v320h640V512z" fill="#4E5969" ></path></symbol><symbol id="icon-message" viewBox="0 0 1024 1024"><path d="M106.688 512a405.312 405.312 0 1 1 810.624 0v13.44a391.936 391.936 0 0 1-391.872 391.872H106.688V512zM512 192a320 320 0 0 0-320 320v320h333.44A306.56 306.56 0 0 0 832 525.44V512a320 320 0 0 0-320-320z m192 192v85.312H320V384h384z m-192 277.312H320V576h192v85.312z" fill="#4E5969" ></path></symbol><symbol id="icon-Vector" viewBox="0 0 1228 1024"><path d="M285.360264 841.131887c15.870413 7.372063 15.870413 22.013799 23.754425 36.553144 0 22.013799-15.768023 43.925207-47.50885 43.925208-23.754425 7.269673-47.611239-14.641736-55.49525-43.925208 0-21.911409 15.870413-43.822818 47.508849-65.734226a263.960804 263.960804 0 0 1 150.615339 0c95.222478 36.553145 182.356164 116.929107 206.110588 168.123988-47.508849-175.49605-253.619438-321.708629-443.859614-241.332667-71.365663 29.283472-103.106489 87.748025-103.106489 153.584641C71.365663 965.637836 134.744926 1024 221.981002 1024c47.508849 0 87.133687-14.641736 110.990501-43.925207 31.740826-51.194881 15.768023-116.929107-47.611239-138.942906z m657.956604 0c-15.870413 7.372063-23.754425 14.641736-23.754424 36.553144 0 22.013799 15.768023 43.925207 47.508849 43.925208 23.754425 7.269673 47.611239-14.641736 55.49525-43.925208 0-21.911409-15.870413-43.822818-47.508849-65.734226a263.960804 263.960804 0 0 0-150.615338 0c-95.222478 36.553145-182.356164 116.929107-213.994601 168.123988 47.508849-175.49605 261.50345-321.708629 451.743626-241.332667 63.481652 22.013799 103.106489 80.478352 95.222478 146.314968-7.986401 73.106289-63.481652 131.673233-150.717729 131.673233-47.508849 0-87.133687-14.641736-110.990501-43.925208-23.754425-43.925207-15.768023-109.659434 47.611239-131.673232zM610.242976 387.750025C784.817518 387.750025 927.446455 307.271673 927.446455 204.881912c0-80.478352-87.236076-146.314969-206.110589-175.496051 142.731327 29.181082 245.735426 109.659434 245.735427 197.40746C967.071293 336.555144 832.428757 409.661434 713.451855 424.30317c-71.365663 7.269673-79.249675 7.269673-103.10649 29.283471-7.884012-22.013799-23.754425-22.013799-87.133686-29.283471C404.234777 409.661434 269.489851 329.183082 269.489851 226.793321c0-87.748025 103.106489-168.226377 245.735426-197.40746C388.466753 58.464554 301.230677 124.40356 301.230677 204.881912c0 102.389761 142.628937 182.868113 309.217078 182.868113z m0 117.031497c31.740826-22.013799 79.249675-29.283472 118.976902-36.655535C903.692031 431.572843 1014.682532 351.29927 1014.682532 241.435056c0-43.822818-15.870413-80.478352-47.611239-109.659434-63.481652-58.566943-158.49935-102.389761-277.476253-117.031496 213.994601 14.641736 372.69873 124.30117 372.698731 255.974402 0 117.031497-118.976902 204.779522-309.217079 248.60234-79.249675 22.013799-118.874513 36.655534-142.731327 73.208679-15.870413-36.553145-55.49525-43.925207-134.744925-73.208679-190.240176-43.822818-309.217078-131.570843-309.217078-248.60234 0-131.673233 158.70413-234.062994 372.69873-255.974402C427.989201 29.385861 332.971503 73.208679 269.489851 131.775622c-31.740826 29.181082-47.508849 73.106289-47.508849 109.659434 0 109.761824 110.990501 190.137786 285.360264 226.690931 31.740826 7.372063 79.249675 14.641736 103.004099 36.655535z m0 175.49605c39.624838-58.566943 118.976902-87.748025 190.240176-109.761824 23.856814-7.269673 31.740826-14.539346 55.49525-14.539346 150.615338-51.194881 245.735426-146.314969 253.721828-255.974402 0-153.584642-198.226577-277.988201-443.962004-299.89961C975.057694 14.744126 1228.677132 175.59844 1228.677132 358.466553c0 124.30117-95.120088 234.062994-277.476252 299.89961-79.249675 21.911409-285.360264 80.375962-340.855515 292.527548-47.508849-204.779522-253.619438-270.616138-332.869113-292.527548C95.120088 585.157484 0 482.767723 0 358.466553 0 175.59844 253.619438 22.013799 562.836516 0.10239 317.10109 14.744126 118.772123 139.045295 118.772123 292.629937c7.986401 109.761824 103.106489 204.779522 245.735426 255.974403 23.856814 7.372063 31.740826 14.641736 55.495251 14.641735 79.249675 29.283472 158.60174 58.464554 190.240176 117.031497z m-110.990501-511.948805C499.354865 109.659434 546.966103 58.464554 618.434157 58.464554 689.59504 58.566943 737.206279 102.492151 737.206279 168.328767c0 58.464554-47.611239 109.659434-118.874512 109.659434-71.365663 0-118.976902-43.822818-118.976902-109.659434z" fill="#DD4012" ></path></symbol></svg>',function(e){var t=(t=document.getElementsByTagName("script"))[t.length-1],c=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var l,i,o,a,h,n=function(t,c){c.parentNode.insertBefore(t,c)};if(c&&!e.__iconfont__svg__cssinject__){e.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}l=function(){var t,c=document.createElement("div");c.innerHTML=e._iconfont_svg_string_4550048,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(t=document.body).firstChild?n(c,t.firstChild):t.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),l()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=l,a=e.document,h=!1,v(),a.onreadystatechange=function(){"complete"==a.readyState&&(a.onreadystatechange=null,d())})}function d(){h||(h=!0,o())}function v(){try{a.documentElement.doScroll("left")}catch(t){return void setTimeout(v,50)}d()}}(window);
\ No newline at end of file

src/static/mocp/font/iconfont.json

@@ -6,6 +6,20 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "41114520",
+      "name": "close-circle-filled",
+      "font_class": "close-circle-filled",
+      "unicode": "e6e4",
+      "unicode_decimal": 59108
+    },
+    {
+      "icon_id": "41114519",
+      "name": "check-circle-filled",
+      "font_class": "check-circle-filled",
+      "unicode": "e6e5",
+      "unicode_decimal": 59109
+    },
+    {
       "icon_id": "41020181",
       "name": "fly",
       "font_class": "fly",