Merge remote-tracking branch 'origin/master'

src/components/jeecg/JUpload.vue

@@ -24,7 +24,7 @@
       :listType="complistType"
       @preview="handlePreview"
       :class="{'uploadty-disabled':disabled}">
-      <template>
+      <template v-if="!disabled">
         <div v-if="isImageComp">
           <a-icon type="plus" />
           <div class="ant-upload-text">{{ text }}</div>

src/components/tools/ShowAnnouncement.vue

@@ -16,7 +16,8 @@
         :title="record.titile"
         :description="'发布人：'+record.sender + ' 发布时间： ' + record.sendTime">
       </a-card-meta>
-      <j-upload v-model="record.wjsc" ></j-upload>
+      <!-- <j-upload v-model="record.wjsc" ></j-upload> -->
+      <j-upload v-model="record.wjsc" :disabled="record.changeType=='1'"></j-upload>
       <a-divider />
       <span v-html="record.msgContent" class="article-content"></span>
     </a-card>

src/config/index.js

@@ -6,8 +6,8 @@ window._CONFIG['domianURL'] = Vue.prototype.API_BASE_URL
 //单点登录地址
 window._CONFIG['casPrefixUrl'] = window._CONFIG.VUE_APP_CAS_BASE_URL?window._CONFIG.VUE_APP_CAS_BASE_URL:process.env.VUE_APP_CAS_BASE_URL
 window._CONFIG['onlinePreviewDomainURL'] =  window._CONFIG.VUE_APP_ONLINE_BASE_URL?window._CONFIG.VUE_APP_ONLINE_BASE_URL:process.env.VUE_APP_ONLINE_BASE_URL
-window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/images'
-//window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/sys/common/static'
+//window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/images'
+window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/sys/common/static'
 window._CONFIG['pdfDomainURL'] = Vue.prototype.API_BASE_URL+ '/sys/common/pdf/pdfPreviewIframe'
 
 window._CONFIG['domianURLs'] = "http://127.0.0.1:9001/jeecg-boot"

src/views/dashboard/IndexChart.vue

@@ -853,7 +853,7 @@
   .syxxtbbtn{
     height: 80%;
     width: 100%;
-    //background-color: #1890FF;
+    background-color: #1890FF;
     background-image: url('~@/assets/syxxtb_bg.png');
     background-size: 100% 100%;
     margin-left: 2rem;

src/views/system/UserAnnouncementList.vue

@@ -166,6 +166,7 @@
         console.log('111',record)
       },
       showAnnouncement(record){
+        record['changeType'] = "1" //1代表查看
         putAction(this.url.editCementSend,{anntId:record.anntId}).then((res)=>{
           if(res.success){
             this.loadData();