Merge branch 'master' of http://h.gemho.cn:7099/18963165066/ziboyingji

public/datav/natural.html

@@ -310,7 +310,7 @@
 					<!-- 设备状态 -->
                     <div style="width:514px;margin-bottom:260px;padding:10px 0 10px 15px;background:rgba(0,0,0,.3);">
                         <div class="ml10 flex align-center f20 color-theme wp100"
-                            style="background-image: url('static/sub-title.png');background-size: 100% 100%;height: 48px;">
+                            style="background-image:url('static/sub-title.png');background-size:100% 100%;height: 48px;">
                             <div class="ml40">设备状态</div>
                         </div>
                         <div class="relative" style="width: 480px;">

src/views/edoc/index.vue

@@ -72,10 +72,13 @@
               :ref="`addhdpic`"
               class="helloworld"
               type="file"
+              accept=".pdf"
               hidden
               @change="addhdPicChange"
             />
+            
           </label>
+          <span>仅支持pdf格式文件</span>
         </el-form-item>
         <el-form-item label="">
           <div v-for="(item, index) in uploadedFiles" :key="item.name + index">
@@ -181,6 +184,13 @@
             <el-table-column width="200px" prop="createTime" label="录入时间" />
             <el-table-column label="操作" width="230px" align="center">
               <template slot-scope="scope">
+                <el-button
+                  v-show="scope.row.downloadWhether"
+                  type="primary"
+                  size="mini"
+                  @click="viewFile(scope.row)"
+                  >预览</el-button
+                >
                 <el-button
                   v-show="scope.row.downloadWhether"
                   type="primary"
@@ -227,6 +237,8 @@ export default {
   },
   data() {
     return {
+      dialogVisible4:false,
+      pdfSrc:'',
       modalBtnLoad: false,
       query: {
         originallyName: "",
@@ -268,6 +280,13 @@ export default {
   },
   created() {},
   methods: {
+    viewFile(row){
+      this.pdfSrc = process.env.VUE_APP_LOCAL_API+'/file'+row.filePath;
+      const link = document.createElement('a');
+      link.href = this.pdfSrc;
+      link.target = '_blank';
+      link.click();
+    },
     // searchParamReset() {
     //   this.searchParam = {
     //     originallyName: "",

src/views/home4Index.vue

@@ -127,8 +127,7 @@ export default {
         // location.href = 'http://192.168.3.226:8057/datav/natural.html'
         location.href = host + "/datav/natural.html";
       } else if (type === "水利系统") {
-        // location.href = 'http://192.168.3.226:8057/datav/watersource.html'
-        location.href = host + "/datav/watersource.html";
+        // location.href = host + "/datav/watersource.html";
       } else if (type === "电子档案馆") {
         // this.$router.push({ path: "home4Center" });
         this.$router.push({ path: "/user/center" });

src/views/kd/c/enterprise/index.vue

@@ -88,7 +88,7 @@
       </el-row>
       <el-row :gutter="100">
         <el-col :span="12">
-          <el-form-item label="行业类别：" prop="dict3">
+          <el-form-item label="矿山类别：" prop="dict3">
             <el-select   v-model="mainDataEditing.dict3" placeholder="请选择" style="width: 100%;">
               <el-option v-for="item in dict3List" :key="item.id" :label="item.value" :value="item.id" />
             </el-select>
@@ -336,7 +336,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="行业类别：" prop="dict3">
+            <el-form-item label="矿山类别：" prop="dict3">
               <span>{{ dialog1Data.dict3Name }}</span>
             </el-form-item>
           </el-col>
@@ -622,35 +622,35 @@ export default {
       },
       mainFormRules: {
         name: [{ required: true, message: '请输入' }],
-        idCode: [{ required: true, message: '请输入' }],
-        _administrativeAreaCascade: [{ required: true, message: '请选择' }],
-        address: [{ required: true, message: '请输入' }],
-        dict1: [{ required: true, message: '请选择' }],
-        dict2: [{ required: true, message: '请选择' }],
+        // idCode: [{ required: true, message: '请输入' }],
+        // _administrativeAreaCascade: [{ required: true, message: '请选择' }],
+        // address: [{ required: true, message: '请输入' }],
+        // dict1: [{ required: true, message: '请选择' }],
+        // dict2: [{ required: true, message: '请选择' }],
         dict3: [{ required: true, message: '请选择' }],
-        hasRegisteredCapital: [{ required: true, message: '请选择' }],
-        registeredCapital: [{ required: true, message: '请输入' }],
-        businessScope: [{ required: true, message: '请输入' }],
-        setupDate: [{ required: true, message: '请选择' }],
-        beginLimitDate: [{ required: true, message: '请选择' }],
-        endLimitDate: [{ required: true, message: '请选择' }],
-        dict4: [{ required: true, message: '请选择' }],
-        dict5: [{ required: true, message: '请选择' }],
-        dict6: [{ required: true, message: '请选择' }],
-        dict7: [{ required: true, message: '请选择' }],
-        dict41: [{ required: true, message: '请选择' }],
+        // hasRegisteredCapital: [{ required: true, message: '请选择' }],
+        // registeredCapital: [{ required: true, message: '请输入' }],
+        // businessScope: [{ required: true, message: '请输入' }],
+        // setupDate: [{ required: true, message: '请选择' }],
+        // beginLimitDate: [{ required: true, message: '请选择' }],
+        // endLimitDate: [{ required: true, message: '请选择' }],
+        // dict4: [{ required: true, message: '请选择' }],
+        // dict5: [{ required: true, message: '请选择' }],
+        // dict6: [{ required: true, message: '请选择' }],
+        // dict7: [{ required: true, message: '请选择' }],
+        // dict41: [{ required: true, message: '请选择' }],
 
-        liablePerson: [{ required: true, message: '请输入' }],
-        liablePersonPhone: [{ required: true, trigger: 'blur', validator: validatePhone }],
-        businessAddress: [{ required: true, message: '请输入' }],
-        longitude: [{ required: true, message: '请选择位置' }],
-        latitude: [{ required: true, message: '请选择位置' }],
-        _workLicenseFileList: [{ required: true, message: '请选择' }],
-        workLicenseBeginDate: [{ required: true, message: '请选择' }],
-        workLicenseEndDate: [{ required: true, message: '请选择' }],
-        _safetyLicenseFileList: [{ required: true, message: '请选择' }],
-        safetyLicenseBeginDate: [{ required: true, message: '请选择' }],
-        safetyLicenseEndDate: [{ required: true, message: '请选择' }]
+        // liablePerson: [{ required: true, message: '请输入' }],
+        // liablePersonPhone: [{ required: true, trigger: 'blur', validator: validatePhone }],
+        // businessAddress: [{ required: true, message: '请输入' }],
+        // longitude: [{ required: true, message: '请选择位置' }],
+        // latitude: [{ required: true, message: '请选择位置' }],
+        // _workLicenseFileList: [{ required: true, message: '请选择' }],
+        // workLicenseBeginDate: [{ required: true, message: '请选择' }],
+        // workLicenseEndDate: [{ required: true, message: '请选择' }],
+        // _safetyLicenseFileList: [{ required: true, message: '请选择' }],
+        // safetyLicenseBeginDate: [{ required: true, message: '请选择' }],
+        // safetyLicenseEndDate: [{ required: true, message: '请选择' }]
       },
 
       searching: false,