提交

ruoyi-ui/.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 印刷制品质量监督检验平台
+VUE_APP_TITLE = 刷制品质量监督检验中心
 
 # 开发环境配置
 ENV = 'development'

ruoyi-ui/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 印刷制品质量监督检验平台
+VUE_APP_TITLE = 刷制品质量监督检验中心
 
 # 生产环境配置
 ENV = 'production'

ruoyi-ui/.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 刷制品质量监督检验中心
 
 NODE_ENV = production
 

ruoyi-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "boman",
   "version": "3.8.0",
-  "description": "印刷品质量检验平台",
+  "description": "刷制品质量监督检验中心",
   "author": "博曼",
   "license": "MIT",
   "scripts": {

ruoyi-ui/src/api/system/news.js

@@ -46,7 +46,7 @@ export function delNews(newsId) {
 // 审核通过文章信息
 export function examineNews(newsId) {
   return request({
-    url: '/system/news/examine'+ newsId,
+    url: '/system/news/examine/'+ newsId,
     method: 'get',
   })
 }

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '印刷品质量监督检验平台',
+      title: '刷制品质量监督检验中心', 
       logo: logoImg
     }
   }

ruoyi-ui/src/settings.js

@@ -1,6 +1,8 @@
 module.exports = {
-  title: '印刷制品质量监督检验平台',
-  urls: 'http://192.168.101.11:8090',
+  title: '刷制品质量监督检验中心',
+  // urls: 'http://192.168.101.11:8090',
+  urls: 'http://118.31.23.65:5004',
+
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

ruoyi-ui/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">印刷品质量监督检验平台</h3>
+      <h3 class="title">刷制品质量监督检验中心</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

ruoyi-ui/src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">刷制品质量监督检验中心</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

ruoyi-ui/src/views/system/image/index.vue

@@ -48,7 +48,7 @@
       <el-table-column label="附件名称" align="center" prop="imageName" />
       <el-table-column label="附件内容" align="center" prop="imageContent" width="110px">
         <template slot-scope="scope">
-          <img @click="imagew(scope.row.imageContent)" :src="defaultSettings.urls  + scope.row.imageContent"
+          <img @click="imagew(scope.row.imageContent)" :src="defaultSettings.urls + '/prod-api' + scope.row.imageContent"
             style="width: 100px;height: 100px;" />
         </template>
       </el-table-column>
@@ -127,7 +127,7 @@
     </el-dialog>
 
     <el-dialog title="图片预览" :visible.sync="opende" width="1000px" append-to-body style="text-align: center;">
-      <img :src="defaultSettings.urls + urls" style="width: 80%;" v-if="jeuhse == false">
+      <img :src="defaultSettings.urls  + '/prod-api'+ urls" style="width: 80%;" v-if="jeuhse == false">
       <video-player v-if="jeuhse == true" style="width: 960px; " class="video-player vjs-custom-skin" ref="videoPlayer" name="videoPlayer" id="video"
         :playsinline="true"  :options="playerOptions" @play="onPlayerPlay($event)"
         @pause="onPlayerPause($event)" @ended="onPlayerEnded($event)" @waiting="onPlayerWaiting($event)"

ruoyi-ui/src/views/system/inspectInfor/index.vue

@@ -123,28 +123,27 @@
     </el-row>
 
     <el-table  v-loading="loading" :data="inspectInforList" @selection-change="handleSelectionChange" :max-height="tableMaxHeight">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="样品名称" align="center" prop="sampleName" />
-      <el-table-column label="报告编号" align="center" prop="reportNumber" />
-
-      <el-table-column label="样品数量" align="center" prop="sampleNum" />
-      <el-table-column label="规格型号" align="center" prop="normsModel" />
-      <el-table-column label="检验项目" align="center" prop="testItems">
+      <el-table-column fixed type="selection" width="55" align="center" />
+      <el-table-column fixed label="样品名称" align="center" prop="sampleName" width="180px"/>
+      <el-table-column label="样品数量" align="center" prop="sampleNum" width="80px"/>
+      <el-table-column label="规格型号" align="center" prop="normsModel" width="250px"/>
+      <el-table-column label="检验项目" align="center" prop="testItems" width="160px">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.Inspection_item" :value="scope.row.testItems"/>
         </template>
       </el-table-column>
-      <el-table-column label="提供方式" align="center" prop="provideType">
+      <el-table-column label="提供方式" align="center" prop="provideType" width="100px">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.provision_mode" :value="scope.row.provideType"/>
         </template>
       </el-table-column>
-      <el-table-column label="送检单位名称" align="center" prop="manufacturerName" />
-      <el-table-column label="送检单位电话" align="center" prop="manufacturerPhone" />
-      <el-table-column label="委托单位名称" align="center" prop="inspectedName" />
-      <el-table-column label="委托单位电话" align="center" prop="inspectedPhone" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="送检单位名称" align="center" prop="manufacturerName" width="160px" />
+      <el-table-column label="送检单位电话" align="center" prop="manufacturerPhone" width="140px"/>
+      <el-table-column label="委托单位名称" align="center" prop="inspectedName" width="180px" />
+      <el-table-column label="委托单位电话" align="center" prop="inspectedPhone" width="140px"/>
+      <el-table-column label="提交时间" align="center" prop="createTime" width="160px"/>
+      <el-table-column label="备注" align="center" prop="remark" width="80px"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px">
         <template slot-scope="scope">
           <el-button
             size="mini"

ruoyi-ui/src/views/system/news/index.vue

@@ -83,9 +83,9 @@
     </el-row>
 
     <el-table v-loading="loading" :data="newsList" @selection-change="handleSelectionChange" :max-height="tableMaxHeight">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="栏目名称" align="center" prop="columnName" />
-      <el-table-column label="文章标题" align="center" prop="newsTitle" />
+      <el-table-column fixed  type="selection" width="55" align="center" />
+      <el-table-column fixed label="栏目名称" align="center" prop="columnName" width="120px"/>
+      <el-table-column label="文章标题" align="center" prop="newsTitle" width="300px"/>
       <el-table-column label="文章内容" align="center" prop="newsContent" width="300px" :show-overflow-tooltip="true"/>
       <el-table-column label="文章状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -94,7 +94,7 @@
       </el-table-column>
       <el-table-column label="是否头条" align="center" prop="isTop">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.sys_yes_no"/>
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isTop"/>
         </template>
       </el-table-column>
       <el-table-column label="驳回原因" align="center" prop="reason" />
@@ -107,7 +107,9 @@
             icon="el-icon-edit"
             @click="examine(scope.row)"
             v-hasPermi="['system:news:examine']"
+           :disabled="scope.row.status == 0"
           >通过审核</el-button>
+           <!-- :disabled="scope.row.status == 0" -->
           <el-button
             size="mini"
             type="text"
@@ -178,7 +180,7 @@
           <el-col :span="24">
             <el-form-item label="文章缩略图" prop="newsImage">
               <!-- <editor v-model="form.newsImage" :min-height="192" /> -->
-              <imageUpload v-model="form.newsImage" />
+              <imageUpload :limit="1" v-model="form.newsImage" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -194,9 +196,9 @@
         <el-form-item label="原因" prop="reason">
           <el-input v-model="form.reason" placeholder="请输入原因" />
         </el-form-item>-->
-        <el-form-item label="备注" prop="remark">
+        <!-- <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -262,7 +264,8 @@ export default {
         ]
       },
       boh:{},  //驳回原因
