wangmengwei 2 лет назад
Родитель
Сommit
af9cc850c4

+ 1 - 0
ruoyi-ui/package.json

@@ -58,6 +58,7 @@
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
+    "vue-ueditor": "^0.1.3",
     "vue-video-player": "^5.0.2",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0"

+ 1 - 1
ruoyi-ui/public/index.html

@@ -198,7 +198,7 @@
   <body>
     <div id="app">
 	    <div id="loader-wrapper">
-		    <div id="loader"></div>
+		    <!-- <div id="loader"></div> -->
 		    <div class="loader-section section-left"></div>
 		    <div class="loader-section section-right"></div>
 		    <div class="load_title">正在加载系统资源,请耐心等待</div>

+ 1 - 1
ruoyi-ui/src/components/FileUpload/index.vue

@@ -54,7 +54,7 @@ export default {
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5,
+      default: 50,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {

+ 1 - 1
ruoyi-ui/src/components/FileUploads/index.vue

@@ -54,7 +54,7 @@ export default {
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5,
+      default: 50,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {

+ 10 - 0
ruoyi-ui/src/main.js

@@ -14,6 +14,13 @@ import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
 
+
+import './static/UE/ueditor.config.js'
+// import './static/UE/ueditor.all.js'
+// import './assets/icons'
+import './static/UE/ueditor.parse.js'
+
+
 import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
@@ -25,6 +32,8 @@ import Pagination from "@/components/Pagination";
 import RightToolbar from "@/components/RightToolbar"
 // 富文本组件
 import Editor from "@/components/Editor"
+import Uedi from "@/components/Uedi"
+
 // 文件上传组件
 import FileUpload from "@/components/FileUpload"
 import FileUploads from "@/components/FileUploads"
@@ -55,6 +64,7 @@ Vue.component('DictTag', DictTag)
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
 Vue.component('Editor', Editor)
+Vue.component('Uedi', Uedi)
 Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)

+ 4 - 2
ruoyi-ui/src/settings.js

@@ -1,7 +1,9 @@
 module.exports = {
   title: '刷制品质量监督检验中心',
-  // urls: 'http://192.168.101.11:8090',
-  urls: 'http://118.31.23.65:5004',
+  urls: 'http://192.168.101.11:8090',
+  // urls: 'http://118.31.23.65:5004',
+  // urls: 'https://jyzx.qs163.cn/',
+
 
 
   /**

+ 7 - 2
ruoyi-ui/src/views/system/inspectInfor/index.vue

@@ -271,11 +271,13 @@
               <el-input v-model="forms.manufacturerName" placeholder="请输入送检单位名称" disabled />
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="委托单位名称" prop="inspectedName">
               <el-input v-model="forms.inspectedName" placeholder="请输入委托单位名称" disabled />
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="是否合格" prop="isQualify">
              <el-select v-model="forms.isQualify" placeholder="请选择" style="width: 100%;" @change="nhyese">
@@ -285,8 +287,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24" v-if="nshouw">
-            <el-form-item label="详细报告" prop="inspectedName">
-              <imageUpload   v-model="forms.reportUrl" />
+            <el-form-item label="详细报告" prop="reportUrl">
+              <fileUpload   v-model="forms.reportUrl" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -511,6 +513,9 @@ export default {
             this.$message.error("报告编号必填")
              return  false
           }
+
+          this.forms.inspectName =  this.forms.manufacturerName
+          this.forms.entrustName =  this.forms.inspectedName
           this.forms.isReport = undefined
             addInspectInfor(this.forms).then(response => {
               this.$modal.msgSuccess("操作成功");

+ 63 - 10
ruoyi-ui/src/views/system/news/index.vue

@@ -20,6 +20,8 @@
           />
         </el-select>
       </el-form-item>
+
+
 <!--      <el-form-item label="是否删除" prop="isDel">
         <el-select v-model="queryParams.status" placeholder="请选择是否删除" clearable size="small">
           <el-option
@@ -30,6 +32,8 @@
           />
         </el-select>
       </el-form-item>-->
+
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -159,11 +163,43 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="是否头条" prop="isTop">
-              <el-select v-model="form.isTop" placeholder="请选择" style="width: 100%;">
-                <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
-              </el-select>
+            <el-form-item label="浏览数" prop="viewsNum">
+              <el-input v-model="form.viewsNum" placeholder="请输入浏览数" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="外部链接" prop="reprintUrl">
+               <el-input v-model="form.reprintUrl" placeholder="请输入外部链接" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="作者" prop="author">
+              <el-input v-model="form.author" placeholder="请输入作者" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="新闻日期" prop="releaseTime">
+
+             <el-date-picker
+                   v-model="form.releaseTime"
+                   type="datetime"
+                   value-format="yyyy-MM-dd"
+                   format="yyyy-MM-dd"
+                   placeholder="选择日期时间">
+            </el-date-picker>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否轮播图" prop="isRotation">
+             <el-select v-model="form.isRotation" placeholder="是否轮播图">
+                         <el-option
+                           v-for="dict in dict.type.sys_yes_no"
+                           :key="dict.value"
+                           :label="dict.label"
+             :value="dict.value"
+                         ></el-option>
+                       </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -171,10 +207,11 @@
               <el-input v-model="form.remark" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
-
           <el-col :span="24">
             <el-form-item label="文章内容" prop="newsContent">
-              <editor v-model="form.newsContent" :min-height="192" />
+              <!-- <editor v-model="form.newsContent" :min-height="192" /> -->
+              <!-- <uedi :value="defaultMsg" v-model="form.newsContent" :config="config"  :min-height="192" /> -->
+            <!-- <vueUEditor></vueUEditor> -->
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -184,6 +221,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+
 <!--        <el-form-item label="文章状态">
           <el-radio-group v-model="form.status">
             <el-radio
@@ -212,6 +250,7 @@
 import { listNews, getNews, delNews, addNews, updateNews,rejectNews,examineNews } from "@/api/system/news";
 import { listColumn } from '@/api/system/column'
 import Treeselect from "@riophae/vue-treeselect";
+// import vueUEditor from 'vue-ueditor';
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
@@ -222,6 +261,12 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      defaultMsg: '这里是UE测试',
+              config: {
+                initialFrameWidth: null,
+                initialFrameHeight: 500
+              },
+
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -285,6 +330,14 @@ window.onresize = () => {
         this.changeTableMaxHeight()
   },
   methods: {
+     getUEContent() {
+            let content = this.$refs.ue.getUEContent();
+            console.log(content)
+          },
+          setText(){
+            let content = this.$refs.ue.setText();
+          },
+
     /** 查询文章信息列表 */
     getList() {
       this.loading = true;
@@ -306,7 +359,6 @@ window.onresize = () => {
         newsTitle: null,
         columnId: null,
         newsContent: undefined,
-        status: "0",
         isTop: null,
         isDel: null,
         reason: null,
@@ -314,7 +366,8 @@ window.onresize = () => {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        remark: null,
+        viewsNum:300
       };
       this.resetForm("form");
     },
@@ -365,7 +418,6 @@ window.onresize = () => {
     /** 审核通过按钮操作 */
     examine(row) {
       const newsId = row.newsId || this.ids
-
       this.$modal.confirm('是否确认审核"' + newsId + '"的数据项?').then(function() {
         return examineNews(newsId);
       }).then(() => {
@@ -393,6 +445,7 @@ window.onresize = () => {
       }).then(({ value }) => {
         this.boh.reason = value
         this.boh.newsId = newsId
+        this.boh.status = 2
 		// that.rejectNews(this.boh).then(response => {
 		// 	console.log(8764)
 		//   this.$modal.msgSuccess("驳回成功");