代码合并

src/App.vue

@@ -83,7 +83,7 @@
       </div>
     </el-drawer>
     <feedBack v-if="$route.matched.length > 0" />
-    <timeTag />
+    <!-- <timeTag /> -->
   </div>
 </template>
 
@@ -94,12 +94,15 @@ import {
 } from '@/api/dictionary/dictionary'
 import { getTrialExtralConfig } from '@/api/trials'
 import feedBack from '@/views/trials/trials-layout/components/feedBack'
-import timeTag from '@/components/timeTag'
+// import timeTag from '@/components/timeTag'
 import Vue from 'vue'
 import i18n from './lang'
 export default {
   name: 'App',
-  components: { feedBack, timeTag },
+  components: {
+    feedBack,
+    // timeTag
+  },
   data() {
     return {
       drawer: false,

src/views/system/notice/components/from.vue

@@ -1,109 +1,63 @@
 <template>
   <base-model :config="model_cfg">
     <template slot="dialog-body">
-      <el-form
+      <el-form ref="NoticeForm" :model="form" :rules="rules" label-width="180px" size="small">
-        ref="NoticeForm"
+        <el-form-item :label="$t('system:notice:label:NoticeLevel')" prop="NoticeLevelEnum">
-        :model="form"
-        :rules="rules"
-        label-width="180px"
-        size="small"
-      >
-        <el-form-item  :label="$t('system:notice:label:NoticeLevel')" prop="NoticeLevelEnum">
           <el-select v-model="form.NoticeLevelEnum" clearable size="small">
-            <el-option
+            <el-option v-for="item of dict.type.NoteLevel" :key="item.value" :label="item.label"
-              v-for="item of dict.type.NoteLevel"
+              :value="item.raw.Code * 1" />
-              :key="item.value"
-              :label="item.label"
-              :value="item.raw.Code * 1"
-            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeType')" prop="NoticeTypeEnum">
           <el-select v-model="form.NoticeTypeEnum" clearable size="small">
-            <el-option
+            <el-option v-for="item of dict.type.NoteType" :key="item.value" :label="item.label"
-              v-for="item of dict.type.NoteType"
+              :value="item.raw.Code * 1" />
-              :key="item.value"
-              :label="item.label"
-              :value="item.raw.Code * 1"
-            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:ApplicableProject')" prop="ApplicableProjectEnum">
-          <el-select v-model="form.ApplicableProjectEnum"  clearable size="small">
+          <el-select v-model="form.ApplicableProjectEnum" clearable size="small">
-            <el-option
+            <el-option v-for="item of dict.type.NoticeApplicableTrial" :key="item.value" :label="item.label"
-              v-for="item of dict.type.NoticeApplicableTrial"
+              :value="item.raw.Code * 1" />
-              :key="item.value"
-              :label="item.label"
-              :value="item.raw.Code * 1"
-            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeUserTypeIdList')" prop="NoticeUserTypeIdList">
           <el-select v-model="form.NoticeUserTypeIdList" multiple clearable size="small">
-            <el-option
+            <el-option v-for="item of roleList" :key="item.Id" :label="item.UserTypeShortName" :value="item.Id" />
-              v-for="item of roleList"
-              :key="item.Id"
-              :label="item.UserTypeShortName"
-              :value="item.Id"
-            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeMode')" prop="NoticeModeEnum">
           <el-select v-model="form.NoticeModeEnum" clearable size="small">
-            <el-option
+            <el-option v-for="item of dict.type.NoticeMode" :key="item.value" :label="item.label"
-              v-for="item of dict.type.NoticeMode"
+              :value="item.raw.Code * 1" />
-              :key="item.value"
-              :label="item.label"
-              :value="item.raw.Code * 1"
-            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:StartDate')" prop="StartDate">
-          <el-date-picker
+          <el-date-picker v-model="form.StartDate" type="datetime" />
-            v-model="form.StartDate"
-            type="datetime"
-          />
         </el-form-item>
-        <el-form-item  :label="$t('system:notice:label:EndDate')" prop="EndDate">
+        <el-form-item :label="$t('system:notice:label:EndDate')" prop="EndDate">
-          <el-date-picker
+          <el-date-picker v-model="form.EndDate" type="datetime" :default-time="'23:59:59'" />
-            v-model="form.EndDate"
-            type="datetime"
-          />
         </el-form-item>
         <el-form-item v-if="!form.Id" :label="$t('system:notice:label:IsPush')" prop="IsPush">
-          <el-switch
+          <el-switch v-model="form.IsPush" :active-value="true" :inactive-value="false" />
-            v-model="form.IsPush"
-            :active-value="true"
-            :inactive-value="false"
-          />
         </el-form-item>
-        <el-form-item  :label="$t('system:notice:label:NoticeContent')" prop="NoticeContent">
+        <el-form-item :label="$t('system:notice:label:NoticeContent')" prop="NoticeContent">
-          <el-input
+          <el-input v-model="form.NoticeContent" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" />
-            v-model="form.NoticeContent"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4}"
-          />
         </el-form-item>
-        <el-form-item  :label="$t('system:notice:label:file')">
+        <el-form-item :label="$t('system:notice:label:file')">
-          <el-upload
+          <el-upload class="upload-demo" action :before-upload="beforeUpload" :http-request="handleUploadFile"
-            class="upload-demo"
+            :on-preview="handlePreview" :on-remove="handleRemoveFile" :show-file-list="true" :limit="1"
-            action
+            :file-list="fileList">
-            :before-upload="beforeUpload"
+            <el-button size="small" type="primary"
-            :http-request="handleUploadFile"
+              :disabled="fileList.length > 0">{{ $t('common:button:upload') }}</el-button>
-            :on-preview="handlePreview"
-            :on-remove="handleRemoveFile"
-            :show-file-list="true"
-            :limit="1"
-            :file-list="fileList"
-          >
-            <el-button size="small" type="primary" :disabled="fileList.length > 0">{{$t('common:button:upload')}}</el-button>
           </el-upload>
         </el-form-item>
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">{{ $t('common:button:cancel') }}</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">{{ $t('common:button:cancel')
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+        }}</el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">{{ $t('common:button:save')
+        }}</el-button>
     </template>
   </base-model>
 </template>
@@ -178,7 +132,7 @@ export default {
       this.loading = true
       var file = await this.fileToBlob(param.file)
       const res = await this.OSSclient.put(`/System/NoticeAttachment/${param.file.name}`, file)
-      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), fullPath: this.$getObjectName(res.url), url:  this.$getObjectName(res.url)})
+      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), fullPath: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
       this.form.Path = this.$getObjectName(res.url)
       this.form.FileName = param.file.name
       this.loading = false