Browse Source

20220812

master
DESKTOP-00SUCB6\Administrator 3 years ago
parent
commit
3b6bddc49f
  1. 2
      .env.development
  2. 6
      .env.production
  3. 2
      public/h5/info.html
  4. 2
      public/index.html
  5. 1
      src/permission.js
  6. 1
      src/router/index.js
  7. 1
      src/views/company/manager.vue
  8. 2
      src/views/company/search.vue
  9. 1
      src/views/home/index2.vue
  10. 9
      src/views/system/qualification/index.vue
  11. 2
      vue.config.js

2
.env.development

@ -2,7 +2,7 @@
ENV = 'development' ENV = 'development'
# 若依管理系统/开发环境 # 若依管理系统/开发环境
VUE_APP_BASE_API = 'http://121.36.65.171:9527' VUE_APP_BASE_API = 'http://124.70.15.185:9527'
VUE_APP_H5_QR = 'http://172.119.51.219/h5/invitation.html' VUE_APP_H5_QR = 'http://172.119.51.219/h5/invitation.html'
VUE_APP_H5_INFO = 'http://172.119.51.219/h5/info.html' VUE_APP_H5_INFO = 'http://172.119.51.219/h5/info.html'
#VUE_APP_BASE_API = 'http://172.119.50.181:9527' #VUE_APP_BASE_API = 'http://172.119.50.181:9527'

6
.env.production

@ -2,6 +2,6 @@
ENV = 'production' ENV = 'production'
# 若依管理系统/生产环境 # 若依管理系统/生产环境
VUE_APP_BASE_API = 'http://121.36.65.171:9527' VUE_APP_BASE_API = 'http://124.70.15.185:9527'
VUE_APP_H5_QR = 'http://121.36.65.171:8778/h5/invitation.html' VUE_APP_H5_QR = 'http://124.70.15.185:8778/h5/invitation.html'
VUE_APP_H5_INFO = 'http://121.36.65.171:8778/h5/info.html' VUE_APP_H5_INFO = 'http://124.70.15.185:8778/h5/info.html'

2
public/h5/info.html

