添加子平台ip限制

src/api/dataList/research.js

@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+
+// 科研机构信息
+export function researchList(data) {
+	return request({
+		url: '/admin/v1/manage/research',
+		method: 'post',
+		data,
+	})
+}
+// 科研机构筛选信息
+export function researchSelect(data) {
+	return request({
+		url: '/admin/v1/manage/research/select',
+		method: 'post',
+		data,
+	})
+}
+// 科研机构信息添加
+export function researchAdd(data) {
+	return request({
+		url: '/admin/v1/manage/research/add',
+		method: 'post',
+		data,
+	})
+}
+// 科研机构信息修改
+export function researchEdit(data) {
+	return request({
+		url: '/admin/v1/manage/research/edit',
+		method: 'post',
+		data,
+	})
+}
+// 科研机构详细信息
+export function researchDetail(data) {
+	return request({
+		url: '/admin/v1/manage/research/detail',
+		method: 'post',
+		data,
+	})
+}

src/api/examine/expert.js

@@ -8,3 +8,27 @@ export function expertList(data) {
 		data,
 	})
 }
+// 专家详细信息
+export function expertDetail(data) {
+	return request({
+		url: '/admin/v1/manage/expert/detail',
+		method: 'post',
+		data,
+	})
+}
+// 专家审核操作
+export function expertExamine(data) {
+	return request({
+		url: '/admin/v1/manage/expert/examine',
+		method: 'post',
+		data,
+	})
+}
+// 专家信息添加
+export function expertAdd(data) {
+	return request({
+		url: '/admin/v1/manage/expert/add',
+		method: 'post',
+		data,
+	})
+}

src/components/SiteOptions/index.vue

@@ -2,7 +2,7 @@
   <el-cascader
     :size="size"
     :style="{ width: limitWidth ? '240px' : '100%' }"
-    v-model="tenant_id"
+    v-model="value.tenant_id"
     clearable
     separator="-"
     placeholder="请选择，支持搜索"
