标准清单 检索中心

src/App.vue

@@ -214,6 +214,8 @@ export default {
     width: 100%;
     height: 100%;
     overflow-y: auto;
+    background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
+    background-size: 100%;
     & > div{
       position: absolute;
       top: 0;

src/assets/styles/common.less

@@ -50,7 +50,7 @@
 #app{
   &.theme-one {
     //background: url('~@/assets/images/shangqi/home/home-bg.png') no-repeat;
-    background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
+    //background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
     background-size: cover;
   }
   input:focus{

src/components/personalCenter/index.vue

@@ -101,7 +101,7 @@ export default {
       display: inline-block;
       width: 160px;
       height: 61px;
-      background: url("~@/assets/images/shangqi/home/logo-bg.png") no-repeat;
+      background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat;
       background-size: cover;
       cursor: pointer;
     }

src/pages/home1/components/navMenu/index.vue

@@ -3,8 +3,8 @@
   <div class="nav-menu">
     <div class="lattice">
       <div class="menu-wrap">
-        <enter-card  label="高级检索" path="/" style="margin-left:0px;"></enter-card>
+        <enter-card  label="高级检索" path="/advancedSearch" style="margin-left:0px;"></enter-card>
-        <enter-card  label="个人中心" path="/"></enter-card>
+        <enter-card  label="个人中心" path="/collection"></enter-card>
         <enter-card  label="统计图表" path="/"></enter-card>
       </div>
      <div class="menu-wrap">

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue

@@ -346,7 +346,7 @@ export default {
     editTable(item) {
       sessionStorage.setItem("accessRow", JSON.stringify(item));
       this.$router.push({
-        name: "ListOfStandardsAndRegulationsDetails",
+        name: "OtherAddEit",
         query: {
           id: item.id
         }

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -349,7 +349,7 @@ export default {
     editTable(item) {
       sessionStorage.setItem("accessRow", JSON.stringify(item));
       this.$router.push({
-        name: "ListOfStandardsAndRegulationsDetails",
+        name: "ProjectAddEit",
         query: {
           id: item.id
         }

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -544,6 +544,7 @@ export default {
         // region: '', // 区域
         countryArea: '', // 国家
         keywords: '', // 关键字
+        detailedListName: '', //清单名称
         applyArctic: '', // 能源种类
         // category: '', // 所属专业领域
         // applyArctic: '', // 适用车型
@@ -917,12 +918,7 @@ export default {
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
-      // this.sarAccessInfoSearch.applyArctic = '' // 适用车型
       this.sarAccessInfoSearch.applyArctic = '' // 能源种类
-      // this.sarAccessInfoSearch.category = '' // 所属专业领域
-      // this.sarAccessInfoSearch.applyAuth = '' // 认证类型
-      // this.sarAccessInfoSearch.country = '' // 国家
-      // this.sarAccessInfoSearch.region = '' // 区域
       this.sarAccessInfoSearch.keywords = '' // 关键字
       this.sarAccessInfoSearch.accessSarType = 'SKILL' // 清单类型
       this.sarAccessInfoSearch.askType = '' // 监管类型
@@ -935,7 +931,6 @@ export default {
     dataSourceChange (val) {
       this.isListType = val === 'TEMP'
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
-      this.$refs.advancedQuery.clearAllSearch()
       // 国内标准法规可查字段
       if (val === 'INLAND_STAND'){
         this.twoOptions=[
@@ -1459,6 +1454,7 @@ export default {
           sarAccessEO.inforlist = JSON.stringify(rowlist)
           sarAccessEO.adminInfoList = JSON.stringify(rowList2)
           sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
+          sarAccessEO.detailedListName = sarAccessEO.detailedListName.join(',')
           // 判断是否有附件
           if (this.fileInfoList.length > 0) {
             let relateFile = []
@@ -2215,7 +2211,7 @@ export default {
       this.$nextTick(() => {
         this.sarAccessEO.type = accessRow.type
         this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
-        this.sarAccessEO.accessContent = accessRow.accessContent
+        this.sarAccessEO.detailedListName = accessRow.detailedListName
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -115,7 +115,7 @@
             fixed="left"
             label="标准号">
             <template slot-scope="scope">
-              <a class="table-jump"  @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -125,7 +125,7 @@
             fixed="left"
           >
             <template slot-scope="scope">
-              <a class="table-jump"  @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -134,7 +134,7 @@
             fixed="left"
             label="英文名称">
             <template slot-scope="scope">
-              <a class="table-jump"  @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -190,7 +190,7 @@
       </el-form>
       <span slot="footer" class="demo-drawer-footer">
         <el-button class="common-button-default" icon="el-icon-close" @click="cancal">取消</el-button>
-        <el-button type="primary" round class="common-button-primary" icon="el-icon-check"
+        <el-button type="primary" class="common-button-primary" icon="el-icon-check"
                    @click="exportTestItem">提交</el-button>
       </span>
     </el-dialog>
@@ -222,6 +222,8 @@
 </template>
 
 <script>
+import { interfaceUrl } from "@/sysConfig";
+
 export default {
   name: "AccessStandardDetails",
   data() {
@@ -234,19 +236,18 @@ export default {
       heightShow: true,
       dataLoading: false,
       standardForm: {
-        standNumber: '',
+
-        standName:  '',
+        standNumber: "",
-        responseUnit:'',
+        standName: "",
+        responseUnit: "",
         page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: this.$store.getters.userInfo.configContent
       },
       page: 1,
       // pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
       stateList: [], // 标准状态列表
       activeName: "SKILL", // 当前激活
-      // 导出文件模态框控制，和文件名称
-      saveExportType: "",
       exportModelFlag: false,
       exportName: "",
       standType: "INLAND",
@@ -255,6 +256,9 @@ export default {
       loading: false,
       accessSarType: "",
       selectedList: [],
+      pageId: '',
+      // 导出文件模态框控制，和文件名称
+      saveExportType: "",
       depNode: [], // 部门树
       sarAccessEO: {},
       fileInfoList: [],
@@ -302,14 +306,16 @@ export default {
     },
     // 根据准入id查询标准法规详情
     selectInfobyAccid() {
+      console.log('309',this.pageId);
       this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
         ...this.standardForm,
+        id: this.pageId,
       }, {
         _this: this
       }, res => {
-            this.standinfoList = res.data
+        this.standinfoList = res.data;
-            this.total = res.data.total
+        this.total = res.data.total;
-      },e => {
+      }, e => {
 
       });
     },
@@ -330,12 +336,17 @@ export default {
     // 重置搜索
     resetSelect() {
       this.standardForm = {
-          standName:  '',
+        standName: "",
-          responseUnit:'',
+        responseUnit: ""
-      }
+      };
       this.selectInfobyAccid();
     },
     exportStandard() {
+      if (this.selectedList.length > 0) {
+        this.saveExportType = "apart";
+      } else {
+        this.saveExportType = "all";
+      }
       this.exportName = "";
       this.exportModelFlag = true;
     },
@@ -344,7 +355,23 @@ export default {
       this.exportModelFlag = false;
     },
     // 导出确定功能
-    exportTestItem() {
+    //确认导出
+    exportTestItem () {
+      if(this.saveExportType === 'apart') {
+        if (this.selectedList != null && this.selectedList != ''){
+          const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?' +
+            'exportType' + this.saveExportType + '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
+          window.open(exportURL)
+          this.$message.success('导出信息成功')
+        }
+      } else if (this.saveExportType === 'all') {
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?' +
+          'exportType' + this.saveExportType + '&id=' + this.pageId + '&exportName=' + this.exportName
+        window.open(exportURL)
+        this.$message.success('导出信息成功')
+      }
+      this.exportModelFlag = false
+      this.selectedList = []
     },
     // tab页切换
     handleClick(tab, event) {
@@ -355,8 +382,11 @@ export default {
       this.selectInfobyAccid();
     },
     // 修改成表格样式后，选择项勾选改变
-    standSelectChange(selected) {
+    standSelectChange (data) {
-      this.selectedList = selected;
+      this.selectedList = []
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList.push(data[i].id)
+      }
     },
     pageChange(page) {
       this.standardForm.page = page;
@@ -506,12 +536,12 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
+      let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
+      this.pageId = accessRow.id
+      this.sarAccessEO = accessRow;
       this.selectInfobyAccid();
       this.getOrgTreeSource();
-      let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
-      this.sarAccessEO = accessRow;
       this.getFileInfo();
-      console.log("1818", this.selectInfobyAccid());
     });
 
     // 从数据库中查询各下拉框数据

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -920,7 +920,6 @@ export default {
     dataSourceChange (val) {
       this.isListType = val === 'TEMP'
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
-      this.$refs.advancedQuery.clearAllSearch()
       // 国内标准法规可查字段
       if (val === 'INLAND_STAND'){
         this.twoOptions=[
@@ -1441,9 +1440,6 @@ export default {
             rowList2.push(this.sarAccessInfoListADMIN[i])
           }
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
-          sarAccessEO.inforlist = JSON.stringify(rowlist)
-          sarAccessEO.adminInfoList = JSON.stringify(rowList2)
-          sarAccessEO.country = sarAccessEO.countryArea.join(',')
           // 判断是否有附件
           if (this.fileInfoList.length > 0) {
             let relateFile = []
@@ -1486,6 +1482,7 @@ export default {
           this.$message.error('请检查表单是否填写正确')
         }
       })
+
     },
     // 查询数据搜索 table 数据
     selectLawsStands () {
@@ -2199,8 +2196,10 @@ export default {
       let accessRow = JSON.parse(sessionStorage.getItem('accessRow'))
       this.$nextTick(() => {
         this.sarAccessEO.type = accessRow.type
-        this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
+        // this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
-        this.sarAccessEO.accessContent = accessRow.accessContent
+        // this.sarAccessEO.accessContent = accessRow.accessContent
+        this.sarAccessEO.detailedListName = accessRow.detailedListName //清单名称
+        this.sarAccessEO.detailedList = accessRow.detailedList //清单类别
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -920,7 +920,6 @@ export default {
     dataSourceChange (val) {
       this.isListType = val === 'TEMP'
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
-      this.$refs.advancedQuery.clearAllSearch()
       // 国内标准法规可查字段
       if (val === 'INLAND_STAND'){
         this.twoOptions=[
@@ -1443,7 +1442,6 @@ export default {
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
           sarAccessEO.adminInfoList = JSON.stringify(rowList2)
-          sarAccessEO.country = sarAccessEO.countryArea.join(',')
           // 判断是否有附件
           if (this.fileInfoList.length > 0) {
             let relateFile = []
@@ -1709,7 +1707,7 @@ export default {
           this.addEntryForm.XGBMName = this.addEntryForm.XGBMName || this.addEntryForm.xgbmname
           this.addEntryForm.XGBM = this.addEntryForm.XGBM || this.addEntryForm.xgbm
           // this.addEntryForm.GXHBQ = this.addEntryForm.GXHBQ || this.addEntryForm.gxhbq
-          this.addEntryForm.applyArctic = this.addEntryForm.applyArctic ? this.addEntryForm.applyArctic.split(',') : []
+          // this.addEntryForm.applyArctic = this.addEntryForm.applyArctic ? this.addEntryForm.applyArctic.split(',') : []
           // this.addEntryForm.GXHBQ = this.addEntryForm.gxhbq ? this.addEntryForm.gxhbq.split(',') : []
           // this.addEntryForm.GXHBQ = ''
           // delete this.addEntryForm.gxhbq
@@ -1932,7 +1930,7 @@ export default {
       this.sarStandardsInfoEO.XMPGJSName = item.proEssessUser // 项目评估人员
       this.sarStandardsInfoEO.standNature = item.natureId // 标准性质
       this.sarStandardsInfoEO.NRDBZFGQD = this.sarAccessEO.country // 国家地区
-      this.sarStandardsInfoEO.CLLX = item.applyArctic ? item.applyArctic.split(',') : []
+      // this.sarStandardsInfoEO.CLLX = item.applyArctic ? item.applyArctic.split(',') : []
       this.sarStandardsInfoEO.YQLX = item.askType
       this.sarStandardsInfoEO.GXHBQ = item.GXHBQ ? item.GXHBQ.split(',') : []
       this.sarStandardsInfoEO.ZRLX = item.askNature ? item.askNature.split(',') : []
@@ -2199,8 +2197,9 @@ export default {
       let accessRow = JSON.parse(sessionStorage.getItem('accessRow'))
       this.$nextTick(() => {
         this.sarAccessEO.type = accessRow.type
-        this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
+        // this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
-        this.sarAccessEO.accessContent = accessRow.accessContent
+        this.sarAccessEO.detailedListName = accessRow.detailedListName //清单名称
+        this.sarAccessEO.projectName = accessRow.projectName //项目名称
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -151,6 +151,11 @@
               width="180"
               label="项目名称">
             </el-table-column>
+            <el-table-column
+              prop="reason"
+              width="180"
+              label="不合规原因">
+            </el-table-column>
             <el-table-column
               prop="responsibleUnit"
               width="180"
@@ -185,7 +190,6 @@
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'R4FTCUQSXFUZPUSN3W63'">查看</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'G7GL8ZAZ5EYK6LRXW5MT'">编辑</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
@@ -231,6 +235,9 @@
                 <el-form-item class="add-form-item" label="项目名称:">
                   <div class="seeItem">{{historySeeForm.productName}}</div>
                 </el-form-item>
+                <el-form-item class="add-form-item" label="不合规原因:">
+                  <div class="seeItem">{{historySeeForm.reason}}</div>
+                </el-form-item>
                 <el-form-item class="add-form-item" label="责任部门:">
                   <div class="seeItem">{{historySeeForm.responsibleUnit}}</div>
                 </el-form-item>
@@ -243,8 +250,8 @@
                 <el-form-item class="add-form-item" label="质量工程师:">
                   <div class="seeItem">{{historySeeForm.qaEngineer}}</div>
                 </el-form-item>
-                <el-form-item class="add-form-item" label="要求关闭时间:">
+                <el-form-item class="add-form-item" label="计划关闭时间:">
-                  <div class="seeItem">{{historySeeForm.actualCloseTime}}</div>
+                  <div class="seeItem">{{historySeeForm.planCloseTime}}</div>
                 </el-form-item>
               </el-form>
             </div>
@@ -461,14 +468,16 @@ export default {
     exportTestItem () {
        if(this.saveExportType === 'apart') {
          if (this.selectedList != null && this.selectedList != ''){
+           console.log(this.selectedList);
           const exportURL = interfaceUrl + 'sarStandUnqualified/sar-stand-unqualified/exportStandUnqulifiedExcel?' +
-            'exportType' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName
+            'exportType' + this.saveExportType + '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
            window.open(exportURL)
            this.$message.success('导出信息成功')
          }
        } else if (this.saveExportType === 'all') {
+         console.log(this.selectedList);
          const exportURL = interfaceUrl + 'sarStandUnqualified/sar-stand-unqualified/exportStandUnqulifiedExcel?' +
-           'exportType' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType
+           'exportType' + this.saveExportType + '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
          window.open(exportURL)
          this.$message.success('导出信息成功')
        }
@@ -525,9 +534,6 @@ export default {
         case '查看':
           this.showUser(command[0])
           break
-        case '编辑':
-          this.openEditModal(command[0])
-          break
       }
     },
     //点击查看按钮事件
@@ -553,6 +559,36 @@ export default {
     openEditModal(item) {
       console.log(item)
     },
+    detailsStandard (item) {
+      this.$http.post('lawss/sarTestItem/validateStandNumber', {
+        standnumber: item.standNum
+      }, {
+        _this: this
+      }, res => {
+        this.pageType = res.data.standType
+        let name = ''
+        switch (this.pageType) {
+          case 'FOREIGN_LAWS':
+            name = 'OtherLawsDetails'
+            break
+          case 'INLAND_STAND':
+            name = 'OtherStandardDetails'
+            break
+          case 'FOREIGN_STAND':
+            name = 'OtherStandardDetails'
+            break
+        }
+        let routeUrl = this.$router.resolve({
+          name: name,
+          params: {
+            id: res.data.standid,
+            pageType: this.pageType
+          }
+        })
+        window.open(routeUrl.href, '_blank')
+      }, e => {
+      })
+    },
     // 分页事件
     pageChange (page) {
       this.pageNo = page

src/sysConfig/index.js

@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-const devIp = '192.168.10.47'
+const devIp = '192.168.10.178'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'