From 8bedbf182238536d1e30cbe0a99613a486818dec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 7 Jun 2021 10:25:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=9E=E6=80=A7=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue              | 36 +++++++++---------
 .../pages/attributeCustom/components/buss.vue | 10 ++---
 .../pages/attributeCustom/components/laws.vue |  8 ++--
 .../attributeCustom/components/stand.vue      |  8 ++--
 .../pages/standLawsAttrManage/index.vue       | 16 ++++----
 src/pages/localTool/standardWarning.vue       | 38 -------------------
 src/sysConfig/index.js                        |  8 ++--
 7 files changed, 43 insertions(+), 81 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index b35116d0b..a5cae192b 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -276,17 +276,17 @@ export default {
         //     }
         //   ]
         // },
-        // {
-        //   title: '配置管理',
-        //   path: '/config',
-        //   'icon-class': 'conf',
-        //   menuId: '95KGANGWCV',
-        //   children: [
-        //     {
-        //       title: '标准法规属性管理',
-        //       path: '/standLawsAttrManage',
-        //       menuId: 'C5VHBSYRMA'
-        //     },
+        {
+          title: '配置管理',
+          path: '/config',
+          'icon-class': 'conf',
+          menuId: '95KGANGWCV',
+          children: [
+            {
+              title: '标准法规属性管理',
+              path: '/standLawsAttrManage',
+              menuId: 'C5VHBSYRMA'
+            },
         //     {
         //       title: '资料中心管理',
         //       path: '/dynamicInformationManage',
@@ -330,11 +330,11 @@ export default {
         //       path: '/DynamicInformations',
         //       menuId: '3C87BSHJUF'
         //     },
-        //     {
-        //       title: '标准属性自定义',
-        //       path: '/attributeCustom',
-        //       menuId: 'PGPZXNUFEXC85BVPV9AU'
-        //     },
+            {
+              title: '标准属性自定义',
+              path: '/attributeCustom',
+              menuId: 'PGPZXNUFEXC85BVPV9AU'
+            },
         //     // {
         //     //   title: '流程分类管理',
         //     //   path: '/processClassificationManage',
@@ -355,8 +355,8 @@ export default {
         //       path: '/enterpriseStandardNumberManagement',
         //       menuId: '9YSFG39S3CBFUJCEU3QX'
         //     }
-        //   ]
-        // },
+          ]
+        },
         // {
         //   title: '个人中心',
         //   path: '/personal',
diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue
index 75ee3b1e2..728c33ecc 100644
--- a/src/pages/config/pages/attributeCustom/components/buss.vue
+++ b/src/pages/config/pages/attributeCustom/components/buss.vue
@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" v-btn-permission="'7UARYUBX8J8BX3ELZDH2'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
-      <el-button class="common-button-default" v-btn-permission="'8QSDDR8R7UMDS9S6M2HU'" @click="showDisplayLocationDialog" >展示区域管理</el-button>
+      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="'7UARYUBX8J8BX3ELZDH2'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
+      <el-button class="common-button-default" size="mini" v-btn-permission="'8QSDDR8R7UMDS9S6M2HU'" @click="showDisplayLocationDialog" >展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
@@ -189,7 +189,7 @@
       </div>
       <div id="roleFormButton" class="demo-drawer-footer">
         <el-button
-          round
+          size="mini"
           class="common-button-primary"
           icon="el-icon-check"
           type="primary"
@@ -470,7 +470,7 @@ export default {
       this.$confirm('确认删除该条数据？', {
         title: '确认删除',
         confirmButtonClass: 'common-button-primary',
-        roundButton: true,
+        roundButton: false,
         callback: (action, instance) => {
           if (action === 'confirm') {
             const {id} = data
@@ -674,7 +674,7 @@ export default {
         this.$confirm('确认删除选中数据？',{
           title: '提示',
           confirmButtonClass: 'common-button-primary',
-          roundButton: true,
+          roundButton: false,
           callback: (action, instance) => {
             if (action === 'confirm') {
               this.$http.put('lawss/sarStandAttrDetails/deleteByIds', {
diff --git a/src/pages/config/pages/attributeCustom/components/laws.vue b/src/pages/config/pages/attributeCustom/components/laws.vue
index 0336d42ba..17b16c7d0 100644
--- a/src/pages/config/pages/attributeCustom/components/laws.vue
+++ b/src/pages/config/pages/attributeCustom/components/laws.vue
@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" type="primary" v-btn-permission="'H9WU2ZJHG5WNTY5MDUXH'" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
-      <el-button class="common-button-default" @click="showDisplayLocationDialog" v-btn-permission="'XT94XKWBCTELWNJQVYCU'">展示区域管理</el-button>
+      <el-button class="common-button-primary add-button" size="mini" type="primary" v-btn-permission="'H9WU2ZJHG5WNTY5MDUXH'" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
+      <el-button class="common-button-default" size="mini" @click="showDisplayLocationDialog" v-btn-permission="'XT94XKWBCTELWNJQVYCU'">展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
@@ -459,7 +459,7 @@ export default {
     removeDisplayLocation (data) {
       this.$confirm('确认删除该条数据？', {
         confirmButtonClass: 'common-button-primary',
-        roundButton: true,
+        roundButton: false,
         title: '确认删除',
         callback: (action, instance) => {
           if (action === 'confirm') {
@@ -658,7 +658,7 @@ export default {
         this.$confirm('确认删除选中数据？', {
           title: '提示',
           confirmButtonClass: 'common-button-primary',
-          roundButton: true,
+          roundButton: false,
           callback: (action, instance) => {
             if (action === 'confirm') {
               this.$http.put('lawss/sarStandAttrDetails/deleteByIds', {
diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue
index 5a121e29f..7e73e4779 100644
--- a/src/pages/config/pages/attributeCustom/components/stand.vue
+++ b/src/pages/config/pages/attributeCustom/components/stand.vue
@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" v-btn-permission="'EAT8LJFSP6P4QMR6M8F4'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
-      <el-button class="common-button-default" v-btn-permission="'Q2AQMSUHKZDKLXJBHJEN'" @click="showDisplayLocationDialog">展示区域管理</el-button>
+      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="'EAT8LJFSP6P4QMR6M8F4'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
+      <el-button class="common-button-default" size="mini" v-btn-permission="'Q2AQMSUHKZDKLXJBHJEN'" @click="showDisplayLocationDialog">展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
@@ -459,7 +459,7 @@ export default {
       this.$confirm('确认删除该条数据？', {
         title: '确认删除',
         confirmButtonClass: 'common-button-primary',
-        roundButton: true,
+        roundButton: false,
         callback: (action, instance) => {
           if (action === 'confirm') {
             const {id} = data
@@ -657,7 +657,7 @@ export default {
         this.$confirm('确认删除选中数据？', {
           title: '提示',
           confirmButtonClass: 'common-button-primary',
-          roundButton: true,
+          roundButton: false,
           callback: (action, instance) => {
             if (action === 'confirm') {
               this.$http.put('lawss/sarStandAttrDetails/deleteByIds', {
diff --git a/src/pages/config/pages/standLawsAttrManage/index.vue b/src/pages/config/pages/standLawsAttrManage/index.vue
index 743be9fdf..2c6ab49c7 100644
--- a/src/pages/config/pages/standLawsAttrManage/index.vue
+++ b/src/pages/config/pages/standLawsAttrManage/index.vue
@@ -33,7 +33,7 @@
               class="common-button-primary"
               type="primary"
               icon="el-icon-search"
-              round
+              size="mini"
               @click="searchBtn"
             ></el-button>
           </el-form-item>
@@ -42,7 +42,7 @@
               class="common-button-default"
               icon="el-icon-refresh-left"
               @click="resetSelect"
-              round
+              size="mini"
             ></el-button>
           </el-form-item>
         </el-form>
@@ -51,12 +51,12 @@
         <el-button
           type="primary"
           class="common-button-primary"
-          round
+          size="mini"
           @click="showAddModel(1, null)"
           v-btn-permission="'29YZ482LEHRJJXELWZGG'"
           ><i class="iconfont">&#xe84e;</i>新增</el-button
         >
-        <el-button @click="deleteAttr" round class="common-button-default" v-btn-permission="T97J4LTH3TP36CREJ62A"
+        <el-button @click="deleteAttr" size="mini" class="common-button-default" v-btn-permission="T97J4LTH3TP36CREJ62A"
           ><i class="iconfont">&#xe61b;</i>删除</el-button
         >
       </div>
@@ -262,13 +262,13 @@
         <el-button
           type="primary"
           class="common-button-primary"
-          round
+          size="mini"
           icon="el-icon-check"
           @click="saveInfo"
           >提交</el-button
         >
         <el-button
-          round
+          size="mini"
           icon="el-icon-close"
           class="common-button-default"
           @click="cancelModel"
@@ -520,7 +520,7 @@ export default {
         confirmButtonText: '确定',
         confirmButtonClass: 'common-button-primary',
         cancelButtonText: '取消',
-        roundButton: true,
+        roundButton: false,
         type: 'warning'
       })
         .then(() => {
@@ -604,7 +604,7 @@ export default {
           confirmButtonText: '确定',
           confirmButtonClass: 'common-button-primary',
           cancelButtonText: '取消',
-          roundButton: true,
+          roundButton: false,
           type: 'warning'
         }).then(() => {
           this.$http.put(
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 67f5f71d9..077ce9fb5 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -9,8 +9,6 @@
             <el-tab-pane label="标准预警" name="STANDARD">
               <div class="dynamic-content">
                 <h5>实施预警</h5>
-                <!--          <div class="dynamic-line"></div>-->
-                <!-- <span class="more" @click="dynamicWarning">更多</span> -->
                 <div class="more">
                   <el-form :inline="true" :model="dynamic" class="demo-form-inline">
                     <el-form-item label="适用车型">
@@ -425,42 +423,6 @@ export default {
     searchBtnClick() {
       console.log("查找适用车型");
     },
-    /**
-     * @author liruohao
-     * @date 2019/4/25
-     * @Description: 标准跳页
-     */
-    // showStandDetails (item) {
-    //   this.$store.commit('setDetailMap', this.$route.path)
-    //   if (item.sortName === 'BUSINESS_STAND') {
-    //     let routeUrl = this.$router.resolve({
-    //       name: 'OtherBussStandardDetails',
-    //       params: {
-    //         id: item.sarId,
-    //         pageType: item.sortName
-    //       }
-    //     })
-    //     window.open(routeUrl.href, '_blank')
-    //   } else if (item.sortName === 'INLAND_STAND' || item.sortName === 'FOREIGN_STAND') {
-    //     let routeUrl = this.$router.resolve({
-    //       name: 'OtherStandardDetails',
-    //       params: {
-    //         id: item.sarId,
-    //         pageType: item.sortName
-    //       }
-    //     })
-    //     window.open(routeUrl.href, '_blank')
-    //   } else if (item.sortName === 'INLAND_LAWS' || item.sortName === 'FOREIGN_LAWS') {
-    //     let routeUrl = this.$router.resolve({
-    //       name: 'OtherLawsDetails',
-    //       params: {
-    //         id: item.sarId,
-    //         pageType: item.sortName
-    //       }
-    //     })
-    //     window.open(routeUrl.href, '_blank')
-    //   }
-    // },
     showStandDetails(item) {
       let getStandId = item.sarId;
       let getStandType = item.sortName;
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index d38a94ea4..499dbd32c 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -4,10 +4,10 @@
  * @date: 2018-09-04 17:47:46
  */
 // 服务器地址
-// const devIp = '192.168.10.211'
-// const devInterfacePORT = '8888'
-const devIp = '192.168.10.145'
-const devInterfacePORT = '9999'
+const devIp = '39.98.140.126'
+const devInterfacePORT = '10005'
+// const devIp = '192.168.10.145'
+// const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'