-      tableMaxHeight:300
+      tableMaxHeight:300,
+      nhye:false
     };
   },
   created() {
@@ -358,14 +361,17 @@ window.onresize = () => {
       });
     },
 
+
     /** 审核通过按钮操作 */
     examine(row) {
       const newsId = row.newsId || this.ids
-      examineNews(newsId).then(response => {
-        this.$modal.msgSuccess("审核成功");
-        this.open = false;
+
+      this.$modal.confirm('是否确认审核"' + newsId + '"的数据项？').then(function() {
+        return examineNews(newsId);
+      }).then(() => {
         this.getList();
-      });
+        this.$modal.msgSuccess("审核成功");
+      }).catch(() => {});
     },
 
     /** 驳回按钮操作 */

ruoyi-ui/src/views/system/queryConfig/index.vue

@@ -39,8 +39,8 @@
 
     <el-table v-loading="loading" :data="queryConfigList" @selection-change="handleSelectionChange"
       :max-height="tableMaxHeight">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="查询次数" align="center" prop="queryNumber"  />
+      <el-table-column  type="selection" width="55" align="center" />
+      <el-table-column  label="查询次数" align="center" prop="queryNumber"  />
       <el-table-column label="二维码失效时间" align="center" prop="qrTime"  />
       <el-table-column label="二维码失效单位" align="center" prop="qrUnit" >
         <template slot-scope="scope">