@@ -15,7 +15,7 @@
 import { tenantSelect } from "@/api/subPlatform/tenant";
 export default {
   props: {
-    value: String,
+    value: Object,
     size: {
       type: String,
       default: "small",
@@ -28,24 +28,23 @@ export default {
   data() {
     return {
       tenantOptions: [],
-      tenant_id: undefined,
     };
   },
-  watch: {
-    value: {
-      handler(newVal, oldVal) {
-        if (newVal == "") {
-          this.tenant_id = undefined;
-        } else {
-          this.tenant_id = newVal;
-        }
-      },
-      immediate: true,
-    },
-    tenant_id(newVal, oldVal) {
-      this.$emit("handleChange", newVal);
-    },
-  },
+  // watch: {
+  //   value: {
+  //     handler(newVal, oldVal) {
+  //       if (newVal == "" || newVal == null) {
+  //         this.tenant_id = undefined;
+  //       } else {
+  //         this.tenant_id = newVal;
+  //       }
+  //     },
+  //     immediate: true,
+  //   },
+  //   tenant_id(newVal, oldVal) {
+  //     this.$emit("handleChange", newVal);
+  //   },
+  // },
   created() {
     tenantSelect().then((res) => {
       for (const key in res.data) {

src/views/components/CityOptions/index.vue

@@ -0,0 +1,151 @@
+<template>
+  <el-form ref="form" :model="value" :rules="rules" label-width="100px">
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="所在地:" required>
+          <el-row type="flex" justify="space-between">
+            <el-col :span="7">
+              <el-form-item prop="province">
+                <el-select
+                  v-model="value.province"
+                  clearable
+                  placeholder="请选择"
+                  @change="provinceCodeChange"
+                >
+                  <el-option
+                    v-for="(key, value) in provinceSelectList"
+                    :key="value"
+                    :label="key"
+                    :value="value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="7">
+              <el-form-item prop="city">
+                <el-select
+                  v-model="value.city"
+                  clearable
+                  placeholder="请选择"
+                  @change="cityCodeChange"
+                >
+                  <el-option
+                    v-for="(key, value) in citySelectList"
+                    :key="value"
+                    :label="key"
+                    :value="value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="7">
+              <el-form-item prop="district">
+                <el-select
+                  v-model="value.district"
+                  clearable
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="(key, value) in districtSelectList"
+                    :key="value"
+                    :label="key"
+                    :value="value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { areaList } from "@/api/config";
+export default {
+  props: {
+    value: Object,
+  },
+  data() {
+    return {
+      provinceSelectList: [], // 省
+      citySelectList: [], // 市
+      districtSelectList: [], // 区
+      rules: {
+        province: [
+          { required: true, message: "请选择", trigger: ["change", "blue"] },
+        ],
+        city: [
+          { required: true, message: "请选择", trigger: ["change", "blue"] },
+        ],
+        district: [
+          { required: true, message: "请选择", trigger: ["change", "blue"] },
+        ],
+      },
+    };
+  },
+  watch: {
+    value(newOld) {
+      const data = Object.assign({}, newOld);
+      this.provinceCodeChange(data.province);
+      this.cityCodeChange(data.city);
+      newOld.city = data.city;
+      newOld.district = data.district;
+    },
+  },
+  methods: {
+    getProvinceByParent(id) {
+      return new Promise((resolve, reject) => {
+        areaList({ code: id })
+          .then(({ code, msg, data }) => {
+            if (code == 200) {
+              resolve(data);
+            } else {
+              this.$modal.msgError(msg);
+              reject({ msg, code });
+            }
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
+    async provinceCodeChange(id) {
+      // delete this.value.city;
+      // delete this.value.district;
+      this.value.city = undefined;
+      this.value.district = undefined;
+      if (!id) {
+        this.citySelectList = [];
+        this.districtSelectList = [];
+        return false;
+      }
+      this.citySelectList = await this.getProvinceByParent(id);
+    },
+    async cityCodeChange(id) {
+      // delete this.value.district;
+      this.value.district = undefined;
+      if (!id) {
+        this.districtSelectList = [];
+        return false;
+      }
+      this.districtSelectList = await this.getProvinceByParent(id);
+    },
+    submitForm() {
+      let flag = false;
+      this.$refs["form"].validate((valid) => {
+        flag = valid;
+      });
+      return flag;
+    },
+  },
+  created() {
+    areaList().then((res) => {
+      this.provinceSelectList = res.data;
+    });
+  },
+};
+</script>

src/views/components/ExpertForm/index.vue

@@ -0,0 +1,285 @@
+<template>
+  <el-form ref="form" :model="value" :rules="rules" label-width="100px">
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="专家头像:" prop="image">
+          <ImageUpload
+            v-model="value.image"
+            :isShowTip="true"
+            :fileSize="2"
+            :limit="1"
+          />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="姓名:" prop="name">
+          <el-input
+            v-model="value.name"
+            :disabled="isAdd ? false : true"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="手机号:" prop="mobile">
+          <el-input
+            v-model="value.mobile"
+            :disabled="isAdd ? false : true"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="所属单位:" prop="research_id">
+          <el-select
+            v-model="value.research_id"
+            filterable
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="所属实验室:">
+          <el-select
+            v-model="value.laboratory_id"
+            filterable
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="所属站点:" prop="tenant_id">
+          <SiteOptions :size="''" :limitWidth="false" v-model="value" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <CityOptions v-model="value" ref="cityForm" />
+
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="详细地址:">
+          <el-input v-model="value.address"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="毕业院校:" prop="school">
+          <el-input v-model="value.school"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="最高学历:" prop="education">
+          <el-select v-model="value.education" placeholder="请选择">
+            <el-option
+              v-for="item in educationOptions"
+              :key="item.text"
+              :label="item.text"
+              :value="item.text"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="主修专业:" prop="major">
+          <el-input v-model="value.major"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="职务:" prop="job">
+          <el-input v-model="value.job"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="职称:" prop="title">
+          <el-input v-model="value.title"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="从业时间:" prop="work_at">
+          <el-date-picker
+            v-model="value.work_at"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="性别:" prop="gender">
+          <el-radio v-model="value.gender" :label="1">男</el-radio>
+          <el-radio v-model="value.gender" :label="2">女</el-radio>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <FieldOptions v-model="value" ref="fieldForm" />
+
+    <InputBoxAdd
+      v-model="value"
+      title="关键词"
+      placeholder="应用场景关键词+技术产品关键词"
+      fieldKey="keywords"
+      ref="keywordsForm"
+    />
+    <InputBoxAdd
+      v-model="value"
+      title="研究方向"
+      placeholder="请输入研究方向"
+      fieldKey="researchs"
+      ref="researchsForm"
+    />
+
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="个人简介:" prop="introduce">
+          <el-input
+            v-model="value.introduce"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 6 }"
+          />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import CityOptions from "@/views/components/CityOptions";
+import FieldOptions from "@/views/components/FieldOptions";
+import InputBoxAdd from "@/views/components/InputBoxAdd";
+export default {
+  components: {
+    CityOptions,
+    FieldOptions,
+    InputBoxAdd,
+  },
+  props: {
+    value: Object,
+    isAdd: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      options: [
+        {
+          value: "选项1",
+          label: "黄金糕",
+        },
+        {
+          value: "选项2",
+          label: "双皮奶",
+        },
+      ],
+      rules: {
+        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+        mobile: [
+          { required: true, message: "手机号不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur",
+          },
+        ],
+        research_id: [
+          { required: true, message: "请选择所属单位", trigger: "change" },
+        ],
+        tenant_id: [
+          {
+            required: true,
+            message: "请选择所属站点",
+            trigger: ["blur", "change"],
+          },
+        ],
+        school: [
+          { required: true, message: "毕业院校不能为空", trigger: "blur" },
+        ],
+        education: [
+          { required: true, message: "请选择所最高学历", trigger: "change" },
+        ],
+        major: [
+          { required: true, message: "主修专业不能为空", trigger: "blur" },
+        ],
+        job: [{ required: true, message: "职务不能为空", trigger: "blur" }],
+        title: [{ required: true, message: "职称不能为空", trigger: "blur" }],
+        work_at: [
+          {
+            required: true,
+            message: "从业时间不能为空",
+            trigger: ["change", "blur"],
+          },
+        ],
+        introduce: [
+          { required: true, message: "个人简介不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  methods: {
+    submitForm() {
+      let flag = false;
+      this.$refs["form"].validate((valid) => {
+        const cityForm = this.$refs.cityForm.submitForm();
+        const fieldForm = this.$refs.fieldForm.submitForm();
+        const keywordsForm = this.$refs.keywordsForm.submitForm();
+        const researchsForm = this.$refs.researchsForm.submitForm();
+        if (cityForm && fieldForm && keywordsForm && researchsForm) {
+          console.log(true);
+          flag = !flag;
+        }
+      });
+      return flag;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// 上传图片框限制
+// ::v-deep .el-upload--picture-card {
+//   width: 120px;
+//   height: 120px;
+//   line-height: 120px;
+// }
+.el-select,
+.el-date-editor {
+  display: block;
+  width: 100%;
+}
+</style>

src/views/components/FieldOptions/index.vue

@@ -0,0 +1,193 @@
+<template>
+  <el-form ref="form" :model="value" :rules="rules" label-width="100px">
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="所属领域:" required>
+          <el-row type="flex" justify="space-between">
+            <el-col :span="6">
+              <el-form-item prop="industrys">
+                <el-select
+                  v-model="fields[0]"
+                  value-key="id"
+                  placeholder="请选择"
+                  @change="levelIChange"
+                >
+                  <el-option
+                    v-for="item in levelI"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-select
+                v-model="fields[1]"
+                value-key="id"
+                placeholder="请选择"
+                @change="levelIIChange"
+              >
+                <el-option
+                  v-for="item in levelII"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item"
+                >
+                </el-option>
+              </el-select>
+            </el-col>
+            <el-col :span="6">
+              <el-select
+                v-model="fields[2]"
+                value-key="id"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in levelIII"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-col>
+            <el-col :span="3">
+              <el-button type="primary" @click="fieldAdd">添加</el-button>
+            </el-col>
+          </el-row>
+          <div class="e_tag">
+            <el-tag
+              v-for="(tag, index) in industrysTags"
+              :key="index"
+              closable
+              @close="handleFieldClose(index)"
+            >
+              <template v-if="Array.isArray(tag)">
+                <span v-for="(item, i) in tag" :key="item.id">
+                  {{ item.name }}
+                  <span v-if="tag.length != i + 1">></span>
+                </span>
+              </template>
+              <template v-else>
+                <span>{{ tag }}</span>
+              </template>
+            </el-tag>
+          </div>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { industry } from "@/api/config";
+export default {
+  props: {
+    value: Object,
+  },
+  data() {
+    return {
+      levelI: [], // I级数据
+      levelII: [], // II级数据
+      levelIII: [], // III级数据
+      fields: [], // 当前下拉框选中的集合
+      industrysTags: [], // 点击添加按钮后临时存储的数据集合
+      rules: {
+        industrys: [
+          {
+            type: "array",
+            required: true,
+            message: "请选择并添加",
+            trigger: "change",
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    value(newVal, oldVal) {
+      let _key = [];
+      let _value = [];
+      for (let i = 0; i < newVal.industrys.length; i++) {
+        const item = newVal.industrys[i];
+        _key.push(item.key);
+        _value.push(item.value);
+      }
+      newVal.industrys = _key;
+      this.industrysTags = _value;
+    },
+  },
+  methods: {
+    getFieldByParent(id) {
+      return new Promise((resolve, reject) => {
+        industry({ parent_id: id })
+          .then(({ code, msg, data }) => {
+            if (code == 200) {
+              resolve(data);
+            } else {
+              this.$modal.msgError(msg);
+              reject({ msg, code });
+            }
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
+    async levelIChange(item) {
+      delete this.fields[1];
+      delete this.fields[2];
+      this.levelII = await this.getFieldByParent(item.id);
+    },
+    async levelIIChange(item) {
+      delete this.fields[2];
+      this.levelIII = await this.getFieldByParent(item.id);
+    },
+    // 所属领域添加按钮
+    fieldAdd() {
+      if (!this.fields.length) return this.$modal.msgError("请选择领域类型");
+      this.value.industrys = [];
+      this.industrysTags.push(this.fields);
+      for (let i = 0; i < this.industrysTags.length; i++) {
+        this.value.industrys.push("");
+        const item = this.industrysTags[i];
+        for (let j = 0; j < item.length; j++) {
+          const item2 = item[j];
+          if (this.value.industrys[i] == "") {
+            this.value.industrys[i] = item2.id;
+          } else {
+            this.value.industrys[i] = this.value.industrys[i] + "-" + item2.id;
+          }
+        }
+      }
+      this.fields = [];
+      this.levelII = [];
+      this.levelIII = [];
+    },
+    handleFieldClose(index) {
+      this.industrysTags.splice(index, 1);
+      this.value.industrys.splice(index, 1);
+    },
+    submitForm() {
+      let flag = false;
+      this.$refs["form"].validate((valid) => {
+        flag = valid;
+      });
+      return flag;
+    },
+  },
+  created() {
+    industry().then((res) => {
+      this.levelI = res.data;
+    });
+  },
+};
+</script>
+<style lang="scss" scoped>
+.e_tag {
+  .el-tag {
+    margin-right: 10px;
+  }
+}
+</style>

src/views/components/InputBoxAdd/index.vue

@@ -0,0 +1,89 @@
+<template>
+  <el-form ref="form" :model="value" label-width="100px">
+    <el-row>
+      <el-col :span="24">
+        <el-form-item
+          :label="title + ':'"
+          :prop="fieldKey"
+          :rules="[
+            {
+              required: true,
+              type: 'array',
+              message: '请输入并添加',
+              trigger: 'change',
+            },
+          ]"
+        >
+          <el-row type="flex" justify="space-between">
+            <el-col :span="20">
+              <el-input v-model="dataVal" :placeholder="placeholder"></el-input>
+            </el-col>
+            <el-col :span="3">
+              <el-button type="primary" @click="keyWordAdd">添加</el-button>
+            </el-col>
+          </el-row>
+          <div class="e_tag">
+            <el-tag
+              v-for="(tag, index) in this.value[fieldKey]"
+              :key="index"
+              closable
+              @close="handleFieldClose(fieldKey, index)"
+            >
+              {{ tag }}
+            </el-tag>
+          </div>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { industry } from "@/api/config";
+export default {
+  props: {
+    value: Object,
+    title: {
+      type: String,
+      default: "",
+    },
+    placeholder: {
+      type: String,
+      default: "",
+    },
+    fieldKey: {
+      require: true,
+      type: String,
+    },
+  },
+  data() {
+    return {
+      dataVal: "",
+    };
+  },
+  methods: {
+    keyWordAdd() {
+      if (!this.dataVal.length)
+        return this.$message.error("请输入" + this.title);
+      this.value[this.fieldKey].push(this.dataVal);
+      this.dataVal = "";
+    },
+    handleFieldClose(val, index) {
+      this.value[val].splice(index, 1);
+    },
+    submitForm() {
+      let flag = false;
+      this.$refs["form"].validate((valid) => {
+        flag = valid;
+      });
+      return flag;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.e_tag {
+  .el-tag {
+    margin-right: 10px;
+  }
+}
+</style>

src/views/dataList/research/index.vue

@@ -0,0 +1,156 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="机构名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入机构名称"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="审核状态" prop="examine_status">
+        <el-select
+          v-model="queryParams.examine_status"
+          placeholder="审核状态"
+          clearable
+          size="small"
+          style="width: 240px"
+          @clear="delete queryParams.examine_status"
+        >
+          <el-option label="审核中" :value="1" />
+          <el-option label="审核通过" :value="2" />
+          <el-option label="审核拒绝" :value="3" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
+        <SiteOptions v-model="queryParams" />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="userList">
+      <el-table-column label="数据编号" align="center" width="150" prop="id" />
+      <el-table-column label="机构名称" align="center" prop="name" />
+      <el-table-column
+        label="统一社会信用代码"
+        align="center"
+        prop="industrys"
+      />
+      <el-table-column
+        label="主要研究方向"
+        align="center"
+        prop="research_name"
+      />
+      <el-table-column
+        label="主要研究领域"
+        align="center"
+        prop="laboratory_name"
+      />
+      <el-table-column label="所在地" align="center" prop="address" />
+      <el-table-column label="站点" align="center" prop="area" />
+      <el-table-column label="申请时间" align="center" prop="created_at">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.created_at) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <el-button
+            :disabled="scope.row.examine_status != 1"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleDetail(scope.row.id)"
+            >审核</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.page_num"
+      :limit.sync="queryParams.page_size"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { researchList } from "@/api/dataList/research";
+
+export default {
+  data() {
+    return {
+      is_super: this.$store.getters.is_super,
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 机构表格数据
+      userList: null,
+      // 查询参数
+      queryParams: {
+        page_num: 1,
+        page_size: 10,
+        name: undefined,
+        examine_status: undefined,
+        tenant_id: undefined,
+      },
+    };
+  },
+  methods: {
+    /** 查询机构列表 */
+    getList() {
+      this.loading = true;
+      researchList(this.queryParams).then((response) => {
+        // this.userList = response.data.data;
+        this.total = response.data.count;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.page_num = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleDetail(id) {
+      console.log(id);
+      this.$router.push({
+        path: "/examine/expertDetail",
+        query: { id },
+      });
+    },
+  },
+  created() {
+    this.getList();
+  },
+};
+</script>

src/views/examine/expert/detail.vue

@@ -1,377 +1,27 @@
 <template>
   <div class="app-container">
-    <el-form
-      style="width: 50%"
-      ref="form"
-      :model="form"
-      :rules="rules"
-      label-width="100px"
-    >
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="专家头像:" prop="image">
-            <ImageUpload
-              v-model="form.image"
-              :isShowTip="true"
-              :fileSize="2"
-              :limit="1"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="姓名:" prop="name">
-            <el-input v-model="form.name"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="手机号:" prop="mobile">
-            <el-input v-model="form.mobile"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="所属单位:">
-            <el-select v-model="form.field" filterable placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="所属实验室:">
-            <el-select v-model="form.field2" filterable placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="所属站点:" prop="tenant_id">
-            <SiteOptions
-              :size="''"
-              :limitWidth="false"
-              v-model="form.tenant_id"
-              @handleChange="form.tenant_id = $event"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="所在地:" required>
-            <el-row type="flex" justify="space-between">
-              <el-col :span="7">
-                <el-form-item prop="province">
-                  <el-select
-                    v-model="form.province"
-                    clearable
-                    placeholder="请选择"
-                    @change="provinceCodeChange()"
-                  >
-                    <el-option
-                      v-for="(key, value) in provinceSelectList"
-                      :key="value"
-                      :label="key"
-                      :value="value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="7">
-                <el-form-item prop="city">
-                  <el-select
-                    v-model="form.city"
-                    clearable
-                    placeholder="请选择"
-                    @change="cityCodeChange()"
-                  >
-                    <el-option
-                      v-for="(key, value) in citySelectList"
-                      :key="value"
-                      :label="key"
-                      :value="value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="7">
-                <el-form-item prop="district">
-                  <el-select
-                    v-model="form.district"
-                    clearable
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="(key, value) in districtSelectList"
-                      :key="value"
-                      :label="key"
-                      :value="value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="详细地址:">
-            <el-input v-model="form.address"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="毕业院校:" prop="school">
-            <el-input v-model="form.school"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="最高学历:">
-            <el-select v-model="form.education" placeholder="请选择">
-              <el-option
-                v-for="item in educationOptions"
-                :key="item.text"
-                :label="item.text"
-                :value="item.text"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="主修专业:" prop="major">
-            <el-input v-model="form.major"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="职务:" prop="job">
-            <el-input v-model="form.job"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="职称:" prop="title">
-            <el-input v-model="form.title"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="从业时间:" prop="work_at">
-            <el-date-picker
-              v-model="form.work_at"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"
-            >
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="性别:" prop="gender">
-            <el-radio v-model="form.gender" :label="1">男</el-radio>
-            <el-radio v-model="form.gender" :label="2">女</el-radio>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="所属领域:" prop="industrys">
-            <el-row type="flex" justify="space-between">
-              <el-col :span="6">
-                <el-select
-                  v-model="fields[0]"
-                  placeholder="请选择"
-                  @change="levelIChange()"
-                >
-                  <el-option
-                    v-for="item in levelI"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </el-col>
-              <el-col :span="6">
-                <el-select
-                  v-model="fields[1]"
-                  placeholder="请选择"
-                  @change="levelIIChange()"
-                >
-                  <el-option
-                    v-for="item in levelII"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </el-col>
-              <el-col :span="6">
-                <el-select
-                  v-model="fields[2]"
-                  placeholder="请选择"
-                  @change="levelIIIChange()"
-                >
-                  <el-option
-                    v-for="item in levelIII"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </el-col>
-              <el-col :span="3">
-                <el-button type="primary" @click="fieldAdd()">添加</el-button>
-              </el-col>
-            </el-row>
-            <div class="e_tag">
-              <el-tag
-                v-for="(tag, index) in this.industrysName"
-                :key="index"
-                closable
-                @close="handleFieldClose('industrys', index)"
-              >
-                <span v-for="(item, i) in tag" :key="i">
-                  {{ item.name }} <span v-if="tag.length != i + 1">></span>
-                </span>
-              </el-tag>
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="关键词:">
-            <el-row type="flex" justify="space-between">
-              <el-col :span="20">
-                <el-input
-                  v-model="keywords"
-                  placeholder="应用场景关键词+技术产品关键词"
-                ></el-input>
-              </el-col>
-              <el-col :span="3">
-                <el-button type="primary" @click="keyWordAdd()">添加</el-button>
-              </el-col>
-            </el-row>
-            <div class="e_tag">
-              <el-tag
-                v-for="(tag, index) in this.form.keywords"
-                :key="index"
-                closable
-                @close="handleFieldClose('keywords', index)"
-              >
-                {{ tag }}
-              </el-tag>
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="研究方向:">
-            <el-row type="flex" justify="space-between">
-              <el-col :span="20">
-                <el-input
-                  v-model="keywords"
-                  placeholder="请输入研究方向"
-                ></el-input>
-              </el-col>
-              <el-col :span="3">
-                <el-button type="primary" @click="keyWordAdd()">添加</el-button>
-              </el-col>
-            </el-row>
-            <div class="e_tag">
-              <el-tag
-                v-for="(tag, index) in this.form.researchs"
-                :key="index"
-                closable
-                @close="handleFieldClose('keywords', index)"
-              >
-                {{ tag }}
-              </el-tag>
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="个人简介:">
-            <el-input
-              v-model="form.introduce"
-              type="textarea"
-              :autosize="{ minRows: 2, maxRows: 6 }"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item>
-        <el-button>审核拒绝</el-button>
-        <el-button type="primary" @click="submitForm">审核通过</el-button>
-      </el-form-item>
-    </el-form>
+    <div style="width: 50%">
+      <ExpertForm v-model="form" :isAdd="false" ref="expertForm" />
+    </div>
+    <el-button @click="submitForm(3)">审核拒绝</el-button>
+    <el-button type="primary" @click="submitForm(2)">审核通过</el-button>
   </div>
 </template>
 <script>
+import ExpertForm from "@/views/components/ExpertForm";
+import { expertDetail, expertExamine } from "@/api/examine/expert";
 export default {
+  components: {
+    ExpertForm,
+  },
   data() {
     return {
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕",
-        },
-        {
-          value: "选项2",
-          label: "双皮奶",
-        },
-      ],
-      keywords: "",
-      provinceSelectList: [],
-      citySelectList: [],
-      districtSelectList: [],
-      levelI: [],
-      levelII: [],
-      levelIII: [],
-      fields: [],
-      industrysName: [],
       form: {
         image: undefined,
         name: undefined,
         mobile: undefined,
-        // 所属单位
-        // 所属实验室
+        research_id: undefined, // 所属单位
+        laboratory_id: undefined, // 所属实验室
         tenant_id: undefined,
         province: undefined, // 省code
         city: undefined, // 市code
@@ -389,14 +39,38 @@ export default {
         researchs: [],
         introduce: undefined,
       },
-      rules: {
-        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-      },
     };
   },
   methods: {
-    submitForm() {
-      console.log(this.form);
+    submitForm(status) {
+      if (this.$refs.expertForm.submitForm()) {
+        const str =
+          status == 2
+            ? "<span style='color:green'>通过</span>"
+            : "<span style='color:red'>拒绝</span>";
+        this.$prompt(`您将 ${str} 该数据审核，请输入处理备注`, "审核", {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          closeOnClickModal: false,
+          inputType: "textarea",
+        })
+          .then(({ value }) => {
+            const query = {
+              id: this.form.id,
+              status,
+              remark: value,
+            };
+            expertExamine(query).then((res) => {
+              this.$store.dispatch("tagsView/delView", this.$route);
+              this.$router.go(-1);
+              this.$modal.msgSuccess("处理成功");
+            });
+          })
+          .catch(() => {});
+      } else {
+        console.log("校验未通过");
+      }
       // this.$refs["form"].validate((valid) => {
       //   if (valid) {
       //     if (this.form.id != undefined) {
@@ -423,22 +97,9 @@ export default {
       this.$router.go(-1);
       return;
     }
-    console.log(id);
-    // this.queryParams.reportedId = id;
-    // this.getReportDetail();
+    expertDetail({ id }).then((res) => {
+      this.form = res.data;
+    });
   },
 };
-</script>
-<style lang="scss" scoped>
-// 上传图片框限制
-// ::v-deep .el-upload--picture-card {
-//   width: 120px;
-//   height: 120px;
-//   line-height: 120px;
-// }
-.el-select,
-.el-date-editor {
-  display: block;
-  width: 100%;
-}
-</style>
+</script>

src/views/examine/expert/index.vue

@@ -31,7 +31,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
 
       <el-form-item>
@@ -51,7 +51,17 @@
     <el-table v-loading="loading" :data="userList">
       <el-table-column label="数据编号" align="center" width="150" prop="id" />
       <el-table-column label="专家姓名" align="center" prop="name" />
-      <el-table-column label="研究领域" align="center" prop="industry" />
+      <el-table-column
+        label="研究领域"
+        align="center"
+        prop="industrys"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <div>{{ scope.row.industrys[0] }}</div>
+          <!-- <div v-for="item in scope.row.industrys" :key="item">{{ item }}</div> -->
+        </template>
+      </el-table-column>
       <el-table-column
         label="所属科研机构"
         align="center"
@@ -79,6 +89,7 @@
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
           <el-button
+            :disabled="scope.row.examine_status != 1"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -100,8 +111,6 @@
 </template>
 
 <script>
-import { delUser } from "@/api/system/user";
-
 import { expertList } from "@/api/examine/expert";
 
 export default {

src/views/subPlatform/tenant/index.vue

@@ -56,6 +56,7 @@
         prop="contact_mobile"
         align="center"
       />
+      <el-table-column label="ip地址" prop="ip" align="center" />
       <el-table-column label="域名" prop="domain" align="center" />
       <el-table-column label="所在地" prop="area" align="center" />
       <el-table-column label="创建时间" prop="created_at" align="center">
@@ -125,8 +126,19 @@
         <el-form-item label="子系统名称:" prop="name">
           <el-input v-model="form.name" placeholder="请输入子系统名称" />
         </el-form-item>
+        <el-form-item label="ip地址:" prop="ip">
+          <el-input
+            v-model="form.ip"
+            placeholder="请输入ip地址"
+            :disabled="form.id ? true : false"
+          />
+        </el-form-item>
         <el-form-item label="域名:" prop="domain">
-          <el-input v-model="form.domain" placeholder="请输入域名" />
+          <el-input
+            v-model="form.domain"
+            placeholder="请输入域名"
+            :disabled="form.id ? true : false"
+          />
         </el-form-item>
         <el-form-item label="所在地:" required>
           <el-row type="flex" justify="space-between">
@@ -251,6 +263,19 @@ import { areaList } from "@/api/config";
 import { resetUserPwd } from "@/api/system/user";
 export default {
   data() {
+    var validateIp = (rule, value, callback) => {
+      if (value === "" || typeof value === "undefined" || value == null) {
+        callback(new Error("请输入正确的IP地址"));
+      } else {
+        const reg =
+          /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
+        if (!reg.test(value) && value !== "") {
+          callback(new Error("请输入正确的IP地址"));
+        } else {
+          callback();
+        }
+      }
+    };
     return {
       loading: true,
       showSearch: true,
@@ -292,6 +317,14 @@ export default {
         name: [
           { required: true, message: "子系统名称不能为空", trigger: "blur" },
         ],
+        ip: [
+          {
+            required: true,
+            message: "请输入正确的IP地址",
+            validator: validateIp,
+            trigger: "blur",
+          },
+        ],
         domain: [{ required: true, message: "域名不能为空", trigger: "blur" }],
         province: [
           {
@@ -351,6 +384,7 @@ export default {
       this.form = {
         id: undefined,
         name: undefined,
+        ip: undefined,
         domain: undefined,
         province: "",
         city: "",

src/views/website/aboutUs/index.vue

@@ -9,7 +9,7 @@
       @submit.native.prevent
     >
       <el-form-item label="所属站点" prop="tenant_id">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -94,10 +94,7 @@
     <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点:" prop="tenant_id">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="上级导航" prop="parent_id">
           <treeselect
@@ -165,7 +162,11 @@ export default {
       // 表单校验
       rules: {
         tenant_id: [
-          { required: true, message: "所属站点不能为空", trigger: "blur" },
+          {
+            required: true,
+            message: "所属站点不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
         title: [
           { required: true, message: "导航名称不能为空", trigger: "blur" },

src/views/website/activity/active/index.vue

@@ -17,7 +17,7 @@
         />
       </el-form-item>
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item label="联系人" prop="contact">
         <el-input
@@ -175,10 +175,7 @@
     <el-dialog :title="title" :visible.sync="open" width="35%">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="所属站点" prop="tenant_id">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="活动名称:" prop="title">
           <el-input v-model="form.title" placeholder="请输入活动名称" />
@@ -447,7 +444,11 @@ export default {
           },
         ],
         tenant_id: [
-          { required: true, message: "所属站点不能为空", trigger: "blur" },
+          {
+            required: true,
+            message: "所属站点不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
         begin_at: [
           { required: true, message: "开始时间不能为空", trigger: "change" },

src/views/website/activity/apply/index.vue

@@ -17,7 +17,7 @@
         />
       </el-form-item>
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item label="申请人" prop="contact">
         <el-input

src/views/website/innovate/navigation/index.vue

@@ -8,7 +8,7 @@
       @submit.native.prevent
     >
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -84,10 +84,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点" prop="tenant_id">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="导航名称:" prop="title">
           <el-input v-model="form.title" placeholder="请输入导航名称" />
@@ -132,7 +129,11 @@ export default {
           { required: true, message: "导航名称不能为空", trigger: "blur" },
         ],
         tenant_id: [
-          { required: true, message: "所属站点不能为空", trigger: "blur" },
+          {
+            required: true,
+            message: "所属站点不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
       },
     };

src/views/website/innovate/service/index.vue

@@ -99,10 +99,7 @@
     <el-dialog :title="title" :visible.sync="open" width="40%">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点" prop="tenant_id">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="归属导航:" prop="kind_id">
           <el-select v-model="form.kind_id" placeholder="请选择">
@@ -176,7 +173,11 @@ export default {
           { required: true, message: "服务描述不能为空", trigger: "blur" },
         ],
         tenant_id: [
-          { required: true, message: "所属站点不能为空", trigger: "blur" },
+          {
+            required: true,
+            message: "所属站点不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
         kind_id: [
           { required: true, message: "导航名称不能为空", trigger: "change" },

src/views/website/siteSet/agreement/index.vue

@@ -8,7 +8,7 @@
       @submit.native.prevent
     >
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -89,10 +89,7 @@
     <el-dialog :title="title" :visible.sync="open" width="40%">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点:" prop="tenant_id" v-if="is_super">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="启用状态:" prop="status">
           <el-radio v-model="form.status" :label="1">启用</el-radio>

src/views/website/siteSet/banner/index.vue

@@ -21,7 +21,7 @@
         ></el-cascader>
       </el-form-item>
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -109,10 +109,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点:" prop="tenant_id" v-if="is_super">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="所在位置:" prop="local">
           <div style="display: flex">
@@ -213,7 +210,11 @@ export default {
       form: {},
       rules: {
         tenant_id: [
-          { required: true, message: "归属导航不能为空", trigger: "change" },
+          {
+            required: true,
+            message: "归属导航不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
         local: [
           { required: true, message: "所在位置不能为空", trigger: "change" },

src/views/website/siteSet/footer/index.vue

@@ -9,7 +9,7 @@
       @submit.native.prevent
     >
       <el-form-item label="所属站点" prop="tenant_id">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -99,10 +99,7 @@
     <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点:" prop="tenant_id">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="上级导航" prop="parent_id">
           <treeselect
@@ -168,7 +165,11 @@ export default {
       // 表单校验
       rules: {
         tenant_id: [
-          { required: true, message: "所属站点不能为空", trigger: "blur" },
+          {
+            required: true,
+            message: "所属站点不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
         title: [
           { required: true, message: "导航名称不能为空", trigger: "blur" },

src/views/website/solution/service/index.vue

@@ -36,7 +36,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -131,10 +131,7 @@
           <el-input v-model="form.title" placeholder="请输入数据名称" />
         </el-form-item>
         <el-form-item label="所属站点:" prop="tenant_id" v-if="is_super">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="归属导航:" prop="mode">
           <el-select v-model="form.mode" placeholder="请选择">
@@ -202,7 +199,11 @@ export default {
           { required: true, message: "数据名称不能为空", trigger: "blur" },
         ],
         tenant_id: [
-          { required: true, message: "归属导航不能为空", trigger: "change" },
+          {
+            required: true,
+            message: "归属导航不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
         image: [
           {

src/views/website/solution/serviceCase/index.vue

@@ -18,7 +18,7 @@
         />
       </el-form-item>
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -124,10 +124,7 @@
           <ImageUpload v-model="form.image" :isShowTip="false" :limit="1" />
         </el-form-item>
         <el-form-item label="所属站点:" prop="tenant_id" v-if="is_super">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="案例类型:" prop="kind_id">
           <el-cascader

vue.config.js

@@ -35,7 +35,8 @@ module.exports = {
 		proxy: {
 			// detail: https://cli.vuejs.org/config/#devserver-proxy
 			[process.env.VUE_APP_BASE_API]: {
-				target: `http://192.168.0.142:8000`,
+				// target: `http://192.168.0.142:8000`,
+				target: `http://hf.zky.cn:8000`,
 				changeOrigin: true,
 				pathRewrite: {
 					['^' + process.env.VUE_APP_BASE_API]: '',