@ -270,7 +270,7 @@
var uuid = ""; var uuid = "";
var enterpriseid= ""; var enterpriseid= "";
var infoOpen = ''; var infoOpen = '';
var baseUrlIp = "http://121.36.65.171:9527"; var baseUrlIp = "http://124.70.15.185:9527";
var enterpriseTpyeOption = ['政府机关','研究机构','社会团体','企业事业单位'] var enterpriseTpyeOption = ['政府机关','研究机构','社会团体','企业事业单位']
function getEnterpriseOptions () { function getEnterpriseOptions () {
$.ajax({ $.ajax({

2
public/index.html

@ -8,6 +8,7 @@
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= webpackConfig.name %></title> <title><%= webpackConfig.name %></title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]--> <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
</head>
<style> <style>
html, html,
body, body,
@ -194,7 +195,6 @@
opacity: 0.5; opacity: 0.5;
} }
</style> </style>
</head>
<body> <body>
<div id="app"> <div id="app">
<div id="loader-wrapper"> <div id="loader-wrapper">

1
src/permission.js

@ -8,7 +8,6 @@ import { getToken } from '@/utils/auth'
NProgress.configure({ showSpinner: false }) NProgress.configure({ showSpinner: false })
const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/retrievePassword'] const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/retrievePassword']
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
NProgress.start() NProgress.start()
// next() // next()

1
src/router/index.js

@ -232,6 +232,7 @@ export const constantRoutes = [
export default new Router({ export default new Router({
mode: 'history', // 去掉url中的# mode: 'history', // 去掉url中的#
base: '/',
scrollBehavior: () => ({ y: 0 }), scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes routes: constantRoutes
}) })

1
src/views/company/manager.vue

@ -53,6 +53,7 @@
<el-table v-loading="loading" :data="enterpriseManagerList"> <el-table v-loading="loading" :data="enterpriseManagerList">
<el-table-column label="企业名称" align="center" prop="name" /> <el-table-column label="企业名称" align="center" prop="name" />
<el-table-column label="统一社会信用代码" align="center" prop="corporateUnifiedSocialCreditCode" /> <el-table-column label="统一社会信用代码" align="center" prop="corporateUnifiedSocialCreditCode" />
<el-table-column label="企业前缀" align="center" prop="entPrefix" />
<el-table-column label="联系人姓名" align="center" prop="duty" /> <el-table-column label="联系人姓名" align="center" prop="duty" />
<el-table-column label="联系方式" align="center" prop="contactInformation" /> <el-table-column label="联系方式" align="center" prop="contactInformation" />
<el-table-column label="详细地址" align="center" prop="address" /> <el-table-column label="详细地址" align="center" prop="address" />

2
src/views/company/search.vue

@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<div class="search-form" > <div class="search-form" >
<div class="search-top"> <div class="search-top">
<img src="@/assets/images/search.png" class="search"> <img src="../../assets/images/search.png" class="search">
<label for="searchForm">食品原料供应商资质检索</label> <label for="searchForm">食品原料供应商资质检索</label>
</div> </div>
<el-input v-model="searchParam" placeholder="搜企业、法人" @keyup.enter.native="search"> <el-input v-model="searchParam" placeholder="搜企业、法人" @keyup.enter.native="search">

1
src/views/home/index2.vue

@ -24,6 +24,7 @@
<div><label class="company-info-lable text-muted">用户名</label><p class="company-info-span">{{companyInfo.userName}}</p></div> <div><label class="company-info-lable text-muted">用户名</label><p class="company-info-span">{{companyInfo.userName}}</p></div>
<!-- <div><label class="company-info-lable text-muted">手机号</label><p class="company-info-span">{{companyInfo.phonenumber}}</p></div> --> <!-- <div><label class="company-info-lable text-muted">手机号</label><p class="company-info-span">{{companyInfo.phonenumber}}</p></div> -->
<div><label class="company-info-lable text-muted">上次登录时间</label><p class="company-info-span">{{companyInfo.loginDate}}</p></div> <div><label class="company-info-lable text-muted">上次登录时间</label><p class="company-info-span">{{companyInfo.loginDate}}</p></div>
<div v-if="companyInfo.industrialInternetCertificationStatus == 1" ><label class="company-info-lable text-muted">企业前缀:</label><p class="company-info-span">{{companyInfo.entPrefix}}</p></div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form ref="form" :model="form" label-width="90px" label-position="top"> <el-form ref="form" :model="form" label-width="90px" label-position="top">

9
src/views/system/qualification/index.vue

@ -76,14 +76,15 @@
<el-table-column label="企业名称" align="center" prop="enterpriseName" /> <el-table-column label="企业名称" align="center" prop="enterpriseName" />
<el-table-column label="资质名称" align="center" prop="qualificationName" /> <el-table-column label="资质名称" align="center" prop="qualificationName" />
<el-table-column label="资质证书号" align="center" prop="qualificationCertificateNumber" /> <el-table-column label="资质证书号" align="center" prop="qualificationCertificateNumber" />
<el-table-column label="证书编码" align="center" prop="identitCode" />
<el-table-column label="发证机关" align="center" prop="issuingAuthority" /> <el-table-column label="发证机关" align="center" prop="issuingAuthority" />
<el-table-column label="发证日期" align="center" prop="dateOfIssue" width="180"> <el-table-column label="发证日期" align="center" prop="dateOfIssue" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.dateOfIssue, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.dateOfIssue, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="证书有效期" align="center" prop="certificateValidityPeriod" /> <el-table-column label="证书有效期" align="center" prop="certificateValidityPeriod" width="150"/>
<el-table-column label="证书状态" align="center" prop="isOverTime"> <el-table-column label="证书状态" align="center" prop="isOverTime" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.isOverTime == 0" class="text-navy">正常</span> <span v-if="scope.row.isOverTime == 0" class="text-navy">正常</span>
<span v-else-if="scope.row.isOverTime == 1" class="text-warning">临期</span> <span v-else-if="scope.row.isOverTime == 1" class="text-warning">临期</span>
@ -91,7 +92,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否公开" align="center" prop="isItPublic"> <el-table-column label="是否公开" align="center" prop="isItPublic" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.isItPublic == 0 ? '是':'否'}} {{scope.row.isItPublic == 0 ? '是':'否'}}
</template> </template>

2
vue.config.js

@ -17,7 +17,7 @@ module.exports = {
// 部署生产环境和开发环境下的URL。 // 部署生产环境和开发环境下的URL。
// 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
publicPath: process.env.NODE_ENV === "production" ? "./" : "/", publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
// 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist) // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
outputDir: 'dist', outputDir: 'dist',
// 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下) // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)

Loading…
Cancel
Save