ruoyi-ui/src/views/system/queryLog/index.vue

@@ -120,12 +120,12 @@
     </el-row>
 
     <el-table  :max-height="tableMaxHeight" v-loading="loading" :data="queryLogList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="报告编号" align="center" prop="reportNumber" />
-      <el-table-column label="查询人姓名" align="center" prop="queryName" />
-      <el-table-column label="查询人手机号" align="center" prop="queryPhone" />
-      <el-table-column label="单位名称" align="center" prop="companyName" />
-      <el-table-column label="单位手机号" align="center" prop="companyPhone" />
+      <el-table-column fixed type="selection" width="55" align="center" />
+      <el-table-column fixed label="报告编号" align="center" prop="reportNumber" width="180"/>
+      <el-table-column label="查询人姓名" align="center" prop="queryName" width="90" />
+      <el-table-column label="查询人手机号" align="center" prop="queryPhone"  width="180"/>
+      <el-table-column label="单位名称" align="center" prop="companyName" width="180"/>
+      <el-table-column label="单位手机号" align="center" prop="companyPhone" width="180"/>
       <el-table-column label="查询主体" align="center" prop="queryType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.query_type" :value="scope.row.queryType"/>
@@ -136,15 +136,22 @@
           <dict-tag :options="dict.type.query_mode" :value="scope.row.queryMode"/>
         </template>
       </el-table-column>
-      <el-table-column label="查询码" align="center" prop="queryNum" />
-      <el-table-column label="验证码" align="center" prop="code" />
-      <el-table-column label="二维码" align="center" prop="qrImage" />
+      <el-table-column label="查询码" align="center" prop="queryNum" width="180"/>
+      <el-table-column label="验证码" align="center" prop="code" width="180"/>
+      <el-table-column label="二维码" align="center" prop="qrImage" width="180">
+        <template slot-scope="scope">
+        <img @click="imagew(scope.row.qrImage)" :src="defaultSettings.urls + '/prod-api' + scope.row.qrImage"
+          style="width: 120px;height: 120px;" v-if="scope.row.qrImage !== null" />
+          <span v-else>暂无数据</span>
+          </template>
+      </el-table-column>
+      <el-table-column label="提交时间" align="center" prop="createTime" width="160px"/>
       <el-table-column label="是否成功" align="center" prop="isSuccess">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isSuccess"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark" width="180"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -239,12 +246,15 @@
 <!--        <el-button @click="cancel">取 消</el-button>-->
       </div>
     </el-dialog>
+    <el-dialog title="图片预览" :visible.sync="opende" width="1000px" append-to-body style="text-align: center;">
+      <img :src="defaultSettings.urls + '/prod-api'+ urls" style="width: 80%;" >
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listQueryLog, getQueryLog, delQueryLog, addQueryLog, updateQueryLog } from "@/api/system/queryLog";
-
+const defaultSettings = require("@/settings.js");
 export default {
   name: "QueryLog",
   dicts: ['query_type', 'query_mode', 'sys_yes_no', 'is_del'],
@@ -256,18 +266,21 @@ export default {
       ids: [],
       // 非单个禁用
       single: true,
+      defaultSettings,
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
       total: 0,
+      urls:'',
       // 查询日志表格数据
       queryLogList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      opende:false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -319,6 +332,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.opende = false
       this.reset();
     },
     // 表单重置
@@ -406,6 +420,9 @@ export default {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
+    },
+    imagew(){
+
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -413,6 +430,11 @@ export default {
         ...this.queryParams
       }, `queryLog_${new Date().getTime()}.xlsx`)
     },
