浏览代码

Merge branch 'deploy' of jianguan-web/qpls-it-html into master

陈瑞 3 年之前
父节点
当前提交
04eb46e223

+ 2 - 2
.env

@@ -5,5 +5,5 @@ VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=箭冠汽配IT系统
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_THEME_COLOR=#ed1c24
-VUE_APP_COM_NAME=广州市箭冠网络科技有限公司
-VUE_APP_ICP=粤ICP备10216726
+VUE_APP_COM_NAME=陕西山海高科信息技术有限公司
+VUE_APP_ICP=陕ICP备20006268

+ 2 - 2
.env.development

@@ -5,5 +5,5 @@ VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=箭冠汽配IT系统-dev
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_THEME_COLOR=#ed1c24
-VUE_APP_COM_NAME=广州市箭冠网络科技有限公司
-VUE_APP_ICP=粤ICP备10216726
+VUE_APP_COM_NAME=陕西山海高科信息技术有限公司
+VUE_APP_ICP=陕ICP备20006268

+ 2 - 2
.env.preview

@@ -5,5 +5,5 @@ VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=箭冠汽配IT系统-pre
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_THEME_COLOR=#ed1c24
-VUE_APP_COM_NAME=广州市箭冠网络科技有限公司
-VUE_APP_ICP=粤ICP备10216726
+VUE_APP_COM_NAME=陕西山海高科信息技术有限公司
+VUE_APP_ICP=陕ICP备20006268

+ 0 - 47
public/adapter.js

@@ -1,47 +0,0 @@
-//  非谷歌浏览器或非IE11时,则提示下载谷歌浏览器进行访问
-function BrowserType () {
-  var userAgent = navigator.userAgent // 取得浏览器的userAgent字符串
-  var isOpera = userAgent.indexOf('Opera') > -1 // 判断是否Opera浏览器
-  // var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1 && !isOpera; //判断是否IE浏览器
-  var isIE = window.ActiveXObject || 'ActiveXObject' in window
-  // var isEdge = userAgent.indexOf("Windows NT 6.1; Trident/7.0;") > -1 && !isIE; //判断是否IE的Edge浏览器
-  var isEdge = userAgent.indexOf('Edge') > -1 // 判断是否IE的Edge浏览器
-  var isFF = userAgent.indexOf('Firefox') > -1 // 判断是否Firefox浏览器
-  var isSafari = userAgent.indexOf('Safari') > -1 && userAgent.indexOf('Chrome') == -1 // 判断是否Safari浏览器
-  var isChrome = userAgent.indexOf('Chrome') > -1 && userAgent.indexOf('Safari') > -1 && !isEdge // 判断Chrome浏览器
-
-  if (isIE) {
-    var reIE = new RegExp('MSIE (\\d+\\.\\d+);')
-    reIE.test(userAgent)
-    var fIEVersion = parseFloat(RegExp['$1'])
-    if (userAgent.indexOf('MSIE 6.0') != -1) {
-      return 'IE6'
-    } else if (fIEVersion == 7) {
-      return 'IE7'
-    } else if (fIEVersion == 8) {
-      return 'IE8'
-    } else if (fIEVersion == 9) {
-      return 'IE9'
-    } else if (fIEVersion == 10) {
-      return 'IE10'
-    } else if (userAgent.toLowerCase().match(/rv:([\d.]+)\) like gecko/)) {
-      return 'IE11'
-    } else { // IE版本过低
-      return '0'
-    }
-  } // isIE end
-
-  if (isFF) { return 'FF' }
-  if (isOpera) { return 'Opera' }
-  if (isSafari) { return 'Safari' }
-  if (isChrome) { return 'Chrome' }
-  if (isEdge) { return 'Edge' }
-} // myBrowser() end
-
-if (BrowserType() != 'Chrome' && BrowserType() != 'IE11') {
-  var con = alert('当前浏览器版本过低,为保证更好体验请下载谷歌浏览器进行操作, 点击【确定】升级,如不升级您将不能正常浏览网页!' + '\n' + '下载地址:“https://www.google.cn/chrome”') // 在页面上弹出对话框
-  if (con == true) {} else {
-    window.location = 'https://www.google.cn/chrome'
-  }
-}
-//  升级ie  https://support.microsoft.com/zh-cn/help/17621/internet-explorer-downloads

