Merge branch 'master' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/taicangZongzhi-PC into lijinlong

.env.development

@@ -8,10 +8,10 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api'
 
 #公司接口
-# VUE_APP_BASE_API = 'http://39.101.188.84:9027'
+VUE_APP_BASE_API = 'http://39.101.188.84:9027'
 
 #局域网
-VUE_APP_BASE_API = 'http://192.168.0.109:9027'
+# VUE_APP_BASE_API = 'http://192.168.0.109:9027'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 数据中台系统
 ENV = 'production'
 
 # 数据中台系统/生产环境
-VUE_APP_BASE_API = 'http://39.101.188.84:9027'
+VUE_APP_BASE_API = 'http://192.168.0.110:9027'

src/views/netManage/supervise/index.vue

@@ -193,7 +193,6 @@
             <el-form-item label="重点监管内容" prop="zdjgContent">
               <el-input
                 v-model="form.zdjgContent"
-                type="textarea"
                 placeholder="请输入内容"
               />
             </el-form-item>
@@ -205,6 +204,7 @@
             >
               <el-input
                 v-model="form.weifaXingwei"
+                type="textarea"
                 placeholder="请输入法律法规明令禁止的有关行为"
               />
             </el-form-item>

src/views/netWorkYq/index.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: JC9527
+ * @Date: 2023-08-28 13:56:14
+ * @LastEditors: JC9527
+ * @LastEditTime: 2023-08-28 13:56:39
+-->
 <template>
   <div class="container-main" ref="main">
     <div class="search-hearder" ref="topSearch">
@@ -379,26 +387,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="是否提示单">
-              <el-select
-                v-model="form.reminder"
-                placeholder="请选择是否是提示单"
-              >
-                <el-option
-                  v-for="dict in dict.type.tc_yes_no"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="parseInt(dict.value)"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="舆情报告类型">
-              <el-select
-                v-model="form.sentimentReportType"
-                placeholder="请选择舆情报告类型"
-              >
+            <el-form-item label="舆情报告类型" prop="source">
+              <el-select v-model="form.sentimentReportType" placeholder="请选择舆情报告类型">
                 <el-option
                   v-for="dict in dict.type.tc_yqbg_type"
                   :key="dict.value"
@@ -409,7 +399,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="12">
             <el-form-item label="附件上传" prop="fileName">
@@ -524,7 +513,7 @@ export default {
     "tc_yes_no",
     "tc_event_type",
     "tc_yq_type",
-    "tc_yqbg_type",
+    "tc_yqbg_type"
   ],
   data() {
     return {
@@ -568,6 +557,19 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 舆情报告类型
+      yqbgType:[
+        {
+          label:'专报',
+          value:'1'
+        },{
+          label:'月报',
+          value:'2'
+        },{
+          label:'深度报告',
+          value:'3'
+        }
+      ]
     };
   },
   created() {
@@ -651,7 +653,8 @@ export default {
         updateTime: null,
 
         remark: null,
-        reminder: null,
+
+        sentimentReportType: null,
       };
       this.fileList = [];
       this.resetForm("form");