+    // 图片预览列表
+    imagew(index) {
+      this.urls = index
+      this.opende = true
+    },
     // 获取屏幕高度
     showFilterForm () {
           this.filterActive = !this.filterActive

ruoyi-ui/src/views/system/reportDetail/index.vue

@@ -10,28 +10,29 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="样品名称" prop="sampleName">
+      <el-form-item label="送检单位" prop="inspectName">
         <el-input
-          v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
+          v-model="queryParams.inspectName"
+          placeholder="请输入送检单位"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="送检单位名称" prop="inspectName">
+      <el-form-item label="样品名称" prop="sampleName">
         <el-input
-          v-model="queryParams.inspectName"
-          placeholder="请输入送检单位名称"
+          v-model="queryParams.sampleName"
+          placeholder="请输入样品名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="委托单位名称" prop="entrustName">
+
+      <el-form-item label="委托单位" prop="entrustName">
         <el-input
           v-model="queryParams.entrustName"
-          placeholder="请输入委托单位名称"
+          placeholder="请输入委托单位"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -90,38 +91,39 @@
     </el-row>
 
     <el-table  v-loading="loading" :data="reportDetailList" @selection-change="handleSelectionChange" :max-height="tableMaxHeight">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="报告ID" align="center" prop="reportId" />
-      <el-table-column label="报告编号" align="center" prop="reportNumber" />
-      <el-table-column label="样品名称" align="center" prop="sampleName" />
-      <el-table-column label="送检单位名称" align="center" prop="inspectName" />
-      <el-table-column label="委托单位名称" align="center" prop="entrustName" />
-      <el-table-column label="是否合格" align="center" prop="isQualify">
+      <el-table-column fixed type="selection" width="55" align="center" />
+      <!-- <el-table-column label="报告ID" align="center" prop="reportId" /> -->
+      <el-table-column fixed label="报告编号" align="center" prop="reportNumber" width="220"/>
+      <el-table-column label="样品名称" align="center" prop="sampleName" width="180px" />
+      <el-table-column label="送检单位名称" align="center" prop="inspectName" width="180px"/>
+      <el-table-column label="委托单位名称" align="center" prop="entrustName"  width="180px"/>
+      <el-table-column label="报告图片" align="center" prop="reportUrl"  width="180px">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isQualify"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="报告图片" align="center" prop="reportUrl"  width="110px">
-        <template slot-scope="scope">
-        <img @click="imagew(scope.row.reportUrl)" :src="defaultSettings.urls  + scope.row.reportUrl"
-          style="width: 100px;height: 100px;" v-if="scope.row.reportUrl !== null" />
+        <img @click="imagew(scope.row.reportUrl)" :src="defaultSettings.urls + '/prod-api'  + scope.row.reportUrl"
+          style="width: 120px;height: 120px;" v-if="scope.row.reportUrl !== null" />
           <span v-else>暂无数据</span>
           </template>
       </el-table-column>
-      <el-table-column label="二维码地址" align="center" prop="qrPath" width="110px" >
+      <el-table-column label="二维码" align="center" prop="qrPath" width="180px" >
         <template slot-scope="scope">
-        <img @click="imagew(scope.row.qrPath)" :src="defaultSettings.urls  + scope.row.qrPath"
-          style="width: 100px;height: 100px;" v-if="scope.row.qrPath !== null" />
+        <img @click="imagew(scope.row.qrPath)" :src="defaultSettings.urls  + '/prod-api' + scope.row.qrPath"
+          style="width: 120px;height: 120px;" v-if="scope.row.qrPath !== null" />
           <span v-else>暂无数据</span>
           </template>
       </el-table-column>
-      <el-table-column label="是否删除" align="center" prop="isDel">
+      <el-table-column label="提交时间" align="center" prop="createTime" width="160px"/>
+      <el-table-column label="是否合格" align="center" prop="isQualify" width="100px">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_del" :value="scope.row.isDel"/>
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isQualify"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="是否删除" align="center" prop="isDel">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_del" :value="scope.row.isDel"/>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="备注" align="center" prop="remark" width="120px"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -210,11 +212,6 @@
 
 
 
-
-
-
-
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -222,7 +219,7 @@
       </div>
     </el-dialog>
     <el-dialog title="图片预览" :visible.sync="opende" width="1000px" append-to-body style="text-align: center;">
-      <img :src="defaultSettings.urls + urls" style="width: 80%;" >
+      <img :src="defaultSettings.urls + '/prod-api' + urls" style="width: 80%;" >
     </el-dialog>
   </div>
 </template>

ruoyi-ui/vue.config.js

@@ -9,7 +9,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = defaultSettings.title || '印刷品质量检验平台' // 网页标题
+const name = defaultSettings.title || '刷制品质量监督检验中心' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 8090 // 端口