+ 34 - 50
public/index.html

@@ -11,56 +11,40 @@
     <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
     <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" />
     <% } %>
-    <!-- <script src="./adapter.js" type="text/javascript"></script> -->
-    <script>
-      //  非谷歌浏览器或非IE11时,则提示下载谷歌浏览器进行访问
-      function BrowserType () {
-        var userAgent = navigator.userAgent // 取得浏览器的userAgent字符串
-        var isOpera = userAgent.indexOf('Opera') > -1 // 判断是否Opera浏览器
-        // var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1 && !isOpera; //判断是否IE浏览器
-        var isIE = window.ActiveXObject || 'ActiveXObject' in window
-        // var isEdge = userAgent.indexOf("Windows NT 6.1; Trident/7.0;") > -1 && !isIE; //判断是否IE的Edge浏览器
-        var isEdge = userAgent.indexOf('Edge') > -1 // 判断是否IE的Edge浏览器
-        var isFF = userAgent.indexOf('Firefox') > -1 // 判断是否Firefox浏览器
-        var isSafari = userAgent.indexOf('Safari') > -1 && userAgent.indexOf('Chrome') == -1 // 判断是否Safari浏览器
-        var isChrome = userAgent.indexOf('Chrome') > -1 && userAgent.indexOf('Safari') > -1 && !isEdge // 判断Chrome浏览器
-      
-        if (isIE) {
-          var reIE = new RegExp('MSIE (\\d+\\.\\d+);')
-          reIE.test(userAgent)
-          var fIEVersion = parseFloat(RegExp['$1'])
-          if (userAgent.indexOf('MSIE 6.0') != -1) {
-            return 'IE6'
-          } else if (fIEVersion == 7) {
-            return 'IE7'
-          } else if (fIEVersion == 8) {
-            return 'IE8'
-          } else if (fIEVersion == 9) {
-            return 'IE9'
-          } else if (fIEVersion == 10) {
-            return 'IE10'
-          } else if (userAgent.toLowerCase().match(/rv:([\d.]+)\) like gecko/)) {
-            return 'IE11'
-          } else { // IE版本过低
-            return '0'
-          }
-        } // isIE end
-      
-        if (isFF) { return 'FF' }
-        if (isOpera) { return 'Opera' }
-        if (isSafari) { return 'Safari' }
-        if (isChrome) { return 'Chrome' }
-        if (isEdge) { return 'Edge' }
-      } // myBrowser() end
-      
-      if (BrowserType() != 'Chrome' && BrowserType() != 'IE11') {
-        var con = alert('当前浏览器版本过低,为保证更好体验请下载谷歌浏览器进行操作, 点击【确定】升级,如不升级您将不能正常浏览网页!' + '\n' + '下载地址:“https://www.google.cn/chrome”') // 在页面上弹出对话框
-        if (con == true) {} else {
-          window.location = 'https://www.google.cn/chrome'
-        }
-      }
-      //  升级ie  https://support.microsoft.com/zh-cn/help/17621/internet-explorer-downloads
-    </script>
+     <script>
+     	//  非谷歌浏览器或非IE11时,则提示下载谷歌浏览器进行访问
+     	function BrowserType () {
+     	  var userAgent = navigator.userAgent // 取得浏览器的userAgent字符串
+     	  var isOpera = userAgent.indexOf('Opera') > -1 // 判断是否Opera浏览器
+     	  // var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1 && !isOpera; //判断是否IE浏览器
+     	  var isIE = window.ActiveXObject || 'ActiveXObject' in window
+     	  // var isEdge = userAgent.indexOf("Windows NT 6.1; Trident/7.0;") > -1 && !isIE; //判断是否IE的Edge浏览器
+     	  var isEdge = userAgent.indexOf('Edge') > -1 // 判断是否IE的Edge浏览器
+     	  var isFF = userAgent.indexOf('Firefox') > -1 // 判断是否Firefox浏览器
+     	  var isSafari = userAgent.indexOf('Safari') > -1 && userAgent.indexOf('Chrome') == -1 // 判断是否Safari浏览器
+     	  var isChrome = userAgent.indexOf('Chrome') > -1 && userAgent.indexOf('Safari') > -1 && !isEdge // 判断Chrome浏览器
+     	
+     	  if (isIE) {
+     	    var reIE = new RegExp('MSIE (\\d+\\.\\d+);')
+     	    reIE.test(userAgent)
+     	    var fIEVersion = parseFloat(RegExp['$1'])
+     		console.log(fIEVersion)
+     	    if (userAgent.indexOf('MSIE 6.0') != -1 || fIEVersion<11) {
+     	      var con = alert('当前浏览器版本过低,为保证更好体验请下载谷歌浏览器进行操作, 点击【确定】升级,如不升级您将不能正常浏览网页!' + '\n' + '下载地址:“https://www.google.cn/chrome”') // 在页面上弹出对话框
+     	      if (con == true) {} else {
+     	        window.location = 'https://www.google.cn/chrome'
+     	      }
+     	    }
+     	  } // isIE end
+     	
+     	  if (isFF) { return 'FF' }
+     	  if (isOpera) { return 'Opera' }
+     	  if (isSafari) { return 'Safari' }
+     	  if (isChrome) { return 'Chrome' }
+     	  if (isEdge) { return 'Edge' }
+     	} 
+     	BrowserType()
+     </script>
   </head>
   <body>
     <noscript>

+ 1 - 1
src/components/tools/UserMenu.vue

@@ -66,7 +66,7 @@ export default {
     handleLogout () {
       this.$confirm({
         title: '提示',
-        content: '真的要退出登录吗 ?',
+        content: '确定要退出登录吗 ?',
         onOk: () => {
           return this.Logout({}).then(() => {
             setTimeout(() => {

+ 10 - 10
src/store/modules/permission.js

@@ -9,16 +9,16 @@ import { asyncRouterMap, constantRouterMap } from '@/config/router.config'
  */
 function hasPermission (permission, route) {
   if (route.meta && route.meta.permission) {
-    // let flag = permission.find(item => {
-    //   return item&&item == route.meta.permission
-    // })
-    let flag = false
-    for (let i = 0, len = permission.length; i < len; i++) {
-      flag = route.meta.permission.includes(permission[i])
-      if (flag) {
-        return true
-      }
-    }
+    let flag = permission.find(item => {
+      return item&&item == route.meta.permission
+    })
+    // let flag = false
+    // for (let i = 0, len = permission.length; i < len; i++) {
+    //   flag = route.meta.permission.includes(permission[i])
+    //   if (flag) {
+    //     return true
+    //   }
+    // }
     return flag
   }
   return true

+ 3 - 1
src/views/bnSetting/menu/adminMenus.vue

@@ -102,8 +102,9 @@
           </a-form-item>
           <!-- 后台权限编码 -->
           <a-form-item label="后台权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
+            <a-textarea
               placeholder="请输入后台权限编码"
+              :auto-size="{ minRows: 2, maxRows: 6 }"
               v-decorator="[
                 'formData.permission',
                 {
@@ -396,6 +397,7 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           console.log(values.formData, ' formData.type222222222')
+          values.formData.permission = values.formData.permission.replace(/\//g, '_')
           saveYyMenu(Object.assign({ id: this.formData.id }, values.formData)).then(res => {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {

+ 3 - 1
src/views/bnSetting/menu/childModal.vue

@@ -79,8 +79,9 @@
         </a-form-item>
         <!-- 后台权限编码 -->
         <a-form-item label="后台权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
+          <a-textarea
             placeholder="请输入后台权限编码"
+            :auto-size="{ minRows: 2, maxRows: 6 }"
             v-decorator="[
               'formData.permission',
               {initialValue: formData.permission},
@@ -257,6 +258,7 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           console.log(values.formData, ' formData.type222222222')
+          values.formData.permission = values.formData.permission.replace(/\//g, '_')
           const saveRequest = this.parentType == 'store' ? saveMdMenu : saveYyMenu
           saveRequest(Object.assign(this.formData, values.formData)).then(res => {
             console.log(res, 'res--save')

+ 5 - 1
src/views/bnSetting/menu/storeMenus.vue

@@ -103,8 +103,9 @@
           </a-form-item>
           <!-- 后台权限编码 -->
           <a-form-item label="后台权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
+            <a-textarea
               placeholder="请输入后台权限编码"
+              :auto-size="{ minRows: 2, maxRows: 6 }"
               v-decorator="[
                 'formData.permission',
                 {
@@ -433,6 +434,9 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           console.log(values.formData, ' formData.type222222222')
+          if (values.formData.permission) {
+            values.formData.permission = values.formData.permission.replace(/\//g, '_')
+          }
           saveMdMenu(Object.assign({ id: this.formData.id }, values.formData)).then(res => {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {

+ 3 - 1
src/views/power/menu/childModal.vue

@@ -78,8 +78,9 @@
         </a-form-item>
         <!-- 后台权限编码 -->
         <a-form-item label="后台权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
+          <a-textarea
             placeholder="请输入后台权限编码"
+            :auto-size="{ minRows: 2, maxRows: 6 }"
             v-decorator="[
               'formData.permission',
               {initialValue: formData.permission},
@@ -220,6 +221,7 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           console.log(values.formData, ' formData.type222222222')
+          values.formData.permission = values.formData.permission.replace(/\//g, '_')
           saveMenu(Object.assign(this.formData, values.formData)).then(res => {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {

+ 6 - 2
src/views/power/menu/menu.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false">
     <a-row :gutter="24">
-      <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addChild">添加子菜单</a-button>
+      <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addChild">添加1子菜单</a-button>
       <a-button style="margin-right: 10px;background-color: #19be6b;color: #fff;" type="" icon="plus" @click="addTitle">添加顶部菜单</a-button>
       <a-button style="margin-right: 10px;background-color: red;color: #fff;" type="" icon="delete" @click="delect()">删除</a-button>
 
@@ -103,8 +103,9 @@
           </a-form-item>
           <!-- 后台权限编码 -->
           <a-form-item label="后台权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
+            <a-textarea
               placeholder="请输入后台权限编码"
+              :auto-size="{ minRows: 2, maxRows: 6 }"
               v-decorator="[
                 'formData.permission',
                 {
@@ -397,6 +398,9 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           console.log(values.formData, ' formData.type222222222')
+          if (values.formData.permission) {
+            values.formData.permission = values.formData.permission.replace(/\//g, '_')
+          }
           saveMenu(Object.assign({ id: this.formData.id }, values.formData)).then(res => {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {

+ 0 - 21
src/views/power/role/roleList.vue

@@ -27,7 +27,6 @@
         </a-row>
       </a-form>
     </div>
-    <a-divider />
     <div class="table-operator">
       <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal">新增</a-button>
     </div>
@@ -241,25 +240,5 @@ export default {
 }
 </script>
 <style scoped>
-	.table-page-search-wrapper .ant-form-inline .ant-form-item {
-		margin-bottom: 0;
-	}
 
-	.action-button {
-		line-height: 40px;
-		white-space: nowrap;
-		padding: 5px 10px;
-		background-color: #1890ff;
-		border-radius: 4px;
-		color: #fff;
-		margin-right: 5px;
-	}
-
-	.red-text {
-		background-color: red;
-	}
-
-	.menu-text {
-		background-color: #f90;
-	}
 </style>

+ 2 - 2
vue.config.js

@@ -108,8 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.16.103:8501/qpls-it',
-        target: 'http://qpls-it.360arrow.com.cn/qpls-it',
+        target: 'http://192.168.16.103:8501/qpls-it',
+        // target: 'http://qpls-it.360arrow.com.cn/qpls-it',
         // target: 'https://it.test.qiubcar.com/zyit',
         ws: false,
         changeOrigin: true,